summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-09-08 15:24:22 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-09-08 15:24:22 -0400
commitbff5a4e7940d40576f52105ab9877f5a6b7d85c8 (patch)
tree9a87e704499c62858c9f449814bb744e2a0a26ab /indra/newview/llviewerregion.cpp
parent0c20beda6800149ee71a307ca4e943b5bba56908 (diff)
parenteef4acc5367a486b0c52c6ce5e1aba995fefd99c (diff)
Merge. Update from viewer-release after 3.7.15 release.
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-xindra/newview/llviewerregion.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index cd5f64b9ca..11cbf3fc24 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -285,8 +285,8 @@ private:
{
regionp->setCapability(iter->first, iter->second);
- LL_DEBUGS("AppInit", "Capabilities") << "got capability for "
- << iter->first << LL_ENDL;
+ LL_DEBUGS("AppInit", "Capabilities")
+ << "Capability '" << iter->first << "' is '" << iter->second << "'" << LL_ENDL;
/* HACK we're waiting for the ServerReleaseNotes */
if (iter->first == "ServerReleaseNotes" && regionp->getReleaseNotesRequested())