diff options
| author | andreykproductengine <none@none> | 2016-03-03 00:15:33 +0200 |
|---|---|---|
| committer | andreykproductengine <none@none> | 2016-03-03 00:15:33 +0200 |
| commit | 30f9287645c789b4ad5e9523e520896fe71ed65b (patch) | |
| tree | f5e429e0f1e8769402adefd7b41c61aa6f03c695 /indra/newview/llviewerparcelmgr.cpp | |
| parent | f4e3306517599754f8b4e74e7f97c98dfbcc8429 (diff) | |
MAINT-2199 reverted previous change, refixed missing cloud and ban line
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rwxr-xr-x | indra/newview/llviewerparcelmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index e72ae88ba2..aafb6b4d12 100755 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -143,8 +143,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("world/NoEntryLines.png"); - mPassImage = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryPassLines.png"); + mBlockedImage = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryLines.png", FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_UI); + mPassImage = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryPassLines.png", FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_UI); S32 overlay_size = mParcelsPerEdge * mParcelsPerEdge / PARCEL_OVERLAY_CHUNKS; sPackedOverlay = new U8[overlay_size]; |