From fa76b8992c6c636303d398bd25d34c39ae23419e Mon Sep 17 00:00:00 2001
From: Seraph Linden <none@none>
Date: Mon, 30 May 2011 16:49:43 -0400
Subject: SH-1592 FIXED Advanced model uploader needs an IP checkbox like the
 wizard uploader has

---
 .../newview/skins/default/xui/en/floater_model_preview.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index dce55dae12..4677d014b8 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -83,6 +83,20 @@
     </text>
   </panel>
 
+  <check_box
+	height="16"
+	left_delta="0"
+	name="confirm_checkbox"
+	top_pad="15"
+	follows="bottom|left"
+	width="16" />
+
+  <text
+	height="30"
+	width="570"
+	word_wrap="true" 
+	left_delta="25"
+	top_delta="0">I confirm that I have the appropriate rights to the material contained in this model. [secondlife:///app/floater/learn_more Learn more]</text>
   <text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>
 
   
-- 
cgit v1.2.3


From faef58a9b91ecbbffd93fa90347f1b8bd5856902 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 2 Jun 2011 01:36:28 -0500
Subject: SH-1666 Remove "Mesh" stitching type from sculpt combo box.

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 40bf7bfed7..f5f6b990d1 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2098,11 +2098,7 @@ even though the user gets a free copy.
                  label="Cylinder"
                  name="Cylinder"
                  value="Cylinder" />
-              <combo_box.item
-                 label="Mesh"
-                 name="Mesh"
-                 value="Mesh" />
-            </combo_box>
+              </combo_box>
         </panel>
         <panel
          border="false"
-- 
cgit v1.2.3