summaryrefslogtreecommitdiff
path: root/indra/newview/lllandmarklist.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-08-30 06:38:44 -0400
committerOz Linden <oz@lindenlab.com>2010-08-30 06:38:44 -0400
commitd84c6625c707b5d61b71749b74f3cc4fb8f02048 (patch)
tree7a31d44dfbd4e8244a9ee4f9504fe45ac3280482 /indra/newview/lllandmarklist.cpp
parentc4acbaf7c4120d4dc6154420c992e3942fd25df3 (diff)
parentb0bf8b9619ec89a37bfc7d8d9e7f7d49904dfb02 (diff)
Automated merge with http://bitbucket.org/aleric/viewer-development-aleric-export
Diffstat (limited to 'indra/newview/lllandmarklist.cpp')
-rw-r--r--indra/newview/lllandmarklist.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp
index 87257832b6..dd402de394 100644
--- a/indra/newview/lllandmarklist.cpp
+++ b/indra/newview/lllandmarklist.cpp
@@ -159,6 +159,11 @@ void LLLandmarkList::processGetAssetReply(
}
+BOOL LLLandmarkList::isAssetInLoadedCallbackMap(const LLUUID& asset_uuid)
+{
+ return mLoadedCallbackMap.find(asset_uuid) != mLoadedCallbackMap.end();
+}
+
BOOL LLLandmarkList::assetExists(const LLUUID& asset_uuid)
{
return mList.count(asset_uuid) != 0 || mBadList.count(asset_uuid) != 0;