diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-13 19:26:20 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-13 19:26:20 -0500 |
| commit | 3194c89177e75db524c2c4e09cd40f239426a774 (patch) | |
| tree | 6b042ef3c8a9e983659d128296aeeedefa62fefd /indra/newview/llnearbychatbar.cpp | |
| parent | 4bb5cd169b297efbcf1bdb58a45be24932cf8241 (diff) | |
| parent | c5732c824fcde73953cfdf971ba35a88abd54d0c (diff) | |
Merging viewer2 changes into avp branch
--HG--
branch : avatar-pipeline
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 94b8791147..333646d2c5 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -97,9 +97,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) |