diff options
author | Oz Linden <oz@lindenlab.com> | 2014-01-23 11:07:32 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-01-23 11:07:32 -0500 |
commit | 197db4976ad8df958b7b2c59a66498398cfd0665 (patch) | |
tree | 21cdd341fbb8adb1b208142fc4e63362090931da /indra/newview/llviewerregion.cpp | |
parent | a4173dc81a21dfac6a8b57e8e1c354b9a37fe5ba (diff) | |
parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) |
merge changes for 3.6.13-release
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 e3df09022c..bcc4f46e6f 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -308,7 +308,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; } */ |