Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index fcf4d7ff98..f0f236d6ae 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -74,11 +74,11 @@ public:
 
     LLViewerObject *replaceObject(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); // TomY: hack to switch VO instances on the fly
 
-    BOOL killObject(LLViewerObject *objectp);
+    bool killObject(LLViewerObject *objectp);
     void killObjects(LLViewerRegion *regionp); // Kill all objects owned by a particular region.
     void killAllObjects();
 
-    void cleanDeadObjects(const BOOL use_timer = TRUE); // Clean up the dead object list.
+    void cleanDeadObjects(const bool use_timer = true); // Clean up the dead object list.
 
     // Simulator and viewer side object updates...
     void processUpdateCore(LLViewerObject* objectp, void** data, U32 block, const EObjectUpdateType update_type,
@@ -169,7 +169,7 @@ public:
 
     // if we paused in the last frame
     // used to discount stats from this frame
-    BOOL mWasPaused;
+    bool mWasPaused;
 
     static void getUUIDFromLocal(LLUUID &id,
                                 const U32 local_id,
@@ -180,7 +180,7 @@ public:
                                 const U32 ip,
                                 const U32 port); // Requires knowledge of message system info!
 
-    static BOOL removeFromLocalIDTable(const LLViewerObject* objectp);
+    static bool removeFromLocalIDTable(const LLViewerObject* objectp);
     // Used ONLY by the orphaned object code.
     static U64 getIndex(const U32 local_id, const U32 ip, const U32 port);