From 5d43a3b11a1fa788b71fffc0b08f87e5f437cda0 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 6 May 2010 02:15:16 -0700
Subject: Fixed show selection outlines checkbox in the advanced build window
(and tidied up some labels)
---
linden/indra/newview/llfloaterbuildoptions.cpp | 8 ++++++-
.../default/xui/en-us/floater_build_options.xml | 27 +++++++++++-----------
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index ad15615..b6f6158 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -53,6 +53,7 @@
#include "llcolorswatch.h"
#include "llinventorymodel.h"
#include "llresmgr.h"
+#include "llselectmgr.h"
#include "llstartup.h" // not really necessary here, but just in case
#include "llviewercontrol.h"
#include "llviewerinventory.h"
@@ -286,7 +287,12 @@ void LLFloaterBuildOptions::apply()
gSavedPerAccountSettings.setString("BuildPrefs_Texture", mBuildTextureUUID.asString() );
}
- gSavedSettings.setBOOL("RenderHighlightSelections", childGetValue("BuildPrefsRenderHighlight_toggle").asBoolean() );
+ if (gSavedSettings.getBOOL("RenderHighlightSelections") != (BOOL)(childGetValue("BuildPrefsRenderHighlight_toggle").asBoolean()))
+ {
+ LLSelectMgr::sRenderSelectionHighlights = !LLSelectMgr::sRenderSelectionHighlights;
+ gSavedSettings.setBOOL("RenderHighlightSelections", LLSelectMgr::sRenderSelectionHighlights);
+ }
+
gSavedSettings.setBOOL("RezWithLandGroup", childGetValue("grouplandrez").asBoolean() );
gSavedSettings.setBOOL("GridSubUnit", childGetValue("GridSubUnit").asBoolean() );
gSavedSettings.setBOOL("GridCrossSections", childGetValue("GridCrossSection").asBoolean() );
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 0e06a74..e7a1f89 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
@@ -52,13 +52,13 @@
left_delta="114" name="TextureBorder" width="250" />
Pivot Point
+ name="text_box6" v_pad="0" width="150">Axis Pivot Point
-