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

SL-15999 - noninteractive mode: create minimal objects,load no textures

meow-7.2.2
Brad Payne (Vir Linden) 2021-09-28 20:10:06 +01:00
parent 502d37913d
commit a184a0fbee
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llappviewer.cpp
View File

@ -2759,6 +2759,8 @@ bool LLAppViewer::initConfiguration()
if (gNonInteractive)
{
tempSetControl("SLURLPassToOtherInstance", "FALSE");
tempSetControl("RenderWater", "FALSE");
tempSetControl("FlyingAtExit", "FALSE");
llassert_always(!gSavedSettings.getBOOL("SLURLPassToOtherInstance"));
}

4
indra/newview/lltexturefetch.cpp
View File

@ -1139,6 +1139,10 @@ void LLTextureFetchWorker::startWork(S32 param)
// Threads: Ttf
bool LLTextureFetchWorker::doWork(S32 param)
{
if (gNonInteractive)
{
return true;
}
static const LLCore::HttpStatus http_not_found(HTTP_NOT_FOUND); // 404
static const LLCore::HttpStatus http_service_unavail(HTTP_SERVICE_UNAVAILABLE); // 503
static const LLCore::HttpStatus http_not_sat(HTTP_REQUESTED_RANGE_NOT_SATISFIABLE); // 416;

29
indra/newview/llviewerobject.cpp
View File

@ -156,15 +156,25 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
LLViewerObject *res = NULL;
LL_RECORD_BLOCK_TIME(FTM_CREATE_OBJECT);
if (gNonInteractive
&& pcode != LL_PCODE_LEGACY_AVATAR
&& pcode != LL_VO_SURFACE_PATCH
&& pcode != LL_VO_WATER
&& pcode != LL_VO_VOID_WATER
&& pcode != LL_VO_WL_SKY
&& pcode != LL_VO_SKY
&& pcode != LL_VO_GROUND
&& pcode != LL_VO_PART_GROUP
)
{
return res;
}
switch (pcode)
{
case LL_PCODE_VOLUME:
{
if (!gNonInteractive)
{
res = new LLVOVolume(id, pcode, regionp); break;
}
res = new LLVOVolume(id, pcode, regionp); break;
break;
}
case LL_PCODE_LEGACY_AVATAR:
@ -200,12 +210,9 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
}
else
{
if (!gNonInteractive)
{
LLVOAvatar *avatar = new LLVOAvatar(id, pcode, regionp);
avatar->initInstance();
res = avatar;
}
LLVOAvatar *avatar = new LLVOAvatar(id, pcode, regionp);
avatar->initInstance();
res = avatar;
}
break;
}