summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r--indra/newview/llpanelobjectinventory.cpp270
1 files changed, 135 insertions, 135 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 632e902d70..7c560019c4 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -123,27 +123,27 @@ public:
virtual LLUIImagePtr getIcon() const;
virtual void openItem();
- virtual BOOL canOpenItem() const { return FALSE; }
+ virtual bool canOpenItem() const { return false; }
virtual void closeItem() {}
virtual void selectItem() {}
virtual void navigateToFolder(bool new_window = false, bool change_mode = false) {}
- virtual BOOL isItemRenameable() const;
- virtual BOOL renameItem(const std::string& new_name);
- virtual BOOL isItemMovable() const;
- virtual BOOL isItemRemovable() const;
- virtual BOOL removeItem();
+ virtual bool isItemRenameable() const;
+ virtual bool renameItem(const std::string& new_name);
+ virtual bool isItemMovable() const;
+ virtual bool isItemRemovable() const;
+ virtual bool removeItem();
virtual void removeBatch(std::vector<LLFolderViewModelItem*>& batch);
virtual void move(LLFolderViewModelItem* parent_listener);
virtual bool isItemCopyable(bool can_copy_as_link = true) const;
- virtual BOOL copyToClipboard() const;
- virtual BOOL cutToClipboard();
- virtual BOOL isClipboardPasteable() const;
+ virtual bool copyToClipboard() const;
+ virtual bool cutToClipboard();
+ virtual bool isClipboardPasteable() const;
virtual void pasteFromClipboard();
virtual void pasteLinkFromClipboard();
virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
virtual void performAction(LLInventoryModel* model, std::string action);
- virtual BOOL isUpToDate() const { return TRUE; }
- virtual bool hasChildren() const { return FALSE; }
+ virtual bool isUpToDate() const { return true; }
+ virtual bool hasChildren() const { return false; }
virtual LLInventoryType::EType getInventoryType() const { return LLInventoryType::IT_NONE; }
virtual LLWearableType::EType getWearableType() const { return LLWearableType::WT_NONE; }
virtual LLSettingsType::type_e getSettingsType() const { return LLSettingsType::ST_NONE; }
@@ -153,8 +153,8 @@ public:
// LLDragAndDropBridge functionality
virtual LLToolDragAndDrop::ESource getDragSource() const { return LLToolDragAndDrop::SOURCE_WORLD; }
- virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const;
- virtual BOOL dragOrDrop(MASK mask, BOOL drop,
+ virtual bool startDrag(EDragAndDropType* type, LLUUID* id) const;
+ virtual bool dragOrDrop(MASK mask, bool drop,
EDragAndDropType cargo_type,
void* cargo_data,
std::string& tooltip_msg);
@@ -236,9 +236,9 @@ const std::string& LLTaskInvFVBridge::getDisplayName() const
}
const LLPermissions& perm(item->getPermissions());
- BOOL copy = gAgent.allowOperation(PERM_COPY, perm, GP_OBJECT_MANIPULATE);
- BOOL mod = gAgent.allowOperation(PERM_MODIFY, perm, GP_OBJECT_MANIPULATE);
- BOOL xfer = gAgent.allowOperation(PERM_TRANSFER, perm, GP_OBJECT_MANIPULATE);
+ bool copy = gAgent.allowOperation(PERM_COPY, perm, GP_OBJECT_MANIPULATE);
+ bool mod = gAgent.allowOperation(PERM_MODIFY, perm, GP_OBJECT_MANIPULATE);
+ bool xfer = gAgent.allowOperation(PERM_TRANSFER, perm, GP_OBJECT_MANIPULATE);
if(!copy)
{
@@ -277,7 +277,7 @@ void LLTaskInvFVBridge::setCreationDate(time_t creation_date_utc)
LLUIImagePtr LLTaskInvFVBridge::getIcon() const
{
- const BOOL item_is_multi = (mFlags & LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS);
+ const bool item_is_multi = (mFlags & LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS);
return LLInventoryIcon::getIcon(mAssetType, mInventoryType, 0, item_is_multi );
}
@@ -288,9 +288,9 @@ void LLTaskInvFVBridge::openItem()
LL_DEBUGS() << "LLTaskInvFVBridge::openItem()" << LL_ENDL;
}
-BOOL LLTaskInvFVBridge::isItemRenameable() const
+bool LLTaskInvFVBridge::isItemRenameable() const
{
- if(gAgent.isGodlike()) return TRUE;
+ if(gAgent.isGodlike()) return true;
LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
if(object)
{
@@ -298,13 +298,13 @@ BOOL LLTaskInvFVBridge::isItemRenameable() const
if(item && gAgent.allowOperation(PERM_MODIFY, item->getPermissions(),
GP_OBJECT_MANIPULATE, GOD_LIKE))
{
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
-BOOL LLTaskInvFVBridge::renameItem(const std::string& new_name)
+bool LLTaskInvFVBridge::renameItem(const std::string& new_name)
{
LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
if(object)
@@ -322,29 +322,29 @@ BOOL LLTaskInvFVBridge::renameItem(const std::string& new_name)
false);
}
}
- return TRUE;
+ return true;
}
-BOOL LLTaskInvFVBridge::isItemMovable() const
+bool LLTaskInvFVBridge::isItemMovable() const
{
//LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
//if(object && (object->permModify() || gAgent.isGodlike()))
//{
- // return TRUE;
+ // return true;
//}
- //return FALSE;
- return TRUE;
+ //return false;
+ return true;
}
-BOOL LLTaskInvFVBridge::isItemRemovable() const
+bool LLTaskInvFVBridge::isItemRemovable() const
{
const LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
if(object
&& (object->permModify() || object->permYouOwner()))
{
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool remove_task_inventory_callback(const LLSD& notification, const LLSD& response, LLPanelObjectInventory* panel)
@@ -372,7 +372,7 @@ bool remove_task_inventory_callback(const LLSD& notification, const LLSD& respon
// ! REFACTOR ! two_uuids_list_t is also defined in llinventorybridge.h, but differently.
typedef std::pair<LLUUID, std::list<LLUUID> > panel_two_uuids_list_t;
typedef std::pair<LLPanelObjectInventory*, panel_two_uuids_list_t> remove_data_t;
-BOOL LLTaskInvFVBridge::removeItem()
+bool LLTaskInvFVBridge::removeItem()
{
if(isItemRemovable() && mPanel)
{
@@ -383,7 +383,7 @@ BOOL LLTaskInvFVBridge::removeItem()
{
// just do it.
object->removeInventory(mUUID);
- return TRUE;
+ return true;
}
else
{
@@ -391,11 +391,11 @@ BOOL LLTaskInvFVBridge::removeItem()
payload["task_id"] = mPanel->getTaskUUID();
payload["inventory_ids"].append(mUUID);
LLNotificationsUtil::add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel));
- return FALSE;
+ return false;
}
}
}
- return FALSE;
+ return false;
}
void LLTaskInvFVBridge::removeBatch(std::vector<LLFolderViewModelItem*>& batch)
@@ -450,19 +450,19 @@ bool LLTaskInvFVBridge::isItemCopyable(bool can_link) const
GP_OBJECT_MANIPULATE);
}
-BOOL LLTaskInvFVBridge::copyToClipboard() const
+bool LLTaskInvFVBridge::copyToClipboard() const
{
- return FALSE;
+ return false;
}
-BOOL LLTaskInvFVBridge::cutToClipboard()
+bool LLTaskInvFVBridge::cutToClipboard()
{
- return FALSE;
+ return false;
}
-BOOL LLTaskInvFVBridge::isClipboardPasteable() const
+bool LLTaskInvFVBridge::isClipboardPasteable() const
{
- return FALSE;
+ return false;
}
void LLTaskInvFVBridge::pasteFromClipboard()
@@ -473,7 +473,7 @@ void LLTaskInvFVBridge::pasteLinkFromClipboard()
{
}
-BOOL LLTaskInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
+bool LLTaskInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
{
//LL_INFOS() << "LLTaskInvFVBridge::startDrag()" << LL_ENDL;
if(mPanel)
@@ -493,7 +493,7 @@ BOOL LLTaskInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
// due to a race condition and possible exploit where
// attached objects do not update their inventory items
// when their contents are manipulated
- return FALSE;
+ return false;
}
if((can_copy && perm.allowTransferTo(gAgent.getID()))
|| object->permYouOwner())
@@ -503,21 +503,21 @@ BOOL LLTaskInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
*type = LLViewerAssetType::lookupDragAndDropType(inv->getType());
*id = inv->getUUID();
- return TRUE;
+ return true;
}
}
}
}
- return FALSE;
+ return false;
}
-BOOL LLTaskInvFVBridge::dragOrDrop(MASK mask, BOOL drop,
+bool LLTaskInvFVBridge::dragOrDrop(MASK mask, bool drop,
EDragAndDropType cargo_type,
void* cargo_data,
std::string& tooltip_msg)
{
//LL_INFOS() << "LLTaskInvFVBridge::dragOrDrop()" << LL_ENDL;
- return FALSE;
+ return false;
}
// virtual
@@ -585,18 +585,18 @@ public:
virtual LLUIImagePtr getIcon() const;
virtual const std::string& getDisplayName() const;
- virtual BOOL isItemRenameable() const;
- // virtual BOOL isItemCopyable() const { return FALSE; }
- virtual BOOL renameItem(const std::string& new_name);
- virtual BOOL isItemRemovable() const;
+ virtual bool isItemRenameable() const;
+ // virtual bool isItemCopyable() const { return false; }
+ virtual bool renameItem(const std::string& new_name);
+ virtual bool isItemRemovable() const;
virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
virtual bool hasChildren() const;
- virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const;
- virtual BOOL dragOrDrop(MASK mask, BOOL drop,
+ virtual bool startDrag(EDragAndDropType* type, LLUUID* id) const;
+ virtual bool dragOrDrop(MASK mask, bool drop,
EDragAndDropType cargo_type,
void* cargo_data,
std::string& tooltip_msg);
- virtual BOOL canOpenItem() const { return TRUE; }
+ virtual bool canOpenItem() const { return true; }
virtual void openItem();
virtual EInventorySortGroup getSortGroup() const { return SG_NORMAL_FOLDER; }
};
@@ -638,19 +638,19 @@ const std::string& LLTaskCategoryBridge::getDisplayName() const
return mDisplayName;
}
-BOOL LLTaskCategoryBridge::isItemRenameable() const
+bool LLTaskCategoryBridge::isItemRenameable() const
{
- return FALSE;
+ return false;
}
-BOOL LLTaskCategoryBridge::renameItem(const std::string& new_name)
+bool LLTaskCategoryBridge::renameItem(const std::string& new_name)
{
- return FALSE;
+ return false;
}
-BOOL LLTaskCategoryBridge::isItemRemovable() const
+bool LLTaskCategoryBridge::isItemRemovable() const
{
- return FALSE;
+ return false;
}
void LLTaskCategoryBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
@@ -662,16 +662,16 @@ void LLTaskCategoryBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
bool LLTaskCategoryBridge::hasChildren() const
{
- // return TRUE if we have or do know know if we have children.
- // *FIX: For now, return FALSE - we will know for sure soon enough.
- return FALSE;
+ // return true if we have or do know know if we have children.
+ // *FIX: For now, return false - we will know for sure soon enough.
+ return false;
}
void LLTaskCategoryBridge::openItem()
{
}
-BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
+bool LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
{
//LL_INFOS() << "LLTaskInvFVBridge::startDrag()" << LL_ENDL;
if(mPanel && mUUID.notNull())
@@ -680,24 +680,24 @@ BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
if(object)
{
const LLInventoryObject* cat = object->getInventoryObject(mUUID);
- if ( (cat) && (move_inv_category_world_to_agent(mUUID, LLUUID::null, FALSE)) )
+ if ( (cat) && (move_inv_category_world_to_agent(mUUID, LLUUID::null, false)) )
{
*type = LLViewerAssetType::lookupDragAndDropType(cat->getType());
*id = mUUID;
- return TRUE;
+ return true;
}
}
}
- return FALSE;
+ return false;
}
-BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop,
+bool LLTaskCategoryBridge::dragOrDrop(MASK mask, bool drop,
EDragAndDropType cargo_type,
void* cargo_data,
std::string& tooltip_msg)
{
//LL_INFOS() << "LLTaskCategoryBridge::dragOrDrop()" << LL_ENDL;
- BOOL accept = FALSE;
+ bool accept = false;
LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
if(object)
{
@@ -739,14 +739,14 @@ BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop,
&& (LLToolDragAndDrop::SOURCE_WORLD != LLToolDragAndDrop::getInstance()->getSource())
&& (LLToolDragAndDrop::SOURCE_NOTECARD != LLToolDragAndDrop::getInstance()->getSource()))
{
- accept = TRUE;
+ accept = true;
}
if(accept && drop)
{
LLViewerInventoryItem* item = (LLViewerInventoryItem*)cargo_data;
// rez in the script active by default, rez in
// inactive if the control key is being held down.
- BOOL active = ((mask & MASK_CONTROL) == 0);
+ bool active = ((mask & MASK_CONTROL) == 0);
LLToolDragAndDrop::dropScript(object, item, active,
LLToolDragAndDrop::getInstance()->getSource(),
LLToolDragAndDrop::getInstance()->getSourceID());
@@ -771,7 +771,7 @@ public:
const std::string& name) :
LLTaskInvFVBridge(panel, uuid, name) {}
- virtual BOOL canOpenItem() const { return TRUE; }
+ virtual bool canOpenItem() const { return true; }
virtual void openItem();
};
@@ -803,7 +803,7 @@ public:
const std::string& name) :
LLTaskInvFVBridge(panel, uuid, name) {}
- virtual BOOL canOpenItem() const { return TRUE; }
+ virtual bool canOpenItem() const { return true; }
virtual void openItem();
virtual void performAction(LLInventoryModel* model, std::string action);
virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
@@ -905,18 +905,18 @@ public:
const std::string& name) :
LLTaskInvFVBridge(panel, uuid, name) {}
- virtual BOOL isItemRenameable() const;
- virtual BOOL renameItem(const std::string& new_name);
+ virtual bool isItemRenameable() const;
+ virtual bool renameItem(const std::string& new_name);
};
-BOOL LLTaskCallingCardBridge::isItemRenameable() const
+bool LLTaskCallingCardBridge::isItemRenameable() const
{
- return FALSE;
+ return false;
}
-BOOL LLTaskCallingCardBridge::renameItem(const std::string& new_name)
+bool LLTaskCallingCardBridge::renameItem(const std::string& new_name)
{
- return FALSE;
+ return false;
}
@@ -932,7 +932,7 @@ public:
const std::string& name) :
LLTaskInvFVBridge(panel, uuid, name) {}
- //static BOOL enableIfCopyable( void* userdata );
+ //static bool enableIfCopyable( void* userdata );
};
class LLTaskLSLBridge : public LLTaskScriptBridge
@@ -943,9 +943,9 @@ public:
const std::string& name) :
LLTaskScriptBridge(panel, uuid, name) {}
- virtual BOOL canOpenItem() const { return TRUE; }
+ virtual bool canOpenItem() const { return true; }
virtual void openItem();
- virtual BOOL removeItem();
+ virtual bool removeItem();
//virtual void buildContextMenu(LLMenuGL& menu);
//static void copyToInventory(void* userdata);
@@ -968,7 +968,7 @@ void LLTaskLSLBridge::openItem()
LLLiveLSLEditor* preview = LLFloaterReg::showTypedInstance<LLLiveLSLEditor>("preview_scriptedit", floater_key, TAKE_FOCUS_YES);
if (preview)
{
- LLSelectNode *node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(NULL, TRUE);
+ LLSelectNode *node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(NULL, true);
if (node && node->mValid)
{
preview->setObjectName(node->mName);
@@ -982,7 +982,7 @@ void LLTaskLSLBridge::openItem()
}
}
-BOOL LLTaskLSLBridge::removeItem()
+bool LLTaskLSLBridge::removeItem()
{
LLFloaterReg::hideInstance("preview_scriptedit", LLSD(mUUID));
return LLTaskInvFVBridge::removeItem();
@@ -1014,9 +1014,9 @@ public:
const std::string& name) :
LLTaskInvFVBridge(panel, uuid, name) {}
- virtual BOOL canOpenItem() const { return TRUE; }
+ virtual bool canOpenItem() const { return true; }
virtual void openItem();
- virtual BOOL removeItem();
+ virtual bool removeItem();
};
void LLTaskNotecardBridge::openItem()
@@ -1029,7 +1029,7 @@ void LLTaskNotecardBridge::openItem()
// Note: even if we are not allowed to modify copyable notecard, we should be able to view it
LLInventoryItem *item = dynamic_cast<LLInventoryItem*>(object->getInventoryObject(mUUID));
- BOOL item_copy = item && gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE);
+ bool item_copy = item && gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE);
if( item_copy
|| object->permModify()
|| gAgent.isGodlike())
@@ -1045,7 +1045,7 @@ void LLTaskNotecardBridge::openItem()
}
}
-BOOL LLTaskNotecardBridge::removeItem()
+bool LLTaskNotecardBridge::removeItem()
{
LLFloaterReg::hideInstance("preview_notecard", LLSD(mUUID));
return LLTaskInvFVBridge::removeItem();
@@ -1063,9 +1063,9 @@ public:
const std::string& name) :
LLTaskInvFVBridge(panel, uuid, name) {}
- virtual BOOL canOpenItem() const { return TRUE; }
+ virtual bool canOpenItem() const { return true; }
virtual void openItem();
- virtual BOOL removeItem();
+ virtual bool removeItem();
};
void LLTaskGestureBridge::openItem()
@@ -1078,7 +1078,7 @@ void LLTaskGestureBridge::openItem()
LLPreviewGesture::show(mUUID, mPanel->getTaskUUID());
}
-BOOL LLTaskGestureBridge::removeItem()
+bool LLTaskGestureBridge::removeItem()
{
// Don't need to deactivate gesture because gestures inside objects can never be active.
LLFloaterReg::hideInstance("preview_gesture", LLSD(mUUID));
@@ -1097,9 +1097,9 @@ public:
const std::string& name) :
LLTaskInvFVBridge(panel, uuid, name) {}
- virtual BOOL canOpenItem() const { return TRUE; }
+ virtual bool canOpenItem() const { return true; }
virtual void openItem();
- virtual BOOL removeItem();
+ virtual bool removeItem();
};
void LLTaskAnimationBridge::openItem()
@@ -1117,7 +1117,7 @@ void LLTaskAnimationBridge::openItem()
}
}
-BOOL LLTaskAnimationBridge::removeItem()
+bool LLTaskAnimationBridge::removeItem()
{
LLFloaterReg::hideInstance("preview_anim", LLSD(mUUID));
return LLTaskInvFVBridge::removeItem();
@@ -1141,7 +1141,7 @@ public:
LLUIImagePtr LLTaskWearableBridge::getIcon() const
{
- return LLInventoryIcon::getIcon(mAssetType, mInventoryType, mFlags, FALSE );
+ return LLInventoryIcon::getIcon(mAssetType, mInventoryType, mFlags, false );
}
///----------------------------------------------------------------------------
@@ -1163,7 +1163,7 @@ public:
LLUIImagePtr LLTaskSettingsBridge::getIcon() const
{
- return LLInventoryIcon::getIcon(mAssetType, mInventoryType, mFlags, FALSE);
+ return LLInventoryIcon::getIcon(mAssetType, mInventoryType, mFlags, false);
}
LLSettingsType::type_e LLTaskSettingsBridge::getSettingsType() const
@@ -1183,9 +1183,9 @@ public:
const std::string& name) :
LLTaskInvFVBridge(panel, uuid, name) {}
- BOOL canOpenItem() const override { return TRUE; }
+ bool canOpenItem() const override { return true; }
void openItem() override;
- BOOL removeItem() override;
+ bool removeItem() override;
};
void LLTaskMaterialBridge::openItem()
@@ -1198,7 +1198,7 @@ void LLTaskMaterialBridge::openItem()
// Note: even if we are not allowed to modify copyable notecard, we should be able to view it
LLInventoryItem *item = dynamic_cast<LLInventoryItem*>(object->getInventoryObject(mUUID));
- BOOL item_copy = item && gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE);
+ bool item_copy = item && gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE);
if( item_copy
|| object->permModify()
|| gAgent.isGodlike())
@@ -1211,12 +1211,12 @@ void LLTaskMaterialBridge::openItem()
{
mat->setObjectID(mPanel->getTaskUUID());
mat->openFloater(floater_key);
- mat->setFocus(TRUE);
+ mat->setFocus(true);
}
}
}
-BOOL LLTaskMaterialBridge::removeItem()
+bool LLTaskMaterialBridge::removeItem()
{
LLFloaterReg::hideInstance("material_editor", LLSD(mUUID));
return LLTaskInvFVBridge::removeItem();
@@ -1339,9 +1339,9 @@ LLPanelObjectInventory::LLPanelObjectInventory(const LLPanelObjectInventory::Par
LLPanel(p),
mScroller(NULL),
mFolders(NULL),
- mHaveInventory(FALSE),
- mIsInventoryEmpty(TRUE),
- mInventoryNeedsUpdate(FALSE),
+ mHaveInventory(false),
+ mIsInventoryEmpty(true),
+ mInventoryNeedsUpdate(false),
mInventoryViewModel(p.name),
mShowRootFolder(p.show_root_folder)
{
@@ -1365,7 +1365,7 @@ LLPanelObjectInventory::~LLPanelObjectInventory()
}
}
-BOOL LLPanelObjectInventory::postBuild()
+bool LLPanelObjectInventory::postBuild()
{
// clear contents and initialize menus, sets up mFolders
reset();
@@ -1373,7 +1373,7 @@ BOOL LLPanelObjectInventory::postBuild()
// Register an idle update callback
gIdleCallbacks.addFunction(idle, this);
- return TRUE;
+ return true;
}
void LLPanelObjectInventory::doToSelected(const LLSD& userdata)
@@ -1383,8 +1383,8 @@ void LLPanelObjectInventory::doToSelected(const LLSD& userdata)
void LLPanelObjectInventory::clearContents()
{
- mHaveInventory = FALSE;
- mIsInventoryEmpty = TRUE;
+ mHaveInventory = false;
+ mIsInventoryEmpty = true;
if (LLToolDragAndDrop::getInstance() && LLToolDragAndDrop::getInstance()->getSource() == LLToolDragAndDrop::SOURCE_WORLD)
{
LLToolDragAndDrop::getInstance()->endDrag();
@@ -1463,7 +1463,7 @@ void LLPanelObjectInventory::inventoryChanged(LLViewerObject* object,
// << " task UUID: " << object->mID << LL_ENDL;
if(mTaskUUID == object->mID)
{
- mInventoryNeedsUpdate = TRUE;
+ mInventoryNeedsUpdate = true;
}
}
@@ -1475,7 +1475,7 @@ void LLPanelObjectInventory::updateInventory()
// We're still interested in this task's inventory.
std::vector<LLUUID> selected_item_ids;
std::set<LLFolderViewItem*> selected_items;
- BOOL inventory_has_focus = FALSE;
+ bool inventory_has_focus = false;
if (mHaveInventory && mFolders)
{
selected_items = mFolders->getSelectionList();
@@ -1498,14 +1498,14 @@ void LLPanelObjectInventory::updateInventory()
if (inventory_root)
{
reset();
- mIsInventoryEmpty = FALSE;
+ mIsInventoryEmpty = false;
createFolderViews(inventory_root, contents);
- mFolders->setEnabled(TRUE);
+ mFolders->setEnabled(true);
}
else
{
// TODO: create an empty inventory
- mIsInventoryEmpty = TRUE;
+ mIsInventoryEmpty = true;
}
mHaveInventory = !mIsInventoryEmpty || !objectp->isInventoryDirty();
@@ -1520,8 +1520,8 @@ void LLPanelObjectInventory::updateInventory()
else
{
// TODO: create an empty inventory
- mIsInventoryEmpty = TRUE;
- mHaveInventory = TRUE;
+ mIsInventoryEmpty = true;
+ mHaveInventory = true;
}
// restore previous selection
@@ -1536,12 +1536,12 @@ void LLPanelObjectInventory::updateInventory()
//HACK: "set" first item then "change" each other one to get keyboard focus right
if (first_item)
{
- mFolders->setSelection(selected_item, TRUE, inventory_has_focus);
- first_item = FALSE;
+ mFolders->setSelection(selected_item, true, inventory_has_focus);
+ first_item = false;
}
else
{
- mFolders->changeSelection(selected_item, TRUE);
+ mFolders->changeSelection(selected_item, true);
}
}
}
@@ -1550,7 +1550,7 @@ void LLPanelObjectInventory::updateInventory()
{
mFolders->requestArrange();
}
- mInventoryNeedsUpdate = FALSE;
+ mInventoryNeedsUpdate = false;
// Edit menu handler is set in onFocusReceived
}
@@ -1671,8 +1671,8 @@ void LLPanelObjectInventory::createViewsForCategory(LLInventoryObject::object_li
void LLPanelObjectInventory::refresh()
{
//LL_INFOS() << "LLPanelObjectInventory::refresh()" << LL_ENDL;
- BOOL has_inventory = FALSE;
- const BOOL non_root_ok = TRUE;
+ bool has_inventory = false;
+ const bool non_root_ok = true;
LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
LLSelectNode* node = selection->getFirstRootNode(NULL, non_root_ok);
if(node && node->mValid)
@@ -1683,7 +1683,7 @@ void LLPanelObjectInventory::refresh()
{
// determine if we need to make a request. Start with a
// default based on if we have inventory at all.
- BOOL make_request = !mHaveInventory;
+ bool make_request = !mHaveInventory;
// If the task id is different than what we've stored,
// then make the request.
@@ -1691,7 +1691,7 @@ void LLPanelObjectInventory::refresh()
{
mTaskUUID = object->mID;
mAttachmentUUID = object->getAttachmentItemID();
- make_request = TRUE;
+ make_request = true;
// This is a new object so pre-emptively clear the contents
// Otherwise we show the old stuff until the update comes in
@@ -1717,7 +1717,7 @@ void LLPanelObjectInventory::refresh()
{
if(node->mInventorySerial != object->getInventorySerial() || object->isInventoryDirty())
{
- make_request = TRUE;
+ make_request = true;
}
}
@@ -1726,7 +1726,7 @@ void LLPanelObjectInventory::refresh()
{
requestVOInventory();
}
- has_inventory = TRUE;
+ has_inventory = true;
}
}
if(!has_inventory)
@@ -1795,14 +1795,14 @@ void LLPanelObjectInventory::deleteAllChildren()
LLView::deleteAllChildren();
}
-BOOL LLPanelObjectInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg)
+bool LLPanelObjectInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg)
{
if (mFolders)
{
LLFolderViewItem* folderp = mFolders->getNextFromChild(NULL);
if (!folderp)
{
- return FALSE;
+ return false;
}
// Try to pass on unmodified mouse coordinates
S32 local_x = x - mFolders->getRect().mLeft;
@@ -1820,7 +1820,7 @@ BOOL LLPanelObjectInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL dro
}
else
{
- return FALSE;
+ return false;
}
}
@@ -1886,9 +1886,9 @@ void LLPanelObjectInventory::clearItemIDs()
mItemMap.clear();
}
-BOOL LLPanelObjectInventory::handleKeyHere( KEY key, MASK mask )
+bool LLPanelObjectInventory::handleKeyHere( KEY key, MASK mask )
{
- BOOL handled = FALSE;
+ bool handled = false;
switch (key)
{
case KEY_DELETE:
@@ -1900,23 +1900,23 @@ BOOL LLPanelObjectInventory::handleKeyHere( KEY key, MASK mask )
if (isSelectionRemovable() && mask == MASK_NONE)
{
LLInventoryAction::doToSelected(&gInventory, mFolders, "delete");
- handled = TRUE;
+ handled = true;
}
break;
}
return handled;
}
-BOOL LLPanelObjectInventory::isSelectionRemovable()
+bool LLPanelObjectInventory::isSelectionRemovable()
{
if (!mFolders || !mFolders->getRoot())
{
- return FALSE;
+ return false;
}
std::set<LLFolderViewItem*> selection_set = mFolders->getRoot()->getSelectionList();
if (selection_set.empty())
{
- return FALSE;
+ return false;
}
for (std::set<LLFolderViewItem*>::iterator iter = selection_set.begin();
iter != selection_set.end();
@@ -1926,8 +1926,8 @@ BOOL LLPanelObjectInventory::isSelectionRemovable()
const LLFolderViewModelItemInventory *listener = dynamic_cast<const LLFolderViewModelItemInventory*>(item->getViewModelItem());
if (!listener || !listener->isItemRemovable() || listener->isItemInTrash())
{
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 17:12:12 +0000