diff options
| author | James Cook <james@lindenlab.com> | 2010-05-26 15:23:49 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-26 15:23:49 -0700 |
| commit | db119d86a7a930c64b022c41386d37c001555d68 (patch) | |
| tree | fbb6f85408f4c35d14fc7b188c3cff0b86d0f02d | |
| parent | bd8c1c3b7e121a72c572aa7d12343d9c9dc671af (diff) | |
| parent | 0f86f811c269b7c45baae2ac9bc72df70ba6b520 (diff) | |
Merge
| -rw-r--r-- | indra/llui/llurlentry.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 13fd20faf8..472c15a240 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -160,8 +160,9 @@ void LLUrlEntryBase::callObservers(const std::string &id, const std::string &icon) { // notify all callbacks waiting on the given uuid - std::multimap<std::string, LLUrlEntryObserver>::iterator it; - for (it = mObservers.find(id); it != mObservers.end();) + typedef std::multimap<std::string, LLUrlEntryObserver>::iterator observer_it; + std::pair<observer_it, observer_it> matching_range = mObservers.equal_range(id); + for (observer_it it = matching_range.first; it != matching_range.second;) { // call the callback - give it the new label LLUrlEntryObserver &observer = it->second; @@ -342,8 +343,9 @@ void LLUrlEntryAgent::callObservers(const std::string &id, const std::string &icon) { // notify all callbacks waiting on the given uuid - std::multimap<std::string, LLUrlEntryObserver>::iterator it; - for (it = mObservers.find(id); it != mObservers.end();) + typedef std::multimap<std::string, LLUrlEntryObserver>::iterator observer_it; + std::pair<observer_it, observer_it> matching_range = mObservers.equal_range(id); + for (observer_it it = matching_range.first; it != matching_range.second;) { // call the callback - give it the new label LLUrlEntryObserver &observer = it->second; |