summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-03 11:20:21 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-03 11:20:21 -0500
commitbd4ad607ba9015c97a013d734b1fa597924c0e07 (patch)
tree3c976b727e6da0d4a6a48416cba5fa4b8d283786 /indra/newview
parent2adf9d6b0490f7692998f0ed73c981238d5860fe (diff)
EXT-2410 : Accepting an offered notecard should open the inventorySP
Preliminary checkin to improve this infrastructure. --HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorypanel.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 88e7196ce6..938114ade0 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -547,7 +547,7 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
cat_iter != categories->end();
++cat_iter)
{
- const LLInventoryCategory* cat = (*cat_iter);
+ const LLViewerInventoryCategory* cat = (*cat_iter);
buildNewViews(cat->getUUID());
}
}
@@ -558,7 +558,7 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
item_iter != items->end();
++item_iter)
{
- const LLInventoryItem* item = (*item_iter);
+ const LLViewerInventoryItem* item = (*item_iter);
buildNewViews(item->getUUID());
}
}
@@ -857,7 +857,7 @@ void LLInventoryPanel::dumpSelectionInformation(void* user_data)
}
// static
-LLInventoryPanel* LLInventoryPanel::getActiveInventoryPanel()
+LLInventoryPanel* LLInventoryPanel::getActiveInventoryPanel(BOOL auto_open)
{
LLInventoryPanel* res = NULL;
@@ -879,7 +879,7 @@ LLInventoryPanel* LLInventoryPanel::getActiveInventoryPanel()
}
// Otherwise, open the inventorySP and use that.
- if (!res)
+ if (!res && auto_open)
{
LLSD key;
LLSidepanelInventory *sidepanel_inventory =