Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
indra/newview/lleventpoll.cpp
View File

@@ -119,15 +119,15 @@ namespace
const std::string& pollURL, const LLHost& sender)
{
LLHTTPClient::ResponderPtr result = new LLEventPollResponder(pollURL, sender);
llinfos << "LLEventPollResponder::start <" << sCount << "> "
<< pollURL << llendl;
LL_INFOS() << "LLEventPollResponder::start <" << sCount << "> "
<< pollURL << LL_ENDL;
return result;
}
void LLEventPollResponder::stop()
{
llinfos << "LLEventPollResponder::stop <" << mCount << "> "
<< mPollURL << llendl;
LL_INFOS() << "LLEventPollResponder::stop <" << mCount << "> "
<< mPollURL << LL_ENDL;
// there should be a way to stop a LLHTTPClient request in progress
mDone = true;
}
@@ -144,18 +144,18 @@ namespace
LLViewerRegion *regionp = gAgent.getRegion();
if (!regionp)
{
llerrs << "LLEventPoll initialized before region is added." << llendl;
LL_ERRS() << "LLEventPoll initialized before region is added." << LL_ENDL;
}
mSender = sender.getIPandPort();
llinfos << "LLEventPoll initialized with sender " << mSender << llendl;
LL_INFOS() << "LLEventPoll initialized with sender " << mSender << LL_ENDL;
makeRequest();
}
LLEventPollResponder::~LLEventPollResponder()
{
stop();
lldebugs << "LLEventPollResponder::~Impl <" << mCount << "> "
<< mPollURL << llendl;
LL_DEBUGS() << "LLEventPollResponder::~Impl <" << mCount << "> "
<< mPollURL << LL_ENDL;
}
void LLEventPollResponder::makeRequest()
@@ -164,8 +164,8 @@ namespace
request["ack"] = mAcknowledge;
request["done"] = mDone;
lldebugs << "LLEventPollResponder::makeRequest <" << mCount << "> ack = "
<< LLSDXMLStreamer(mAcknowledge) << llendl;
LL_DEBUGS() << "LLEventPollResponder::makeRequest <" << mCount << "> ack = "
<< LLSDXMLStreamer(mAcknowledge) << LL_ENDL;
LLHTTPClient::post(mPollURL, request, this);
}
@@ -199,13 +199,13 @@ namespace
+ mErrorCount * EVENT_POLL_ERROR_RETRY_SECONDS_INC
, this);
llwarns << "Unexpected HTTP error. status: " << mStatus << ", reason: " << mReason << llendl;
LL_WARNS() << "Unexpected HTTP error. status: " << mStatus << ", reason: " << mReason << LL_ENDL;
}
else
{
llwarns << "LLEventPollResponder::error: <" << mCount << "> got "
LL_WARNS() << "LLEventPollResponder::error: <" << mCount << "> got "
<< mStatus << ": " << mReason
<< (mDone ? " -- done" : "") << llendl;
<< (mDone ? " -- done" : "") << LL_ENDL;
stop();
// At this point we have given up and the viewer will not receive HTTP messages from the simulator.
@@ -219,7 +219,7 @@ namespace
// continue running.
if(gAgent.getRegion() && gAgent.getRegion()->getHost().getIPandPort() == mSender)
{
llwarns << "Forcing disconnect due to stalled main region event poll." << llendl;
LL_WARNS() << "Forcing disconnect due to stalled main region event poll." << LL_ENDL;
LLAppViewer::instance()->forceDisconnect(LLTrans::getString("AgentLostConnection"));
}
}
@@ -228,8 +228,8 @@ namespace
//virtual
void LLEventPollResponder::httpSuccess(void)
{
lldebugs << "LLEventPollResponder::result <" << mCount << ">"
<< (mDone ? " -- done" : "") << ll_pretty_print_sd(mContent) << llendl;
LL_DEBUGS() << "LLEventPollResponder::result <" << mCount << ">"
<< (mDone ? " -- done" : "") << ll_pretty_print_sd(mContent) << LL_ENDL;
if (mDone) return;
@@ -238,7 +238,7 @@ namespace
if (!mContent.get("events") ||
!mContent.get("id"))
{
//llwarns << "received event poll with no events or id key" << llendl;
//LL_WARNS() << "received event poll with no events or id key" << LL_ENDL;
makeRequest();
return;
}
@@ -248,12 +248,12 @@ namespace
if(mAcknowledge.isUndefined())
{
llwarns << "LLEventPollResponder: id undefined" << llendl;
LL_WARNS() << "LLEventPollResponder: id undefined" << LL_ENDL;
}
// was llinfos but now that CoarseRegionUpdate is TCP @ 1/second, it'd be too verbose for viewer logs. -MG
lldebugs << "LLEventPollResponder::completed <" << mCount << "> " << events.size() << "events (id "
<< LLSDXMLStreamer(mAcknowledge) << ")" << llendl;
LL_DEBUGS() << "LLEventPollResponder::completed <" << mCount << "> " << events.size() << "events (id "
<< LLSDXMLStreamer(mAcknowledge) << ")" << LL_ENDL;
LLSD::array_const_iterator i = events.beginArray();
LLSD::array_const_iterator end = events.endArray();