aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--linden/indra/newview/lltoolplacer.cpp14
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml26
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 )
222 gSavedPerAccountSettings.getF32("BuildPrefs_Zsize")); 222 gSavedPerAccountSettings.getF32("BuildPrefs_Zsize"));
223 223
224 U8 material = LL_MCODE_WOOD; 224 U8 material = LL_MCODE_WOOD;
225 if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Stone") material = LL_MCODE_STONE;
226 if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Metal") material = LL_MCODE_METAL;
227 if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Wood") material = LL_MCODE_WOOD;
228 if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Flesh") material = LL_MCODE_FLESH;
229 if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Rubber") material = LL_MCODE_RUBBER;
230 if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Plastic") material = LL_MCODE_PLASTIC;
231
232
233
234
235 BOOL create_selected = FALSE; 225 BOOL create_selected = FALSE;
236 LLVolumeParams volume_params; 226 LLVolumeParams volume_params;
237 227
@@ -298,10 +288,6 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
298 gMessageSystem->addU8Fast(_PREHASH_Material, material); 288 gMessageSystem->addU8Fast(_PREHASH_Material, material);
299 289
300 U32 flags = 0; // not selected 290 U32 flags = 0; // not selected
301 if (use_physics || gSavedPerAccountSettings.getBOOL("BuildPrefs_Physical"))
302 {
303 flags |= FLAGS_USE_PHYSICS;
304 }
305 //if (create_selected) 291 //if (create_selected)
306// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b) | Added: RLVa-1.0.0b 292// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b) | Added: RLVa-1.0.0b
307 if ( (create_selected) && (!gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) ) 293 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 @@
36 bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" 36 bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
37 h_pad="0" halign="left" height="10" left="44" mouse_opaque="false" 37 h_pad="0" halign="left" height="10" left="44" mouse_opaque="false"
38 name="text_box3" v_pad="0" width="150"> Object Size</text> 38 name="text_box3" v_pad="0" width="150"> Object Size</text>
39 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
40 bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
41 h_pad="0" halign="left" height="10" left_delta="130" mouse_opaque="false"
42 name="text_box4" v_pad="0" width="150"> Settings</text>
43 <view_border bevel_style="none" border_thickness="1" bottom_delta="-98" follows="top|left" height="90" 39 <view_border bevel_style="none" border_thickness="1" bottom_delta="-98" follows="top|left" height="90"
44 left="14" name="SizeBorder" width="120" /> 40 left="14" name="SizeBorder" width="120" />
45 <view_border bevel_style="none" border_thickness="1" bottom_delta="-0" follows="top|left" height="90"
46 left_delta="134" name="SettingsBorder" width="100" />
47 41
48 <spinner bottom="-200" decimal_digits="5" follows="left|top" height="16" increment="0.05" 42 <spinner bottom="-200" decimal_digits="5" follows="left|top" height="16" increment="0.05"
49 label="X Size" label_width="40" left="20" max_val="10" min_val="0.01" 43 label="X Size" label_width="40" left="20" max_val="10" min_val="0.01"
@@ -55,26 +49,6 @@
55 label="Z Size" label_width="40" left_delta="0" max_val="10" min_val="0.01" 49 label="Z Size" label_width="40" left_delta="0" max_val="10" min_val="0.01"
56 mouse_opaque="true" name="Z size" width="110" /> 50 mouse_opaque="true" name="Z size" width="110" />
57 51
58 <check_box bottom="-200" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
59 label="Phantom" left="154" mouse_opaque="true" name="PhantomToggle" radio_style="false"
60 width="100" />
61 <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
62 label="Physical" left_delta="0" mouse_opaque="true" name="PhysicalToggle" radio_style="false"
63 width="100" />
64 <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
65 label="Temporary" left_delta="0" mouse_opaque="true" name="TemporaryToggle" radio_style="false"
66 width="100" />
67 <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="1" follows="left|top" height="18"
68 left="10" max_chars="20" mouse_opaque="true" name="material" width="87">
69 <combo_item name="Stone" value="Stone">Stone</combo_item>
70 <combo_item name="Metal" value="Metal">Metal</combo_item>
71 <combo_item name="Glass" value="Glass">Glass</combo_item>
72 <combo_item name="Wood" value="Wood">Wood</combo_item>
73 <combo_item name="Flesh" value="Flesh">Flesh</combo_item>
74 <combo_item name="Plastic" value="Plastic">Plastic</combo_item>
75 <combo_item name="Rubber" value="Rubber">Rubber</combo_item>
76 </combo_box>
77
78 <view_border bevel_style="none" border_thickness="1" bottom="-145" follows="top|left" height="105" 52 <view_border bevel_style="none" border_thickness="1" bottom="-145" follows="top|left" height="105"
79 left="198" name="PivotBorder" width="135"/> 53 left="198" name="PivotBorder" width="135"/>
80 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 54 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"