diff options
| author | simon <none@none> | 2013-12-09 16:11:09 -0800 |
|---|---|---|
| committer | simon <none@none> | 2013-12-09 16:11:09 -0800 |
| commit | 50cba7940fbea7602f6b55df85fb9a2d2b47279b (patch) | |
| tree | 269464d15a8d4a8803535b843e8ce7dcac7414cb /indra/newview/llviewerregion.cpp | |
| parent | 1a456c2e41905e93e393dc2dda0d143ee7611275 (diff) | |
| parent | 4a09065691b6a3461ff2f4541abb3accade207fe (diff) | |
Merge in downstream code for 3.6.13
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 379638ef19..6018c2d250 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; } */ |