diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2008-05-14 21:37:13 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2008-05-14 21:37:13 +0000 |
| commit | e77de5d685ae441f72920f0e04d9887ee958745a (patch) | |
| tree | b3736831042b20be198dc9994ba68db1e8be2a14 /indra/newview/llviewerregion.cpp | |
| parent | 41e1ed5b4153019b07d97f54751db53fa248d8d4 (diff) | |
Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .
Passed QA as part of QAR-491.
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 5d7bac7ab3..d3b7a77297 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1307,6 +1307,7 @@ void LLViewerRegion::unpackRegionHandshake() class BaseCapabilitiesComplete : public LLHTTPClient::Responder { + LOG_CLASS(BaseCapabilitiesComplete); public: BaseCapabilitiesComplete(LLViewerRegion* region) : mRegion(region) @@ -1314,8 +1315,7 @@ public: void error(U32 statusNum, const std::string& reason) { - llinfos << "BaseCapabilitiesComplete::error " - << statusNum << ": " << reason << llendl; + LL_WARNS2("AppInit", "Capabilities") << statusNum << ": " << reason << LL_ENDL; if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState()) { @@ -1329,8 +1329,8 @@ public: for(iter = content.beginMap(); iter != content.endMap(); ++iter) { mRegion->setCapability(iter->first, iter->second); - llinfos << "BaseCapabilitiesComplete::result got capability for " - << iter->first << llendl; + LL_DEBUGS2("AppInit", "Capabilities") << "got capability for " + << iter->first << LL_ENDL; /* HACK we're waiting for the ServerReleaseNotes */ if ((iter->first == "ServerReleaseNotes") && (LLFloaterReleaseMsg::sDisplayMessage)) |