livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-17287: Force HttpPipelining off on OpenSim

master
Ansariel 2016-04-15 13:05:54 +02:00
parent 0914b68c7c
commit 28fa0c0468
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llappcorehttp.cpp
View File

@ -36,6 +36,10 @@
#include "llsecapi.h"
#include <curl/curl.h>
#ifdef OPENSIM
#include "llviewernetwork.h"
#endif
// Here is where we begin to get our connection usage under control.
// This establishes llcorehttp policy classes that, among other
// things, limit the maximum number of connections to outside
@ -357,6 +361,20 @@ void LLAppCoreHttp::refreshSettings(bool initial)
// Global pipelining setting
bool pipeline_changed(false);
static const std::string http_pipelining("HttpPipelining");
// <FS:Ansariel> FIRE-17287: Force HttpPipelining off on OpenSim
#ifdef OPENSIM
if (LLGridManager::instance().isInOpenSim())
{
if (mPipelined)
{
mPipelined = false;
pipeline_changed = true;
}
LL_INFOS() << "HTTP Pipelining is not supported on OpenSim - setting to disabled." << LL_ENDL;
}
else
#endif
// </FS:Ansariel>
if (gSavedSettings.controlExists(http_pipelining))
{
// Default to true (in ctor) if absent.

3
indra/newview/llstartup.cpp
View File

@ -1431,6 +1431,9 @@ bool idle_startup()
progress += 0.02f;
display_startup();
// <FS:Ansariel> FIRE-17287: Force HttpPipelining off on OpenSim
LLAppViewer::instance()->getAppCoreHttp().refreshSettings(false);
// <AW: crash report grid correctness>
eLastExecEvent last_exec_event = gLastExecEvent;
const std::string current_grid = LLGridManager::getInstance()->getGrid();