livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated inventory code to handle creation of the "Received Items" panel when 

the sim notifies the viewer that the folder is created.  Unfortunately, the
  sim is not yet doing this so a relog is required to properly get this working.
meow-7.2.2
Leslie Linden 2011-10-31 12:01:10 -07:00
parent f84a69a7e0
commit 130d017085
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llinventorymodel.cpp
View File

@ -2528,9 +2528,9 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
{
LLPointer<LLViewerInventoryCategory> tfolder = new LLViewerInventoryCategory(gAgent.getID());
tfolder->unpackMessage(msg, _PREHASH_FolderData, i);
//llinfos << "unpaked folder '" << tfolder->getName() << "' ("
// << tfolder->getUUID() << ") in " << tfolder->getParentUUID()
// << llendl;
llinfos << "unpacked folder '" << tfolder->getName() << "' ("
<< tfolder->getUUID() << ") in " << tfolder->getParentUUID()
<< llendl;
if(tfolder->getUUID().notNull())
{
folders.push_back(tfolder);
@ -2570,8 +2570,8 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
{
LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem;
titem->unpackMessage(msg, _PREHASH_ItemData, i);
//llinfos << "unpaked item '" << titem->getName() << "' in "
// << titem->getParentUUID() << llendl;
llinfos << "unpaked item '" << titem->getName() << "' in "
<< titem->getParentUUID() << llendl;
U32 callback_id;
msg->getU32Fast(_PREHASH_ItemData, _PREHASH_CallbackID, callback_id);
if(titem->getUUID().notNull())

21
indra/newview/llsidepanelinventory.cpp
View File

@ -113,21 +113,13 @@ public:
switch (added_category_type)
{
case LLFolderType::FT_INBOX:
mSidepanelInventory->enableInbox(true);
mSidepanelInventory->observeInboxModifications(added_category->getUUID());
break;
case LLFolderType::FT_OUTBOX:
mSidepanelInventory->enableOutbox(true);
mSidepanelInventory->observeOutboxModifications(added_category->getUUID());
break;
case LLFolderType::FT_NONE:
// HACK until sim update to properly create folder with system type
if (added_category->getName() == "Received Items")
{
mSidepanelInventory->observeInboxModifications(added_category->getUUID());
}
else if (added_category->getName() == "Merchant Outbox")
{
mSidepanelInventory->observeOutboxModifications(added_category->getUUID());
}
default:
break;
}
@ -288,7 +280,6 @@ BOOL LLSidepanelInventory::postBuild()
gSavedSettings.getControl("InventoryDisplayInbox")->getCommitSignal()->connect(boost::bind(&handleInventoryDisplayInboxChanged));
gSavedSettings.getControl("InventoryDisplayOutbox")->getCommitSignal()->connect(boost::bind(&handleInventoryDisplayOutboxChanged));
updateInboxOutbox();
// Update the verbs buttons state.
updateVerbs();
@ -316,20 +307,20 @@ void LLSidepanelInventory::updateInboxOutbox()
// Set up observer for inbox changes, if we have an inbox already
if (!inbox_id.isNull())
{
observeInboxModifications(inbox_id);
// Enable the display of the inbox if it exists
enableInbox(true);
observeInboxModifications(inbox_id);
}
#if ENABLE_MERCHANT_OUTBOX_PANEL
// Set up observer for outbox changes, if we have an outbox already
if (!outbox_id.isNull())
{
observeOutboxModifications(outbox_id);
// Enable the display of the outbox if it exists
enableOutbox(true);
observeOutboxModifications(outbox_id);
}
#endif
}