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

Ïntroduced LLFolderType and LLViewerAssetType (by Shyotl)

Browse Source
This commit is contained in:
Siana Gearz
2011-06-23 21:11:52 +02:00
parent 04e41002c5
commit 6348635d3f
62 changed files with 1688 additions and 1336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llpanelinventory.cpp
View File

@@ -81,6 +81,7 @@
#include "llviewerobjectlist.h"
#include "llviewerwindow.h"
#include "llwearable.h"
#include "llviewerassettype.h"
// [RLVa:KB] - Checked: 2010-03-27 (RLVa-1.2.0b)
#include "rlvhandler.h"
// [/RLVa:KB]
@@ -304,7 +305,7 @@ bool LLTaskInvFVBridge::commitBuyItem(const LLSD& notification, const LLSD& resp
msg->addUUIDFast(_PREHASH_ObjectID, notification["payload"]["task_id"].asUUID());
msg->addUUIDFast(_PREHASH_ItemID, notification["payload"]["item_id"].asUUID());
msg->addUUIDFast(_PREHASH_FolderID,
gInventory.findCategoryUUIDForType((LLAssetType::EType)notification["payload"]["type"].asInteger()));
gInventory.findCategoryUUIDForType(LLFolderType::assetTypeToFolderType((LLAssetType::EType)notification["payload"]["type"].asInteger())));
msg->sendReliable(object->getRegion()->getHost());
}
return false;
@@ -648,7 +649,7 @@ BOOL LLTaskInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
// || gAgent.isGodlike())
{
*type = LLAssetType::lookupDragAndDropType(inv->getType());
*type = LLViewerAssetType::lookupDragAndDropType(inv->getType());
*id = inv->getUUID();
return TRUE;
@@ -713,7 +714,7 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
if (!item)
{
hideContextEntries(menu, items, disabled_items);
hide_context_entries(menu, items, disabled_items);
return;
}
@@ -793,7 +794,7 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
}
// [/RLVa:KB]
hideContextEntries(menu, items, disabled_items);
hide_context_entries(menu, items, disabled_items);
}
@@ -855,7 +856,7 @@ void LLTaskCategoryBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
std::vector<std::string> items;
std::vector<std::string> disabled_items;
items.push_back(std::string("Task Open")); // *TODO: Translate
hideContextEntries(menu, items, disabled_items);
hide_context_entries(menu, items, disabled_items);
}
BOOL LLTaskCategoryBridge::hasChildren() const
@@ -876,7 +877,7 @@ BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
const LLInventoryObject* cat = object->getInventoryObject(mUUID);
if ( (cat) && (move_inv_category_world_to_agent(mUUID, LLUUID::null, FALSE)) )
{
*type = LLAssetType::lookupDragAndDropType(cat->getType());
*type = LLViewerAssetType::lookupDragAndDropType(cat->getType());
*id = mUUID;
return TRUE;
}
@@ -1165,7 +1166,7 @@ void LLTaskSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
NULL,
(void*)this));*/
hideContextEntries(menu, items, disabled_items);
hide_context_entries(menu, items, disabled_items);
}
///----------------------------------------------------------------------------
@@ -1850,7 +1851,7 @@ void LLPanelInventory::updateInventory()
if (objectp)
{
LLInventoryObject* inventory_root = objectp->getInventoryRoot();
InventoryObjectList contents;
LLInventoryObject::object_list_t contents;
objectp->getInventoryContents(contents);
if (inventory_root)
{
@@ -1903,7 +1904,7 @@ void LLPanelInventory::updateInventory()
// leads to an N^2 based on the category count. This could be greatly
// speeded with an efficient multimap implementation, but we don't
// have that in our current arsenal.
void LLPanelInventory::createFolderViews(LLInventoryObject* inventory_root, InventoryObjectList& contents)
void LLPanelInventory::createFolderViews(LLInventoryObject* inventory_root, LLInventoryObject::object_list_t& contents)
{
if (!inventory_root)
{
@@ -1937,8 +1938,8 @@ void LLPanelInventory::createViewsForCategory(LLInventoryObject::object_list_t*
LLTaskInvFVBridge* bridge;
LLFolderViewItem* view;
InventoryObjectList::iterator it = inventory->begin();
InventoryObjectList::iterator end = inventory->end();
LLInventoryObject::object_list_t::iterator it = inventory->begin();
LLInventoryObject::object_list_t::iterator end = inventory->end();
for( ; it != end; ++it)
{
LLInventoryObject* obj = *it;