summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateroutbox.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-03-10 18:49:40 -0700
committerMerov Linden <merov@lindenlab.com>2014-03-10 18:49:40 -0700
commit9de02b0cd3ac05ce172e12dbc2d288a5deccba11 (patch)
tree4292a9d91d3f3ad87573ae044c91fd8fd4da5a29 /indra/newview/llfloateroutbox.cpp
parent00fe1b7fbe605ddcb6fb56e0a3d20b1208fbd5fd (diff)
DD-17 : WIP : some work on the suffix for Listing folders
Diffstat (limited to 'indra/newview/llfloateroutbox.cpp')
-rwxr-xr-xindra/newview/llfloateroutbox.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp
index 86387c548a..8f4daa83f9 100755
--- a/indra/newview/llfloateroutbox.cpp
+++ b/indra/newview/llfloateroutbox.cpp
@@ -732,23 +732,13 @@ void LLFloaterMerchantItems::onOpen(const LLSD& key)
setup();
}
- //
- // Update the floater view
- //
- updateView();
-
- //
- // Trigger fetch of the contents
- //
- fetchContents();
-
// Merov : Debug : Create fake Marketplace data if none is present
if (LLMarketplaceData::instance().isEmpty() && (getFolderCount() > 0))
{
LLInventoryModel::cat_array_t* cats;
LLInventoryModel::item_array_t* items;
gInventory.getDirectDescendentsOf(mRootFolderId, cats, items);
-
+
int index = 0;
for (LLInventoryModel::cat_array_t::iterator iter = cats->begin(); iter != cats->end(); iter++, index++)
{
@@ -761,6 +751,16 @@ void LLFloaterMerchantItems::onOpen(const LLSD& key)
LLMarketplaceData::instance().setActivation(category->getUUID(),(index%3 == 0));
}
}
+
+ //
+ // Update the floater view
+ //
+ updateView();
+
+ //
+ // Trigger fetch of the contents
+ //
+ fetchContents();
}
void LLFloaterMerchantItems::onFocusReceived()