diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-06 15:44:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 15:44:19 -0700 |
| commit | 84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch) | |
| tree | b91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/newview/lllandmarklist.h | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff) | |
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
Diffstat (limited to 'indra/newview/lllandmarklist.h')
| -rw-r--r-- | indra/newview/lllandmarklist.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lllandmarklist.h b/indra/newview/lllandmarklist.h index b50332b215..6ca5ee19a6 100644 --- a/indra/newview/lllandmarklist.h +++ b/indra/newview/lllandmarklist.h @@ -49,7 +49,7 @@ public: //const LLLandmark* getFirst() { return mList.getFirstData(); } //const LLLandmark* getNext() { return mList.getNextData(); } - BOOL assetExists(const LLUUID& asset_uuid); + bool assetExists(const LLUUID& asset_uuid); LLLandmark* getAsset(const LLUUID& asset_uuid, loaded_callback_t cb = NULL); static void processGetAssetReply( const LLUUID& uuid, @@ -58,9 +58,9 @@ public: S32 status, LLExtStat ext_status ); - // Returns TRUE if loading the landmark with given asset_uuid has been requested + // Returns true if loading the landmark with given asset_uuid has been requested // but is not complete yet. - BOOL isAssetInLoadedCallbackMap(const LLUUID& asset_uuid); + bool isAssetInLoadedCallbackMap(const LLUUID& asset_uuid); protected: void onRegionHandle(const LLUUID& landmark_id); |