diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-13 12:21:53 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-13 12:21:53 -0800 |
| commit | b964f3bccaf744ec719e7dff132a77801a419f2b (patch) | |
| tree | f5f09ad1904cbf87878d5f6e9f34acbdb64975e2 /indra/newview/llchatbar.cpp | |
| parent | ce397569bf40b5fe6e80eb0e302bf47b709f3e54 (diff) | |
| parent | b3b608b2a8e0678a86c86f3506d6424d4834be20 (diff) | |
Merge from 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) |