Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup. Octree vfunc reduction. Range-based for loops with map/array llsd types.

Browse Source
This commit is contained in:
Shyotl
2020-02-25 01:50:50 -06:00
parent e0efbd7d26
commit 5c2c2a8c01
37 changed files with 218 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpanelobjectinventory.cpp
View File

@@ -139,8 +139,8 @@ public:
virtual void performAction(LLInventoryModel* model, std::string action);
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 LLInventoryType::EType getInventoryType() const { return LLInventoryType::EType::IT_NONE; }
virtual LLWearableType::EType getWearableType() const { return LLWearableType::EType::WT_NONE; }
// LLDragAndDropBridge functionality
virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const;
@@ -161,7 +161,7 @@ LLTaskInvFVBridge::LLTaskInvFVBridge(
mPanel(panel),
mFlags(flags),
mAssetType(LLAssetType::AT_NONE),
mInventoryType(LLInventoryType::IT_NONE)
mInventoryType(LLInventoryType::EType::IT_NONE)
{
const LLInventoryItem *item = findItem();
if (item)
@@ -479,12 +479,9 @@ bool remove_task_inventory_callback(const LLSD& notification, const LLSD& respon
if(option == 0 && object)
{
// yes
LLSD::array_const_iterator list_end = notification["payload"]["inventory_ids"].endArray();
for (LLSD::array_const_iterator list_it = notification["payload"]["inventory_ids"].beginArray();
list_it != list_end;
++list_it)
for (auto const& entry : notification["payload"]["inventory_ids"].array())
{
object->removeInventory(list_it->asUUID());
object->removeInventory(entry.asUUID());
}
// refresh the UI.