summaryrefslogtreecommitdiff
path: root/indra/newview/lllocalbitmaps.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-10-09 19:00:48 +0000
committerRider Linden <rider@lindenlab.com>2018-10-09 19:00:48 +0000
commitac6d2b09c048d8589c572acb2965a0643b07d5ce (patch)
tree4592bf63d6fc464c9e1a961e4b64af4233ab93bf /indra/newview/lllocalbitmaps.cpp
parentc2cbb40a0eecb1c3b4a21ffa4d169f23f1e7006b (diff)
parent83b508a656aebedff915b2fdcd292432a8aaa7b2 (diff)
Merged in andreykproductengine/maint-eep2 (pull request #137)
SL-9746 [EEP] Local Texture options should work with EEP Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com> Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/lllocalbitmaps.cpp')
-rw-r--r--indra/newview/lllocalbitmaps.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index 760325b652..47b6da708c 100644
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -976,6 +976,19 @@ LLUUID LLLocalBitmapMgr::getWorldID(LLUUID tracking_id)
return world_id;
}
+bool LLLocalBitmapMgr::isLocal(const LLUUID world_id)
+{
+ for (local_list_iter iter = sBitmapList.begin(); iter != sBitmapList.end(); iter++)
+ {
+ LLLocalBitmap* unit = *iter;
+ if (unit->getWorldID() == world_id)
+ {
+ return true;
+ }
+ }
+ return false;
+}
+
std::string LLLocalBitmapMgr::getFilename(LLUUID tracking_id)
{
std::string filename = "";