diff options
author | Denis Serdjuk <dserduk@productengine.com> | 2009-11-13 15:51:22 +0200 |
---|---|---|
committer | Denis Serdjuk <dserduk@productengine.com> | 2009-11-13 15:51:22 +0200 |
commit | 0ec8d0aacf47913ab8fd30d8424fa7146f135d15 (patch) | |
tree | 99de401149285fe306e3d5d65a4133b6317978bf /indra/newview/llnearbychatbar.cpp | |
parent | 61556f1acf36a1a8fc459fd17a8c0a4a74cc6eeb (diff) |
implemented major task EXT-1897 Ctl + G Gestures floater should show ALL gestures from inventory, not just Active Gestures
refactoring of gesture's manager
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
-rw-r--r-- | indra/newview/llnearbychatbar.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index 3993431311..236eaf8f0f 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -98,9 +98,10 @@ void LLGestureComboBox::refreshGestures() clearRows(); mGestures.clear(); - LLGestureManager::item_map_t::iterator it; + LLGestureManager::item_map_t::const_iterator it; + const LLGestureManager::item_map_t& active_gestures = LLGestureManager::instance().getActiveGestures(); LLSD::Integer idx(0); - for (it = LLGestureManager::instance().mActive.begin(); it != LLGestureManager::instance().mActive.end(); ++it) + for (it = active_gestures.begin(); it != active_gestures.end(); ++it) { LLMultiGesture* gesture = (*it).second; if (gesture) |