From f400b1c357e515d16617ed77c0c46838c9c5ab2d Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 19 Apr 2010 06:01:56 -0700 Subject: Added option to advanced build window to set object edit decimal places --- linden/indra/newview/llfloaterbuildoptions.cpp | 6 ++++++ .../indra/newview/skins/default/xui/en-us/floater_build_options.xml | 5 +++++ 2 files changed, 11 insertions(+) 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() childSetValue("GridDrawSize", gSavedSettings.getF32("GridDrawSize") ); childSetValue("GridOpacity", gSavedSettings.getF32("GridOpacity") ); + childSetValue("spinner_decimal", (F32)gSavedSettings.getU32("DecimalsForTools") ); + getChild("material")->setCommitCallback(onComboBoxCommit); getChild("combobox shininess")->setCommitCallback(onComboBoxCommit); @@ -292,6 +294,8 @@ void LLFloaterBuildOptions::apply() gSavedSettings.setF32("GridResolution", childGetValue("GridResolution").asReal() ); gSavedSettings.setF32("GridDrawSize", childGetValue("GridDrawSize").asReal() ); gSavedSettings.setF32("GridOpacity", childGetValue("GridOpacity").asReal() ); + + gSavedSettings.setU32("DecimalsForTools", childGetValue("spinner_decimal").asReal() ); } void LLFloaterBuildOptions::cancel() @@ -335,6 +339,8 @@ void LLFloaterBuildOptions::reset() childSetValue("GridResolution", gSavedSettings.getControl("GridResolution")->getDefault() ); childSetValue("GridDrawSize", gSavedSettings.getControl("GridDrawSize")->getDefault() ); childSetValue("GridOpacity", gSavedSettings.getControl("GridOpacity")->getDefault() ); + + childSetValue("spinner_decimal", gSavedSettings.getControl("DecimalsForTools")->getDefault() ); } void 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 @@ label="Rez objects using land group" left_delta="0" mouse_opaque="true" tooltip="Rez objects on group land using the land's group (if possible)" name="grouplandrez" radio_style="false" width="270" /> +