From b59a443254ef11def158ffb46dbbb3d4d3dada4a Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 22 Aug 2012 18:51:03 -0400
Subject: Removed UseServerTextureBaking setting, now key off region protocol
 bits

---
 indra/newview/app_settings/settings.xml | 11 -----------
 indra/newview/llviewerregion.cpp        | 12 +-----------
 2 files changed, 1 insertion(+), 22 deletions(-)
 mode change 100644 => 100755 indra/newview/llviewerregion.cpp

(limited to 'indra')

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
old mode 100644
new mode 100755
index 58e4b804fd..fb50b8bb77
--- 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)
 	{
-- 
cgit v1.2.3