diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-22 18:51:03 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-22 18:51:03 -0400 |
| commit | b59a443254ef11def158ffb46dbbb3d4d3dada4a (patch) | |
| tree | 8cadf6ddf54c8c37d486985484efebfac1ac5a63 | |
| parent | 6e2739b76c669275b9ad62aa1b888cfc891012eb (diff) | |
Removed UseServerTextureBaking setting, now key off region protocol bits
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewerregion.cpp | 12 |
2 files changed, 1 insertions, 22 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 32213a07a8..69986af83b 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -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> diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 58e4b804fd..fb50b8bb77 100644..100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -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) { |