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

Removed UseServerTextureBaking setting, now key off region protocol bits

master
Brad Payne (Vir Linden) 2012-08-22 18:51:03 -04:00
parent 6e2739b76c
commit b59a443254
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -12384,17 +12384,6 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>UseServerTextureBaking</key>
<map>
<key>Comment</key>
<string>Update appearance via the ServerTextureBaking cap, if available</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RenderSynchronousOcclusion</key>
<map>
<key>Comment</key>

12
indra/newview/llviewerregion.cpp Normal file → Executable file
View File

@ -1453,17 +1453,7 @@ void LLViewerRegion::unpackRegionHandshake()
}
mCentralBakeVersion = (S32)gSavedSettings.getBOOL("UseServerTextureBaking");
/*
if (msg->getSize("RegionInfo4", "CentralBakesVersion") > 0)
{
msg->getS32("RegionInfo4", "CentralBakesVersion", mCentralBakeVersion);
}
else
{
mCentralBakeVersion = 0;
}
*/
mCentralBakeVersion = region_protocols & 1; // was (S32)gSavedSettings.getBOOL("UseServerTextureBaking");
LLVLComposition *compp = getComposition();
if (compp)
{