Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/newview/llpanelobjectinventory.h b/indra/newview/llpanelobjectinventory.h
index cef1ca90e5..c150a841ae 100644
--- a/indra/newview/llpanelobjectinventory.h
+++ b/indra/newview/llpanelobjectinventory.h
@@ -60,7 +60,7 @@ public:
     LLPanelObjectInventory(const Params&);
     virtual ~LLPanelObjectInventory();
 
-    virtual BOOL postBuild();
+    virtual bool postBuild();
 
     LLFolderViewModelInventory& getRootViewModel() { return mInventoryViewModel; }
 
@@ -76,7 +76,7 @@ public:
 
     virtual void draw();
     virtual void deleteAllChildren();
-    virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);
+    virtual bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);
 
     /*virtual*/ void onFocusLost();
     /*virtual*/ void onFocusReceived();
@@ -101,8 +101,8 @@ protected:
     void removeItemID(const LLUUID& id);
     void clearItemIDs();
 
-    BOOL            handleKeyHere( KEY key, MASK mask );
-    BOOL            isSelectionRemovable();
+    bool            handleKeyHere( KEY key, MASK mask );
+    bool            isSelectionRemovable();
 
 private:
     std::map<LLUUID, LLFolderViewItem*> mItemMap;
@@ -112,9 +112,9 @@ private:
 
     LLUUID mTaskUUID;
     LLUUID mAttachmentUUID;
-    BOOL mHaveInventory; // 'Loading' label and used for initial request
-    BOOL mIsInventoryEmpty; // 'Empty' label
-    BOOL mInventoryNeedsUpdate; // for idle, set on changed callback
+    bool mHaveInventory; // 'Loading' label and used for initial request
+    bool mIsInventoryEmpty; // 'Empty' label
+    bool mInventoryNeedsUpdate; // for idle, set on changed callback
     LLFolderViewModelInventory  mInventoryViewModel;
     bool mShowRootFolder;
 };