From 5ac650e459a7939dc04d0b1e862e6192ef94bf53 Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Mon, 12 Oct 2020 23:39:37 +0100
Subject: [PATCH] FIRE-30020 - Support 1024 bakes in opensim

---
 indra/llappearance/lltexlayer.cpp      |  8 +++--
 indra/newview/character/avatar_lad.xml | 41 +++++++++++++-------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 422832183c..9cb53d6a54 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -190,8 +190,12 @@ BOOL LLTexLayerSetBuffer::renderTexLayerSet(LLRenderTarget* bound_target)
 
 LLTexLayerSetInfo::LLTexLayerSetInfo() :
 	mBodyRegion( "" ),
-	mWidth( 512 ),
-	mHeight( 512 ),
+// <FS:Beq> FIRE-30020 allow 1024 local bakes (not strictly needed as avatar_lad is required)
+	// mWidth( 512 ),
+	// mHeight( 512 ),
+	mWidth( 1024 ),
+	mHeight( 1024 ),
+// </FS:Beq>
 	mClearAlpha( TRUE )
 {
 }
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 0c3fa9d4a2..ed9a8240e4 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -8925,8 +8925,8 @@
   <!-- =========================================================== -->
   <layer_set
     body_region="hair"
-    width="512"
-    height="512"
+    width="1024"
+    height="1024"
     clear_alpha="false">
     <layer
       name="base"
@@ -9015,8 +9015,8 @@
 
   <layer_set
     body_region="head"
-    width="512"
-    height="512">
+    width="1024"
+    height="1024">
     <layer
        name="head bump base"
        fixed_color = "128,128,128,255"
@@ -10151,8 +10151,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="upper_body"
-   width="512"
-   height="512">
+   width="1024"
+   height="1024">
     <layer
      name="base_upperbody bump"
      render_pass="bump"
@@ -11460,8 +11460,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="lower_body"
-   width="512"
-   height="512">
+   width="1024"
+   height="1024">
     <layer
        name="lower body bump base"
        fixed_color = "128,128,128,255"
@@ -12537,8 +12537,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="skirt"
-   width="512"
-   height="512"
+   width="1024"
+   height="1024"
    clear_alpha="false">
     <layer
      name="skirt_fabric"
@@ -12776,8 +12776,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="leftarm"
-   width="512"
-   height="512"
+   width="1024"
+   height="1024"
    clear_alpha="false">
 	  <layer
      name="base"
@@ -12852,8 +12852,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="leftleg"
-   width="512"
-   height="512"
+   width="1024"
+   height="1024"
    clear_alpha="false">
 
     <layer
@@ -12921,8 +12921,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="aux1"
-   width="512"
-   height="512"
+   width="1024"
+   height="1024"
    clear_alpha="false">
 
     <layer
@@ -12990,8 +12990,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="aux2"
-   width="512"
-   height="512"
+   width="1024"
+   height="1024"
    clear_alpha="false">
 
     <layer
@@ -13059,8 +13059,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="aux3"
-   width="512"
-   height="512"
+   width="1024"
+   height="1024"
    clear_alpha="false">
 
     <layer
@@ -17473,4 +17473,3 @@ render_pass="bump">
      layer="lower_pants" />
   </morph_masks>
 </linden_avatar>
-