From 8c7edbef183e284186da583c4c9b55fe2bc972d1 Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Wed, 6 Sep 2017 03:24:58 -0700
Subject: 1024*1024 baking viewer updates

---
 indra/newview/character/avatar_lad.xml | 20 ++++++++++----------
 indra/newview/lldynamictexture.cpp     |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 90f06746c9..ee620b39b8 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -8923,8 +8923,8 @@
   <!-- =========================================================== -->
   <layer_set
     body_region="hair"
-    width="512"
-    height="512"
+    width="1024"
+    height="1024"
     clear_alpha="false">
     <layer
       name="base"
@@ -8953,8 +8953,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"
@@ -10031,8 +10031,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"
@@ -11282,8 +11282,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"
@@ -12241,8 +12241,8 @@ render_pass="bump">
   <!-- =========================================================== -->
   <layer_set
    body_region="skirt"
-   width="512"
-   height="512"
+   width="1024"
+   height="1024"
    clear_alpha="false">
     <layer
      name="skirt_fabric"
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index fa9a0712fa..800c36f911 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -126,8 +126,8 @@ BOOL LLViewerDynamicTexture::render()
 void LLViewerDynamicTexture::preRender(BOOL clear_depth)
 {
 	//only images up to 512x512 are supported
-	llassert(mFullHeight <= 512);
-	llassert(mFullWidth <= 512);
+	//llassert(mFullHeight <= 512);
+	//llassert(mFullWidth <= 512);
 
 	if (gGLManager.mHasFramebufferObject && gPipeline.mWaterDis.isComplete() && !gGLManager.mIsATI)
 	{ //using offscreen render target, just use the bottom left corner
-- 
cgit v1.2.3