diff options
-rw-r--r-- | indra/llui/llluafloater.cpp | 2 | ||||
-rw-r--r-- | indra/llui/llluafloater.h | 2 | ||||
-rw-r--r-- | indra/newview/llfloaterluadebug.cpp | 2 | ||||
-rw-r--r-- | indra/newview/llfloaterluadebug.h | 2 | ||||
-rw-r--r-- | indra/newview/llfloaterluascripts.cpp | 2 | ||||
-rw-r--r-- | indra/newview/llfloaterluascripts.h | 2 | ||||
-rw-r--r-- | indra/newview/lltoolplacer.cpp | 2 | ||||
-rw-r--r-- | indra/newview/lltoolplacer.h | 4 |
8 files changed, 9 insertions, 9 deletions
diff --git a/indra/llui/llluafloater.cpp b/indra/llui/llluafloater.cpp index ca80a2c451..ccdadc6ae0 100644 --- a/indra/llui/llluafloater.cpp +++ b/indra/llui/llluafloater.cpp @@ -157,7 +157,7 @@ LLLuaFloater::~LLLuaFloater() post(LLSD()); } -BOOL LLLuaFloater::postBuild() +bool LLLuaFloater::postBuild() { for (LLView *view : *getChildList()) { diff --git a/indra/llui/llluafloater.h b/indra/llui/llluafloater.h index d0641d41b0..41132f926d 100644 --- a/indra/llui/llluafloater.h +++ b/indra/llui/llluafloater.h @@ -34,7 +34,7 @@ class LLLuaFloater : public LLFloater { public: LLLuaFloater(const LLSD &key); - BOOL postBuild(); + bool postBuild(); virtual ~LLLuaFloater(); void registerCallback(const std::string &ctrl_name, const std::string &event); diff --git a/indra/newview/llfloaterluadebug.cpp b/indra/newview/llfloaterluadebug.cpp index ef24481464..2d0f8949e5 100644 --- a/indra/newview/llfloaterluadebug.cpp +++ b/indra/newview/llfloaterluadebug.cpp @@ -49,7 +49,7 @@ LLFloaterLUADebug::LLFloaterLUADebug(const LLSD &key) } -BOOL LLFloaterLUADebug::postBuild() +bool LLFloaterLUADebug::postBuild() { mResultOutput = getChild<LLTextEditor>("result_text"); mLineInput = getChild<LLLineEditor>("lua_cmd"); diff --git a/indra/newview/llfloaterluadebug.h b/indra/newview/llfloaterluadebug.h index 9f044df9d9..e27c63b74d 100644 --- a/indra/newview/llfloaterluadebug.h +++ b/indra/newview/llfloaterluadebug.h @@ -48,7 +48,7 @@ class LLFloaterLUADebug : LLFloaterLUADebug(const LLSD& key); virtual ~LLFloaterLUADebug(); - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); void onExecuteClicked(); void onBtnBrowse(); diff --git a/indra/newview/llfloaterluascripts.cpp b/indra/newview/llfloaterluascripts.cpp index 60cdadfbee..79623cdefb 100644 --- a/indra/newview/llfloaterluascripts.cpp +++ b/indra/newview/llfloaterluascripts.cpp @@ -60,7 +60,7 @@ LLFloaterLUAScripts::LLFloaterLUAScripts(const LLSD &key) } -BOOL LLFloaterLUAScripts::postBuild() +bool LLFloaterLUAScripts::postBuild() { mScriptList = getChild<LLScrollListCtrl>("scripts_list"); mScriptList->setRightMouseDownCallback([this](LLUICtrl *ctrl, S32 x, S32 y, MASK mask) { onScrollListRightClicked(ctrl, x, y);}); diff --git a/indra/newview/llfloaterluascripts.h b/indra/newview/llfloaterluascripts.h index 24d3f00a80..14ca42d6fb 100644 --- a/indra/newview/llfloaterluascripts.h +++ b/indra/newview/llfloaterluascripts.h @@ -37,7 +37,7 @@ class LLFloaterLUAScripts : LLFloaterLUAScripts(const LLSD &key); virtual ~LLFloaterLUAScripts(); - BOOL postBuild(); + bool postBuild(); void draw(); private: diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp index 63846bf5b7..2ac5d6b6b1 100644 --- a/indra/newview/lltoolplacer.cpp +++ b/indra/newview/lltoolplacer.cpp @@ -172,7 +172,7 @@ bool LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics ) return rezNewObject(pcode,hit_obj, hit_face, b_hit_land, ray_start_region, ray_end_region, regionp, use_physics); } -BOOL LLToolPlacer::rezNewObject(LLPCode pcode, LLViewerObject * hit_obj, S32 hit_face, BOOL b_hit_land, LLVector3 ray_start_region, +bool LLToolPlacer::rezNewObject(LLPCode pcode, LLViewerObject * hit_obj, S32 hit_face, bool b_hit_land, LLVector3 ray_start_region, LLVector3 ray_end_region, LLViewerRegion* regionp, U8 use_physics) { if( hit_obj && (hit_obj->isAvatar() || hit_obj->isAttachment()) ) diff --git a/indra/newview/lltoolplacer.h b/indra/newview/lltoolplacer.h index 421a2f25f7..92446c319b 100644 --- a/indra/newview/lltoolplacer.h +++ b/indra/newview/lltoolplacer.h @@ -50,8 +50,8 @@ public: static void setObjectType( LLPCode type ) { sObjectType = type; } static LLPCode getObjectType() { return sObjectType; } - static BOOL addObject(LLPCode pcode, S32 x, S32 y, U8 use_physics); - static BOOL rezNewObject(LLPCode pcode, LLViewerObject* hit_obj, S32 hit_face, BOOL b_hit_land, LLVector3 ray_start_region, +// static bool addObject(LLPCode pcode, S32 x, S32 y, U8 use_physics); + static bool rezNewObject(LLPCode pcode, LLViewerObject* hit_obj, S32 hit_face, bool b_hit_land, LLVector3 ray_start_region, LLVector3 ray_end_region, LLViewerRegion *regionp, U8 use_physics); protected: |