diff options
| -rwxr-xr-x | indra/newview/app_settings/logcontrol.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/llappearancemgr.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index 64122bbb6c..1259039010 100755 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -42,8 +42,8 @@ </array> <key>tags</key> <array> - <!-- sample entry for debugging specific items <string>Avatar</string> + <!-- sample entry for debugging specific items <string>Voice</string> --> </array> diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index c149f38fcd..656949a9bb 100755 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -319,11 +319,11 @@ public: if (!mWaitTimes.empty()) { llwarns << "still waiting on " << mWaitTimes.size() << " items" << llendl; - for (std::map<LLUUID,LLTimer>::const_iterator it = mWaitTimes.begin(); + for (std::map<LLUUID,LLTimer>::iterator it = mWaitTimes.begin(); it != mWaitTimes.end();) { // Use a copy of iterator because it may be erased/invalidated. - std::map<LLUUID,LLTimer>::const_iterator curr_it = it; + std::map<LLUUID,LLTimer>::iterator curr_it = it; ++it; F32 time_waited = curr_it->second.getElapsedTimeF32(); |