diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-16 12:33:52 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-16 12:33:52 +0200 |
| commit | 471897cfabbfec8d4dbee65c837d5884310ea61a (patch) | |
| tree | d9ef29f52786b380bd3d496c1f5a258aefeeb772 /indra/newview/llchatbar.cpp | |
| parent | d149b28173c2b255bd1bf1db902368dfbdf3064a (diff) | |
| parent | e7519e8a977138627b429ca43a10184c82efc66e (diff) | |
Merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llchatbar.cpp')
| -rw-r--r-- | indra/newview/llchatbar.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp index 4523267edd..442dc660cd 100644 --- a/indra/newview/llchatbar.cpp +++ b/indra/newview/llchatbar.cpp @@ -210,8 +210,9 @@ void LLChatBar::refreshGestures() // collect list of unique gestures std::map <std::string, BOOL> unique; - LLGestureManager::item_map_t::iterator it; - for (it = LLGestureManager::instance().mActive.begin(); it != LLGestureManager::instance().mActive.end(); ++it) + LLGestureManager::item_map_t::const_iterator it; + const LLGestureManager::item_map_t& active_gestures = LLGestureManager::instance().getActiveGestures(); + for (it = active_gestures.begin(); it != active_gestures.end(); ++it) { LLMultiGesture* gesture = (*it).second; if (gesture) |