diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-08-14 16:45:26 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-08-14 16:45:26 -0700 |
| commit | aa3042ea331479128a65d890d44314cc7c630e2c (patch) | |
| tree | ae26d4686fe7a2da9b96c6e7df2c4f7ea5effcbc /indra/newview/llviewerregion.cpp | |
| parent | 248d61fe0eadd128c7704e37922ba7fdef35d630 (diff) | |
MAINT-5506: Converted llmessage untrusted sim message responder to coroutine.
Removed HTTPSender, HTTPNullSender, HTTPCapSender.
Moved UntrustedMessageCap storage into LLHost
Added boost libraries to PROJECT_x_TEST linkage.
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 32b57dae25..cb42110510 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -47,7 +47,6 @@ #include "llagentcamera.h" #include "llavatarrenderinfoaccountant.h" #include "llcallingcard.h" -#include "llcaphttpsender.h" #include "llcommandhandler.h" #include "lldir.h" #include "lleventpoll.h" @@ -611,8 +610,9 @@ LLViewerRegion::~LLViewerRegion() delete mParcelOverlay; delete mImpl->mLandp; delete mImpl->mEventPoll; +#if 0 LLHTTPSender::clearSender(mImpl->mHost); - +#endif std::for_each(mImpl->mObjectPartition.begin(), mImpl->mObjectPartition.end(), DeletePointer()); saveObjectCache(); @@ -2941,7 +2941,11 @@ void LLViewerRegion::setCapability(const std::string& name, const std::string& u } else if(name == "UntrustedSimulatorMessage") { +#if 1 + mImpl->mHost.setUntrustedSimulatorCap(url); +#else LLHTTPSender::setSender(mImpl->mHost, new LLCapHTTPSender(url)); +#endif } else if (name == "SimulatorFeatures") { |