diff options
author | Oz Linden <oz@lindenlab.com> | 2010-08-29 08:38:34 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-08-29 08:38:34 -0400 |
commit | 05913a83a5f0f7f076ad915f3de4c23330f6d32b (patch) | |
tree | 893a24c2f3b10f2da722158b4bad967c97613c13 /indra/newview/lllandmarklist.h | |
parent | 1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff) | |
parent | 75a66a146b8f4b3127eb86fec10c24cc45d3f6d7 (diff) |
Merge changes from product-engine branch
Diffstat (limited to 'indra/newview/lllandmarklist.h')
-rw-r--r-- | indra/newview/lllandmarklist.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lllandmarklist.h b/indra/newview/lllandmarklist.h index 6d32f0e75b..3356f866ce 100644 --- a/indra/newview/lllandmarklist.h +++ b/indra/newview/lllandmarklist.h @@ -59,6 +59,10 @@ public: S32 status, LLExtStat ext_status ); + // Returns TRUE if loading the landmark with given asset_uuid has been requested + // but is not complete yet. + BOOL isAssetInLoadedCallbackMap(const LLUUID& asset_uuid); + protected: void onRegionHandle(const LLUUID& landmark_id); void makeCallbacks(const LLUUID& landmark_id); |