summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorDenis Serdjuk <dserduk@productengine.com>2009-11-27 16:07:14 +0200
committerDenis Serdjuk <dserduk@productengine.com>2009-11-27 16:07:14 +0200
commit34d3d02101e1838a4d8b875850a12867866a2935 (patch)
tree9566251ef4668d7865313a35e555b8b9369f0097 /indra/newview/llstartup.cpp
parent8d776c4bdc1b272bd73d2b27c4687e64264d9e99 (diff)
fixed bug EXT-2785 All gestures appear in Gestures window only after inventory/gestures has been invoked
Cause: Specific implementation of LLInventoryCompletionObserver. It call done() on startup before all items had been loaded. Changes: LLGesturemanager will be loaded appropriated inventory item itself. LLGestureInventoryfetchObserver has been removed. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp25
1 files changed, 2 insertions, 23 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index e7fe85bdf0..db8bda008e 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -101,7 +101,6 @@
#include "llfeaturemanager.h"
#include "llfirstuse.h"
#include "llfloaterchat.h"
-#include "llfloatergesture.h"
#include "llfloaterhud.h"
#include "llfloaterland.h"
#include "llfloaterpreference.h"
@@ -299,23 +298,6 @@ namespace
};
}
-class LLGestureInventoryFetchObserver : public LLInventoryFetchObserver
-{
-public:
- LLGestureInventoryFetchObserver() {}
- virtual void done()
- {
- // we've downloaded all the items, so repaint the dialog
- LLFloaterGesture* floater = LLFloaterReg::findTypedInstance<LLFloaterGesture>("gestures");
- if (floater)
- {
- floater->refreshAll();
- }
- gInventory.removeObserver(this);
- delete this;
- }
-};
-
void update_texture_fetch()
{
LLAppViewer::getTextureCache()->update(1); // unpauses the texture cache thread
@@ -1825,11 +1807,8 @@ bool idle_startup()
item_ids.push_back(item_id);
}
}
-
- LLGestureInventoryFetchObserver* fetch = new LLGestureInventoryFetchObserver();
- fetch->fetchItems(item_ids);
- // deletes itself when done
- gInventory.addObserver(fetch);
+ // no need to add gesture to inventory observer, it's already made in constructor
+ LLGestureManager::instance().fetchItems(item_ids);
}
}
gDisplaySwapBuffers = TRUE;