Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/lllandmarklist.h b/indra/newview/lllandmarklist.h
index bea5c84a9b..508148abde 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);