diff options
author | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
commit | 27cf0ec7f34887ada651307fe438ef0d627bf67f (patch) | |
tree | 90611a41d9ad25b98db6899745208c8aab51c150 /indra/newview/llviewerregion.cpp | |
parent | c6aa86750c22c20dca6895695386e2357b953bbd (diff) | |
parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) |
Merge with 3.6.11
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-x | indra/newview/llviewerregion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index bd6d852ef1..4e84cc3390 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -307,7 +307,7 @@ public: /*CapabilityMap::const_iterator iter = regionp->getRegionImpl()->mCapabilities.begin(); while (iter!=regionp->getRegionImpl()->mCapabilities.end() ) { - llinfos<<"BaseCapabilitiesCompleteTracker Original "<<iter->first<<" "<< iter->second<<llendl; + llinfos << "BaseCapabilitiesCompleteTracker Original " << iter->first << " " << iter->second<<llendl; ++iter; } */ |