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

FIRE-17287 - re-enable http pipelining in OpenSim

master
Beq 2020-04-16 20:50:55 +01:00
parent 29f8de325c
commit b113c6cc88
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llappcorehttp.cpp
View File

@ -388,20 +388,6 @@ 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

@ -1641,9 +1641,6 @@ 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();