diff options
Diffstat (limited to 'linden/indra/newview/llfloaterbuildoptions.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterbuildoptions.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp index 8c6c5f3..b6c15b6 100644 --- a/linden/indra/newview/llfloaterbuildoptions.cpp +++ b/linden/indra/newview/llfloaterbuildoptions.cpp | |||
@@ -115,6 +115,9 @@ BOOL LLFloaterBuildOptions::postBuild() | |||
115 | getChild<LLTextureCtrl>("texture control")->setImageAssetID(LLUUID(gSavedPerAccountSettings.getString("BuildPrefs_Texture"))); | 115 | getChild<LLTextureCtrl>("texture control")->setImageAssetID(LLUUID(gSavedPerAccountSettings.getString("BuildPrefs_Texture"))); |
116 | 116 | ||
117 | childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getBOOL("RenderHighlightSelections") ); | 117 | childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getBOOL("RenderHighlightSelections") ); |
118 | childSetValue("BuildPrefsRenderHidden_toggle", gSavedSettings.getBOOL("RenderHiddenSelections") ); | ||
119 | childSetValue("BuildPrefsRenderLightRadius_toggle", gSavedSettings.getBOOL("RenderLightRadius") ); | ||
120 | childSetValue("BuildPrefsShowSelectionBeam_toggle", gSavedSettings.getBOOL("ShowSelectionBeam") ); | ||
118 | childSetValue("grouplandrez", gSavedSettings.getBOOL("RezWithLandGroup") ); | 121 | childSetValue("grouplandrez", gSavedSettings.getBOOL("RezWithLandGroup") ); |
119 | childSetValue("GridSubUnit", gSavedSettings.getBOOL("GridSubUnit") ); | 122 | childSetValue("GridSubUnit", gSavedSettings.getBOOL("GridSubUnit") ); |
120 | childSetValue("GridCrossSection", gSavedSettings.getBOOL("GridCrossSections") ); | 123 | childSetValue("GridCrossSection", gSavedSettings.getBOOL("GridCrossSections") ); |
@@ -293,6 +296,17 @@ void LLFloaterBuildOptions::apply() | |||
293 | LLSelectMgr::sRenderSelectionHighlights = !LLSelectMgr::sRenderSelectionHighlights; | 296 | LLSelectMgr::sRenderSelectionHighlights = !LLSelectMgr::sRenderSelectionHighlights; |
294 | gSavedSettings.setBOOL("RenderHighlightSelections", LLSelectMgr::sRenderSelectionHighlights); | 297 | gSavedSettings.setBOOL("RenderHighlightSelections", LLSelectMgr::sRenderSelectionHighlights); |
295 | } | 298 | } |
299 | if (gSavedSettings.getBOOL("RenderHiddenSelections") != (BOOL)(childGetValue("BuildPrefsRenderHidden_toggle").asBoolean())) | ||
300 | { | ||
301 | LLSelectMgr::sRenderHiddenSelections = !LLSelectMgr::sRenderHiddenSelections; | ||
302 | gSavedSettings.setBOOL("RenderHiddenSelections", LLSelectMgr::sRenderHiddenSelections); | ||
303 | } | ||
304 | if (gSavedSettings.getBOOL("RenderLightRadius") != (BOOL)(childGetValue("BuildPrefsRenderLightRadius_toggle").asBoolean())) | ||
305 | { | ||
306 | LLSelectMgr::sRenderLightRadius = !LLSelectMgr::sRenderLightRadius; | ||
307 | gSavedSettings.setBOOL("RenderLightRadius", LLSelectMgr::sRenderLightRadius); | ||
308 | } | ||
309 | gSavedSettings.setBOOL("ShowSelectionBeam", childGetValue("BuildPrefsShowSelectionBeam_toggle").asBoolean() ); | ||
296 | 310 | ||
297 | gSavedSettings.setBOOL("RezWithLandGroup", childGetValue("grouplandrez").asBoolean() ); | 311 | gSavedSettings.setBOOL("RezWithLandGroup", childGetValue("grouplandrez").asBoolean() ); |
298 | gSavedSettings.setBOOL("GridSubUnit", childGetValue("GridSubUnit").asBoolean() ); | 312 | gSavedSettings.setBOOL("GridSubUnit", childGetValue("GridSubUnit").asBoolean() ); |
@@ -340,6 +354,9 @@ void LLFloaterBuildOptions::reset() | |||
340 | mBuildTextureUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault().asString(); | 354 | mBuildTextureUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault().asString(); |
341 | 355 | ||
342 | childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getControl("RenderHighlightSelections")->getDefault() ); | 356 | childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getControl("RenderHighlightSelections")->getDefault() ); |
357 | childSetValue("BuildPrefsRenderHidden_toggle", gSavedSettings.getControl("RenderHiddenSelections")->getDefault() ); | ||
358 | childSetValue("BuildPrefsRenderLightRadius_toggle", gSavedSettings.getControl("RenderLightRadius")->getDefault() ); | ||
359 | childSetValue("BuildPrefsShowSelectionBeam_toggle", gSavedSettings.getControl("ShowSelectionBeam")->getDefault() ); | ||
343 | childSetValue("grouplandrez", gSavedSettings.getControl("RezWithLandGroup")->getDefault() ); | 360 | childSetValue("grouplandrez", gSavedSettings.getControl("RezWithLandGroup")->getDefault() ); |
344 | childSetValue("GridSubUnit", gSavedSettings.getControl("GridSubUnit")->getDefault() ); | 361 | childSetValue("GridSubUnit", gSavedSettings.getControl("GridSubUnit")->getDefault() ); |
345 | childSetValue("GridCrossSection", gSavedSettings.getControl("GridCrossSections")->getDefault() ); | 362 | childSetValue("GridCrossSection", gSavedSettings.getControl("GridCrossSections")->getDefault() ); |