From 6b11776fcf5219f77b8e78b5a27d1446c1a23d61 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 29 Jan 2012 18:41:26 -0500
Subject: [PATCH] Added in Phoenix's building preferences: removed bloat and
 waste, made positioning less fragile, repositioned parts more sensibly, and
 suggested courses of action in comments.

---
 .../en-us/panel_preferences_ascent_system.xml | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
index 7cb672eb6..d6c8cf2ec 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -97,7 +97,44 @@
       <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Z pos" label_width="40" max_val="256" min_val="-256" name="Z pos" width="120" control_name="AscentBuildPrefs_PivotZ"/>
       <check_box bottom_delta="-20" follows="top" label="Values are percent" left_delta="-5" tool_tip="Default settings are Percentages and every axis set at 50" name="EmPivotPercToggle" control_name="AscentBuildPrefs_PivotIsPercent"/>
       <check_box bottom_delta="60" follows="top" label="Enable highlighting of selected prims" left_delta="140" name="EmBuildPrefsRenderHighlight_toggle" control_name="AscentRenderHighlightSelections"/>
-      <check_box bottom_delta="-20" follows="top" initial_value="false" label="Show axis arrow on root prim position" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead." name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"/>
+	  <check_box bottom_delta="-20" follows="top" initial_value="false" label="Show axis arrow on root prim position" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead." name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"/>
+<view_border bevel_style="none" border_thickness="1" bottom="-165" follows="top" height="60" left="5" name="NextOwnerBorder" width="130"/>
+<!--This is sorta very obvious, afterall, you created it, must you be told this is for next owner? Uncomment if so(otherwise delete?)<text bottom_delta="65" follows="top" height="10" left_delta="20" name="text_box7">Allow next owner:</text>-->
+  <check_box bottom_delta="40" follows="top" height="16" initial_value="false" label="Copy permissions" tool_tip="Next owner can make copies of creations" name="next_owner_copy" control_name="NextOwnerCopy"/>
+  <check_box follows="top" height="16" initial_value="false" label="Modify permission" tool_tip="Next owner can edit creations" name="next_owner_modify" control_name="NextOwnerModify"/>
+  <check_box follows="top" height="16" initial_value="true" label="Transfer permission" tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
+  <!--This should probably be removed as it will be self-explanatory since There is code to do this for the upload permissions, dimming the box, already, and that mechanic should be worked into here.<text bottom_delta="-15" follows="top" height="10" name="text_box8">*If "copy" is unchecked, "transfer" must be enabled.  This will also set upload permissions.</text>Furthermore, based on this comment, the control is for both, should we have separate controls? or unify them? If separated, the above bordered area will need to be carefully migrated into panel_permissions.xml(Which will be embedded into the Set Default Permissions floater as well as here, either way.) and will need modifications, it may therefore be better to unify.-->
+  <texture_picker allow_no_texture="false" bottom="-185" can_apply_immediately="true" default_image_name="Default" follows="top" height="80" label="     Texture" left="165" name="texture control" control_name="PhoenixBuildPrefs_Texture" tool_tip="Click to choose a texture" width="64"/>
+	  <check_box bottom="-125" left="240" follows="top" height="16" label="Phantom" name="EmPhantomToggle" control_name="PhoenixBuildPrefs_Phantom"/>
+	  <check_box follows="top" height="16" label="Physical" name="EmPhysicalToggle" control_name="PhoenixBuildPrefs_Physical"/>
+	  <check_box follows="top" height="16" label="Temporary" name="EmTemporaryToggle" control_name="PhoenixBuildPrefs_Temporary"/>
+	  <combo_box bottom="-184" left="246" follows="top" height="18" name="material" width="64" control_name="PhoenixBuildPrefs_Material">
+		<combo_item name="Stone" value="Stone">Stone</combo_item>
+		<combo_item name="Metal" value="Metal">Metal</combo_item>
+		<combo_item name="Glass" value="Glass">Glass</combo_item>
+		<combo_item name="Wood" value="Wood">Wood</combo_item>
+		<combo_item name="Flesh" value="Flesh">Flesh</combo_item>
+		<combo_item name="Plastic" value="Plastic">Plastic</combo_item>
+		<combo_item name="Rubber" value="Rubber">Rubber</combo_item>
+      </combo_box>
+  <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-185" can_apply_immediately="true" color="1, 1, 1, 1" follows="top" height="80" label="      Color" left_delta="76" name="colorswatch" tool_tip="Click to open Color Picker" width="64" control_name="PhoenixBuildPrefs_Color"/>
+  <spinner bottom_delta="60" decimal_digits="0" follows="top" height="16" increment="1" label="Alpha" label_width="45" left_delta="70" max_val="100" min_val="0" name="alpha" width="97" control_name="PhoenixBuildPrefs_Alpha"/>
+  <spinner bottom_delta="-20" decimal_digits="2" follows="top" height="16" increment="0.05" label="Glow" label_width="45" max_val="1" min_val="0" name="glow" width="97" control_name="PhoenixBuildPrefs_Glow"/>
+  <check_box follows="top" height="16" label="Full Bright" name="EmFBToggle" control_name="PhoenixBuildPrefs_FullBright"/>
+  <text follows="top">Shine</text><combo_box bottom_delta="-5" follows="top" left_delta="33" height="18" name="combobox shininess" tool_tip="Set the amount of shine for the object" width="64" control_name="PhoenixBuildPrefs_Shiny">
+<combo_item name="None" value="None">None</combo_item>
+  <combo_item name="Low" value="Low">Low</combo_item>
+<combo_item name="Medium" value="Medium">Medium</combo_item>
+  <combo_item name="High" value="High">High</combo_item>
+</combo_box>
+  <check_box name="PhoenixBuildPrefsEmbedItem" left="5" bottom_delta="0" follows="top" initial_value="false" label="Put an item into new objects" control_name="PhoenixBuildPrefs_EmbedItem"/>
+  <view_border blevel_style="in" bottom_delta="-20" left="29" follows="top" height="16" name="im_give_drop_target_rect" width="124"/>
+  <text bottom_delta="0" follows="top" height="16" name="Give inventory">Drop inventory item here</text>
+  <view_border blevel_style="in" bottom_delta="-36" follows="top" height="36" name="build_item_add_disp_rect" width="124"/>
+  <text bottom_delta="18" left_delta="22" follows="top" height="16" name="build_item_add_disp_rect_txt">Currently set to:
+	       <!--This should probably be one of those <string>'s, since they seem to be somehow mercurial- er... git-->ITEM</text>
+      
+
     </panel>
 
   </tab_container>