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

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llfloaterlinkreplace.h b/indra/newview/llfloaterlinkreplace.h
index 0eee0d6935..7f9f0b59e1 100644
--- a/indra/newview/llfloaterlinkreplace.h
+++ b/indra/newview/llfloaterlinkreplace.h
@@ -56,13 +56,13 @@ public:
         return mDADSignal.connect(cb);
     }
 
-    virtual BOOL postBuild()
+    virtual bool postBuild()
     {
-        setEnabled(FALSE);
+        setEnabled(false);
         return LLLineEditor::postBuild();
     }
 
-    virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+    virtual bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
                                    EDragAndDropType cargo_type,
                                    void* cargo_data,
                                    EAcceptance* accept,
@@ -86,10 +86,10 @@ public:
     LLFloaterLinkReplace(const LLSD& key);
     virtual ~LLFloaterLinkReplace();
 
-    BOOL postBuild();
+    bool postBuild();
     virtual void onOpen(const LLSD& key);
 
-    virtual BOOL tick();
+    virtual bool tick();
 
 private:
     void checkEnableStart();