aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-04-19 06:01:56 -0700
committerMcCabe Maxsted2010-04-19 06:01:56 -0700
commitf400b1c357e515d16617ed77c0c46838c9c5ab2d (patch)
tree7b6b23c4401fb2fc94461ca65ca821f484c387aa /linden/indra
parentMade the CV decimal in tools patch actually work to 5 decimal places (diff)
downloadmeta-impy-f400b1c357e515d16617ed77c0c46838c9c5ab2d.zip
meta-impy-f400b1c357e515d16617ed77c0c46838c9c5ab2d.tar.gz
meta-impy-f400b1c357e515d16617ed77c0c46838c9c5ab2d.tar.bz2
meta-impy-f400b1c357e515d16617ed77c0c46838c9c5ab2d.tar.xz
Added option to advanced build window to set object edit decimal places
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llfloaterbuildoptions.cpp6
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml5
2 files changed, 11 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index 372b1df..6cbb9fe 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -122,6 +122,8 @@ BOOL LLFloaterBuildOptions::postBuild()
122 childSetValue("GridDrawSize", gSavedSettings.getF32("GridDrawSize") ); 122 childSetValue("GridDrawSize", gSavedSettings.getF32("GridDrawSize") );
123 childSetValue("GridOpacity", gSavedSettings.getF32("GridOpacity") ); 123 childSetValue("GridOpacity", gSavedSettings.getF32("GridOpacity") );
124 124
125 childSetValue("spinner_decimal", (F32)gSavedSettings.getU32("DecimalsForTools") );
126
125 getChild<LLComboBox>("material")->setCommitCallback(onComboBoxCommit); 127 getChild<LLComboBox>("material")->setCommitCallback(onComboBoxCommit);
126 getChild<LLComboBox>("combobox shininess")->setCommitCallback(onComboBoxCommit); 128 getChild<LLComboBox>("combobox shininess")->setCommitCallback(onComboBoxCommit);
127 129
@@ -292,6 +294,8 @@ void LLFloaterBuildOptions::apply()
292 gSavedSettings.setF32("GridResolution", childGetValue("GridResolution").asReal() ); 294 gSavedSettings.setF32("GridResolution", childGetValue("GridResolution").asReal() );
293 gSavedSettings.setF32("GridDrawSize", childGetValue("GridDrawSize").asReal() ); 295 gSavedSettings.setF32("GridDrawSize", childGetValue("GridDrawSize").asReal() );
294 gSavedSettings.setF32("GridOpacity", childGetValue("GridOpacity").asReal() ); 296 gSavedSettings.setF32("GridOpacity", childGetValue("GridOpacity").asReal() );
297
298 gSavedSettings.setU32("DecimalsForTools", childGetValue("spinner_decimal").asReal() );
295} 299}
296 300
297void LLFloaterBuildOptions::cancel() 301void LLFloaterBuildOptions::cancel()
@@ -335,6 +339,8 @@ void LLFloaterBuildOptions::reset()
335 childSetValue("GridResolution", gSavedSettings.getControl("GridResolution")->getDefault() ); 339 childSetValue("GridResolution", gSavedSettings.getControl("GridResolution")->getDefault() );
336 childSetValue("GridDrawSize", gSavedSettings.getControl("GridDrawSize")->getDefault() ); 340 childSetValue("GridDrawSize", gSavedSettings.getControl("GridDrawSize")->getDefault() );
337 childSetValue("GridOpacity", gSavedSettings.getControl("GridOpacity")->getDefault() ); 341 childSetValue("GridOpacity", gSavedSettings.getControl("GridOpacity")->getDefault() );
342
343 childSetValue("spinner_decimal", gSavedSettings.getControl("DecimalsForTools")->getDefault() );
338} 344}
339 345
340void LLFloaterBuildOptions::refresh() 346void LLFloaterBuildOptions::refresh()
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 298805d..0e06a74 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
@@ -158,6 +158,11 @@
158 label="Rez objects using land group" left_delta="0" mouse_opaque="true" 158 label="Rez objects using land group" left_delta="0" mouse_opaque="true"
159 tooltip="Rez objects on group land using the land's group (if possible)" 159 tooltip="Rez objects on group land using the land's group (if possible)"
160 name="grouplandrez" radio_style="false" width="270" /> 160 name="grouplandrez" radio_style="false" width="270" />
161 <spinner bottom_delta="-20" decimal_digits="0"
162 tool_tip="Sets the default decimal precision for move, resize, and rotate"
163 follows="left|top" height="16" increment="1" initial_val="3"
164 label="Edit object decimal places" label_width="140" left_delta="0" max_val="5"
165 min_val="0" mouse_opaque="true" name="spinner_decimal" width="175" />
161 166
162 <button bottom="2" enabled="true" follows="right|bottom" font="SansSerif" 167 <button bottom="2" enabled="true" follows="right|bottom" font="SansSerif"
163 halign="center" height="20" label="Cancel" right="-4" 168 halign="center" height="20" label="Cancel" right="-4"