summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatergesture.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-04-14 14:46:43 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-04-14 14:46:43 +0300
commitfee9ac8b4ab10ffdc75c61f29909080b1359aff8 (patch)
tree332650321f4144078478dad574bc98878cde0946 /indra/newview/llfloatergesture.cpp
parent079963c9295243c731916127e39bfa39ae9690ca (diff)
parent8dd62863092b10e012db20e818e72b53fd2ed84a (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfloatergesture.cpp')
-rw-r--r--indra/newview/llfloatergesture.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp
index 8ee8d13a9c..eff7131145 100644
--- a/indra/newview/llfloatergesture.cpp
+++ b/indra/newview/llfloatergesture.cpp
@@ -148,7 +148,8 @@ void LLFloaterGesture::done()
if (!unloaded_folders.empty())
{
LL_DEBUGS("Gesture")<< "Fetching subdirectories....." << LL_ENDL;
- fetch(unloaded_folders);
+ setFetchIDs(unloaded_folders);
+ startFetch();
}
else
{
@@ -202,7 +203,8 @@ BOOL LLFloaterGesture::postBuild()
folders.push_back(mGestureFolderID);
//perform loading Gesture directory anyway to make sure that all subdirectory are loaded too. See method done() for details.
gInventory.addObserver(this);
- fetch(folders);
+ setFetchIDs(folders);
+ startFetch();
if (mGestureList)
{