From fbbde138c42dfced9b8805e4ce774ae8605e9d9b Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Wed, 27 Jun 2012 17:40:19 -0400
Subject: SH-3231 FIX Process new texture fetch url from login.cgi

  - Added a new global setting (non-persist) to store the texture request URL
  - New setting is 'AgentAppearanceServiceURL'
---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llstartup.cpp             |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 53c7ceaa80..6a0b9559d0 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -71,6 +71,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>AgentAppearanceServiceURL</key>
+    <map>
+      <key>Comment</key>
+      <string>Current Session Agent Appearance Service URL</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string></string>
+    </map>
     <key>AlertedUnsupportedHardware</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index ebde7a55fe..e271653b2d 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -3442,6 +3442,14 @@ bool process_login_success_response()
 
 	}
 
+	// set the location of the Agent Appearance service, from which we can request
+	// avatar baked textures if they are supported by the current region
+	std::string agent_appearance_url = response["agent_appearance_service"];
+	if (!agent_appearance_url.empty())
+	{
+		gSavedSettings.setString("AgentAppearanceServiceURL", agent_appearance_url);
+	}
+
 	// Set the location of the snapshot sharing config endpoint
 	std::string snapshot_config_url = response["snapshot_config_url"];
 	if(!snapshot_config_url.empty())
-- 
cgit v1.2.3


From 14fef9f08a3bfb44d94771be6478a57ed9a91540 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Thu, 28 Jun 2012 11:05:32 -0400
Subject: SH-3230 Disable texture readback & upload

If we're utilizing server-side texture baking, upload requests are
discarded.

Note: this breaks viewer in that it will *always* use the baked textures
sent by the cache request/ initial login. Without a server-generated
update, you will see those textures on your avatar for the entire session,
even if you switch outfits.
---
 indra/newview/llvoavatarself.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 0bfd0df769..ee3381a5ad 100755
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -887,7 +887,10 @@ void LLVOAvatarSelf::removeMissingBakedTextures()
 			invalidateComposite(mBakedTextureDatas[i].mTexLayerSet, FALSE);
 		}
 		updateMeshTextures();
-		requestLayerSetUploads();
+		if (!LLAppearanceMgr::instance().useServerTextureBaking())
+		{
+			requestLayerSetUploads();
+		}
 	}
 }
 
@@ -1630,7 +1633,7 @@ void LLVOAvatarSelf::invalidateComposite( LLTexLayerSet* layerset, BOOL upload_r
 	layerset->requestUpdate();
 	layerset->invalidateMorphMasks();
 
-	if( upload_result )
+	if( upload_result  && !LLAppearanceMgr::instance().useServerTextureBaking())
 	{
 		llassert(isSelf());
 
-- 
cgit v1.2.3