Permalink
Browse files

Fix SV-2105: Ban lines don't show up

Thanks to Router Gray for researching and solving this issue!!
  • Loading branch information...
1 parent 8308a0f commit 755d4c242bbfe1cb7ac86aca23364c50f8328356 @Lirusaito Lirusaito committed Jul 5, 2016
@@ -162,8 +162,8 @@ LLViewerParcelMgr::LLViewerParcelMgr()
// JC: Resolved a merge conflict here, eliminated
// mBlockedImage->setAddressMode(LLTexUnit::TAM_WRAP);
// because it is done in llviewertexturelist.cpp
- mBlockedImage = LLViewerTextureManager::getFetchedTextureFromFile("noentrylines.j2c");
- mPassImage = LLViewerTextureManager::getFetchedTextureFromFile("noentrypasslines.j2c");
+ mBlockedImage = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryLines.png");
+ mPassImage = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryPassLines.png");
S32 overlay_size = mParcelsPerEdge * mParcelsPerEdge / PARCEL_OVERLAY_CHUNKS;
sPackedOverlay = new U8[overlay_size];
Binary file not shown.
Binary file not shown.
@@ -37,6 +37,7 @@ with the same filename but different name
<texture name="Accordion_Press" file_name="Accordion_Press.png" preload="false" />
<texture name="Accordion_Over" file_name="Accordion_Over.png" preload="false" />
<texture name="Accordion_Selected" file_name="Accordion_Selected.png" preload="false" />
+
<texture name="icon_group.tga"/>
<texture name="Parcel_M_Dark" file_name="map_event_mature.tga" preload="true" />
<texture name="Parcel_M_Light" file_name="map_event_mature.tga" preload="false" />
@@ -45,6 +46,9 @@ with the same filename but different name
<texture name="ProgressBar" file_name="progressbar_fill.tga" preload="true" scale.left="10" scale.top="7" scale.right="65" scale.bottom="7" />
<texture name="ProgressTrack" file_name="progressbar_track.tga" preload="true" scale.left="10" scale.top="7" scale.right="80" scale.bottom="7" />
<texture name="Refresh_Off" file_name="Refresh_Off.png" preload="true" />
+
+ <texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="false" />
+ <texture name="NoEntryPassLines" file_name="world/NoEntryPassLines.png" use_mips="true" preload="false" />
<texture name="Rounded_Rect" file_name="Rounded_Rect.png" preload="true" scale.left="6" scale.top="26" scale.right="58" scale.bottom="6" />
<texture name="Rounded_Rect_Top" file_name="Rounded_Rect.png" preload="true" scale.left="6" scale.top="8" scale.right="58" scale.bottom="0" clip.left="0" clip.right="64" clip.bottom="16" clip.top="32" />
<texture name="Rounded_Rect_Bottom" file_name="Rounded_Rect.png" preload="true" scale.left="6" scale.top="16" scale.right="58" scale.bottom="8" clip.left="0" clip.right="64" clip.bottom="0" clip.top="16" />

0 comments on commit 755d4c2

Please sign in to comment.