summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-01 17:50:48 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-01 17:50:48 -0400
commit1ec47c39a6c4a6e7e518d0b91a87f50596362f06 (patch)
tree718b5898ddddb396d0d5b1bfb462605fa08b5448 /indra/newview/llinventorypanel.cpp
parent12a1c0aa8b10c3c366dd07b760624c026176c561 (diff)
EXT-6679 : INFRASTRUCTURE : Have LLInvFVBridge contain a LLFolderView *mRoot instead of passing it along everywhere such as in performAction
mRoot is now stored for all LLInventoryBridge types. Did some superficial formatting cleanup for LLInventoryBridge.
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r--indra/newview/llinventorypanel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 4d490b0d24..c6c2d23a4b 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -506,8 +506,8 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
objectp->getType(),
LLInventoryType::IT_CATEGORY,
this,
+ mFolderRoot,
objectp->getUUID());
-
if (new_listener)
{
LLFolderViewFolder::Params params;
@@ -542,6 +542,7 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
item->getActualType(),
item->getInventoryType(),
this,
+ mFolderRoot,
item->getUUID(),
item->getFlags());