Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llinspectremoteobject.cpp b/indra/newview/llinspectremoteobject.cpp
index bf4ca40397..0060fe544d 100644
--- a/indra/newview/llinspectremoteobject.cpp
+++ b/indra/newview/llinspectremoteobject.cpp
@@ -51,7 +51,7 @@ public:
     LLInspectRemoteObject(const LLSD& object_id);
     virtual ~LLInspectRemoteObject() {};
 
-    /*virtual*/ BOOL postBuild(void);
+    /*virtual*/ bool postBuild(void);
     /*virtual*/ void onOpen(const LLSD& avatar_id);
 
     void onClickMap();
@@ -80,7 +80,7 @@ LLInspectRemoteObject::LLInspectRemoteObject(const LLSD& sd) :
 }
 
 /*virtual*/
-BOOL LLInspectRemoteObject::postBuild(void)
+bool LLInspectRemoteObject::postBuild(void)
 {
     // hook up the inspector's buttons
     getChild<LLUICtrl>("map_btn")->setCommitCallback(
@@ -90,7 +90,7 @@ BOOL LLInspectRemoteObject::postBuild(void)
     getChild<LLUICtrl>("close_btn")->setCommitCallback(
         boost::bind(&LLInspectRemoteObject::onClickClose, this));
 
-    return TRUE;
+    return true;
 }
 
 /*virtual*/