2 files changed, 0 insertions, 40 deletions

diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index 18793c5..ba065b1 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -222,16 +222,6 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
                 gSavedPerAccountSettings.getF32("BuildPrefs_Zsize"));
         
         U8                              material = LL_MCODE_WOOD;
-        if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Stone") material = LL_MCODE_STONE;
-        if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Metal") material = LL_MCODE_METAL;
-        if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Wood") material = LL_MCODE_WOOD;
-        if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Flesh") material = LL_MCODE_FLESH;
-        if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Rubber") material = LL_MCODE_RUBBER;
-        if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Plastic") material = LL_MCODE_PLASTIC;
-                
-
-        
-
         BOOL                    create_selected = FALSE;
         LLVolumeParams  volume_params;
         
@@ -298,10 +288,6 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
         gMessageSystem->addU8Fast(_PREHASH_Material,    material);
 
         U32 flags = 0;          // not selected
-        if (use_physics || gSavedPerAccountSettings.getBOOL("BuildPrefs_Physical"))
-        {
-                flags |= FLAGS_USE_PHYSICS;
-        }
         //if (create_selected)
 // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b) | Added: RLVa-1.0.0b
         if ( (create_selected) && (!gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) )
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
index 7331aa6..78c6e27 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
@@ -36,14 +36,8 @@
                                          bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
                                          h_pad="0" halign="left" height="10" left="44" mouse_opaque="false"
                                          name="text_box3" v_pad="0" width="150">        Object Size</text>
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-     h_pad="0" halign="left" height="10" left_delta="130" mouse_opaque="false"
-     name="text_box4" v_pad="0" width="150">        Settings</text>
   <view_border bevel_style="none" border_thickness="1" bottom_delta="-98" follows="top|left" height="90"
      left="14" name="SizeBorder" width="120" />
-  <view_border bevel_style="none" border_thickness="1" bottom_delta="-0" follows="top|left" height="90"
-     left_delta="134" name="SettingsBorder" width="100" />
   
   <spinner bottom="-200" decimal_digits="5" follows="left|top" height="16" increment="0.05"
      label="X Size" label_width="40" left="20" max_val="10" min_val="0.01"
@@ -55,26 +49,6 @@
      label="Z Size" label_width="40" left_delta="0" max_val="10" min_val="0.01"
      mouse_opaque="true" name="Z size" width="110" />
   
-  <check_box bottom="-200" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-     label="Phantom" left="154" mouse_opaque="true" name="PhantomToggle" radio_style="false"
-     width="100" />
-  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-     label="Physical" left_delta="0" mouse_opaque="true" name="PhysicalToggle" radio_style="false"
-     width="100" />
-  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-     label="Temporary" left_delta="0" mouse_opaque="true" name="TemporaryToggle" radio_style="false"
-     width="100" />
-  <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="1" follows="left|top" height="18"
-     left="10" max_chars="20" mouse_opaque="true" name="material" width="87">
-    <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>
-  
   <view_border bevel_style="none" border_thickness="1" bottom="-145" follows="top|left" height="105"
      left="198" name="PivotBorder" width="135"/>
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"