Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 34 insertions, 34 deletions

diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 93382a1022..cc1c2885fc 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -94,7 +94,7 @@ public:
 
 
     virtual ~LLComboBox();
-    /*virtual*/ BOOL postBuild();
+    /*virtual*/ bool postBuild();
 
 protected:
     friend class LLUICtrlFactory;
@@ -111,18 +111,18 @@ public:
     // LLView interface
     virtual void    onFocusLost();
 
-    virtual BOOL    handleToolTip(S32 x, S32 y, MASK mask);
-    virtual BOOL    handleKeyHere(KEY key, MASK mask);
-    virtual BOOL    handleUnicodeCharHere(llwchar uni_char);
+    virtual bool    handleToolTip(S32 x, S32 y, MASK mask);
+    virtual bool    handleKeyHere(KEY key, MASK mask);
+    virtual bool    handleUnicodeCharHere(llwchar uni_char);
 
     // LLUICtrl interface
     virtual void    clear();                    // select nothing
     virtual void    onCommit();
-    virtual BOOL    acceptsTextInput() const        { return mAllowTextEntry; }
-    virtual BOOL    isDirty() const;            // Returns TRUE if the user has modified this control.
+    virtual bool    acceptsTextInput() const        { return mAllowTextEntry; }
+    virtual bool    isDirty() const;            // Returns true if the user has modified this control.
     virtual void    resetDirty();               // Clear dirty state
 
-    virtual void    setFocus(BOOL b);
+    virtual void    setFocus(bool b);
 
     // Selects item by underlying LLSD value, using LLSD::asString() matching.
     // For simple items, this is just the name of the label.
@@ -133,21 +133,21 @@ public:
     virtual LLSD    getValue() const;
 
     void            setTextEntry(const LLStringExplicit& text);
-    void            setKeystrokeOnEsc(BOOL enable);
+    void            setKeystrokeOnEsc(bool enable);
 
-    LLScrollListItem*   add(const std::string& name, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);   // add item "name" to menu
-    LLScrollListItem*   add(const std::string& name, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
-    LLScrollListItem*   add(const std::string& name, void* userdata, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
-    LLScrollListItem*   add(const std::string& name, LLSD value, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+    LLScrollListItem*   add(const std::string& name, EAddPosition pos = ADD_BOTTOM, bool enabled = true);   // add item "name" to menu
+    LLScrollListItem*   add(const std::string& name, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, bool enabled = true);
+    LLScrollListItem*   add(const std::string& name, void* userdata, EAddPosition pos = ADD_BOTTOM, bool enabled = true);
+    LLScrollListItem*   add(const std::string& name, LLSD value, EAddPosition pos = ADD_BOTTOM, bool enabled = true);
     LLScrollListItem*   addSeparator(EAddPosition pos = ADD_BOTTOM);
-    BOOL            remove( S32 index );    // remove item by index, return TRUE if found and removed
+    bool            remove( S32 index );    // remove item by index, return true if found and removed
     void            removeall() { clearRows(); }
     bool            itemExists(const std::string& name);
 
-    void            sortByName(BOOL ascending = TRUE); // Sort the entries in the combobox by name
+    void            sortByName(bool ascending = true); // Sort the entries in the combobox by name
 
-    // Select current item by name using selectItemByLabel.  Returns FALSE if not found.
-    BOOL            setSimple(const LLStringExplicit& name);
+    // Select current item by name using selectItemByLabel.  Returns false if not found.
+    bool            setSimple(const LLStringExplicit& name);
     // Get name of current item. Returns an empty string if not found.
     const std::string   getSimple() const;
     // Get contents of column x of selected row
@@ -160,12 +160,12 @@ public:
     // Updates the combobox label to match the selected list item.
     void            updateLabel();
 
-    BOOL            remove(const std::string& name);    // remove item "name", return TRUE if found and removed
+    bool            remove(const std::string& name);    // remove item "name", return true if found and removed
 
-    BOOL            setCurrentByIndex( S32 index );
+    bool            setCurrentByIndex( S32 index );
     S32             getCurrentIndex() const;
 
-    void            setEnabledByValue(const LLSD& value, BOOL enabled);
+    void            setEnabledByValue(const LLSD& value, bool enabled);
 
     void            createLineEditor(const Params&);
 
@@ -183,21 +183,21 @@ public:
     virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);
     virtual LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos = ADD_BOTTOM, const LLSD& id = LLSD());
     virtual void    clearRows();
-    virtual void    sortByColumn(const std::string& name, BOOL ascending);
+    virtual void    sortByColumn(const std::string& name, bool ascending);
 
     // LLCtrlSelectionInterface functions
-    virtual BOOL    getCanSelect() const                { return TRUE; }
-    virtual BOOL    selectFirstItem()                   { return setCurrentByIndex(0); }
-    virtual BOOL    selectNthItem( S32 index )          { return setCurrentByIndex(index); }
-    virtual BOOL    selectItemRange( S32 first, S32 last );
+    virtual bool    getCanSelect() const                { return true; }
+    virtual bool    selectFirstItem()                   { return setCurrentByIndex(0); }
+    virtual bool    selectNthItem( S32 index )          { return setCurrentByIndex(index); }
+    virtual bool    selectItemRange( S32 first, S32 last );
     virtual S32     getFirstSelectedIndex() const       { return getCurrentIndex(); }
-    virtual BOOL    setCurrentByID( const LLUUID& id );
+    virtual bool    setCurrentByID( const LLUUID& id );
     virtual LLUUID  getCurrentID() const;               // LLUUID::null if no items in menu
-    virtual BOOL    setSelectedByValue(const LLSD& value, BOOL selected);
+    virtual bool    setSelectedByValue(const LLSD& value, bool selected);
     virtual LLSD    getSelectedValue();
-    virtual BOOL    isSelected(const LLSD& value) const;
-    virtual BOOL    operateOnSelection(EOperation op);
-    virtual BOOL    operateOnAll(EOperation op);
+    virtual bool    isSelected(const LLSD& value) const;
+    virtual bool    operateOnSelection(EOperation op);
+    virtual bool    operateOnAll(EOperation op);
 
     //========================================================================
 
@@ -214,7 +214,7 @@ public:
     */
     boost::signals2::connection setReturnCallback( const commit_signal_t::slot_type& cb ) { return mOnReturnSignal.connect(cb); }
 
-    void            setButtonVisible(BOOL visible);
+    void            setButtonVisible(bool visible);
 
     void            onButtonMouseDown();
     void            onListMouseUp();
@@ -234,13 +234,13 @@ protected:
     EPreferredPosition  mListPosition;
     LLPointer<LLUIImage>    mArrowImage;
     LLUIString          mLabel;
-    BOOL                mHasAutocompletedText;
+    bool                mHasAutocompletedText;
 
 private:
-    BOOL                mAllowTextEntry;
-    BOOL                mAllowNewValues;
+    bool                mAllowTextEntry;
+    bool                mAllowNewValues;
     S32                 mMaxChars;
-    BOOL                mTextEntryTentative;
+    bool                mTextEntryTentative;
     commit_callback_t   mPrearrangeCallback;
     commit_callback_t   mTextEntryCallback;
     commit_callback_t   mTextChangedCallback;