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

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llfloaterscriptlimits.h b/indra/newview/llfloaterscriptlimits.h
index 8c5bdb99cd..e1eb8cb079 100644
--- a/indra/newview/llfloaterscriptlimits.h
+++ b/indra/newview/llfloaterscriptlimits.h
@@ -47,7 +47,7 @@ class LLFloaterScriptLimits : public LLFloater
     friend class LLFloaterReg;
 public:
 
-    /*virtual*/ BOOL postBuild();
+    /*virtual*/ bool postBuild();
 
     // from LLPanel
     virtual void refresh();
@@ -71,7 +71,7 @@ class LLPanelScriptLimitsInfo : public LLPanel
 public:
     LLPanelScriptLimitsInfo();
 
-    virtual BOOL postBuild();
+    virtual bool postBuild();
     virtual void updateChild(LLUICtrl* child_ctrl);
 
 protected:
@@ -102,14 +102,14 @@ public:
     ~LLPanelScriptLimitsRegionMemory();
 
     // LLPanel
-    virtual BOOL postBuild();
+    virtual bool postBuild();
 
     void setRegionDetails(LLSD content);
     void setRegionSummary(LLSD content);
 
-    BOOL StartRequestChain();
+    bool StartRequestChain();
 
-    BOOL getLandScriptResources();
+    bool getLandScriptResources();
     void clearList();
     void showBeacon();
     void returnObjectsFromParcel(S32 local_id);