diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
| commit | c6d752b880cacca8fb8f10f28790a50161fcb9ab (patch) | |
| tree | 14910a69597962134f2e78e864a2f05962a16356 /indra/newview/lllandmarklist.cpp | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 7d87e41bbd5d4761b1eb17e49b7a00b948d84213 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
Diffstat (limited to 'indra/newview/lllandmarklist.cpp')
| -rw-r--r-- | indra/newview/lllandmarklist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp index d790c6f95e..11a6a755e4 100644 --- a/indra/newview/lllandmarklist.cpp +++ b/indra/newview/lllandmarklist.cpp @@ -176,12 +176,12 @@ void LLLandmarkList::processGetAssetReply( } } -BOOL LLLandmarkList::isAssetInLoadedCallbackMap(const LLUUID& asset_uuid) +bool LLLandmarkList::isAssetInLoadedCallbackMap(const LLUUID& asset_uuid) { return mLoadedCallbackMap.find(asset_uuid) != mLoadedCallbackMap.end(); } -BOOL LLLandmarkList::assetExists(const LLUUID& asset_uuid) +bool LLLandmarkList::assetExists(const LLUUID& asset_uuid) { return mList.count(asset_uuid) != 0 || mBadList.count(asset_uuid) != 0; } |