summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-05 17:58:35 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-05 17:58:35 -0500
commitbfa3bc0059eef269ac7a77cd28443898cea1fb19 (patch)
tree87bce627e1138f990e90134a20b99b163ff022f5 /indra
parentbe9c0574f97b65079c80c2bc5ce5a12597a9840a (diff)
Possible fix for TC build failure
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/app_settings/logcontrol.xml2
-rwxr-xr-xindra/newview/llappearancemgr.cpp4
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();