From cd24237a5bb4a0028f18833e527d5268570f6483 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 2 Dec 2015 15:02:37 -0500
Subject: SL-238 WIP - added checkbox for enhanced skeleton.

---
 indra/newview/llfloaterpreference.cpp                 | 19 +++++++++++++++++--
 indra/newview/llfloaterpreference.h                   |  2 ++
 .../skins/default/xui/en/floater_preferences.xml      |  6 +++---
 .../default/xui/en/panel_preferences_graphics1.xml    | 19 ++++++++++++++++---
 .../skins/default/xui/en/panel_preferences_sound.xml  |  2 +-
 5 files changed, 39 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index dac610eda1..746f2971d4 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -347,6 +347,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mCommitCallbackRegistrar.add("Pref.HardwareSettings",		boost::bind(&LLFloaterPreference::onOpenHardwareSettings, this));
 	mCommitCallbackRegistrar.add("Pref.HardwareDefaults",		boost::bind(&LLFloaterPreference::setHardwareDefaults, this));
 	mCommitCallbackRegistrar.add("Pref.VertexShaderEnable",		boost::bind(&LLFloaterPreference::onVertexShaderEnable, this));
+	mCommitCallbackRegistrar.add("Pref.EnhancedSkeletonEnable",	boost::bind(&LLFloaterPreference::onEnhancedSkeletonEnable, this, _1));
 	mCommitCallbackRegistrar.add("Pref.WindowedMod",			boost::bind(&LLFloaterPreference::onCommitWindowedMode, this));
 	mCommitCallbackRegistrar.add("Pref.UpdateSliderText",		boost::bind(&LLFloaterPreference::refreshUI,this));
 	mCommitCallbackRegistrar.add("Pref.QualityPerformance",		boost::bind(&LLFloaterPreference::onChangeQuality, this, _2));
@@ -755,6 +756,16 @@ void LLFloaterPreference::onVertexShaderEnable()
 	refreshEnabledGraphics();
 }
 
+void LLFloaterPreference::onEnhancedSkeletonEnable(LLUICtrl *ctrl)
+{
+    bool enabled = ctrl->getValue().asBoolean();
+    bool curr_enabled = gSavedSettings.getBOOL("IncludeEnhancedSkeleton"); 
+    if (enabled != curr_enabled)
+    {
+        gSavedSettings.setBOOL("IncludeEnhancedSkeleton",enabled);
+    }
+}
+
 //static
 void LLFloaterPreference::initDoNotDisturbResponse()
 	{
@@ -1123,7 +1134,11 @@ void LLFloaterPreference::refreshEnabledState()
 	bumpshiny_ctrl->setEnabled(bumpshiny ? TRUE : FALSE);
 	
 	radio_reflection_detail->setEnabled(reflections);
-	
+
+    LLCheckBoxCtrl* ctrl_enhanced_skel = getChild<LLCheckBoxCtrl>("AvatarEnhancedSkeleton");
+    bool enhanced_skel_enabled = gSavedSettings.getBOOL("IncludeEnhancedSkeleton");
+    ctrl_enhanced_skel->setValue(enhanced_skel_enabled);
+    
 	// Avatar Mode
 	// Enable Avatar Shaders
 	LLCheckBoxCtrl* ctrl_avatar_vp = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
@@ -1702,7 +1717,7 @@ void LLFloaterPreference::onClickAutoReplace()
 
 void LLFloaterPreference::onClickSpellChecker()
 {
-		LLFloaterReg::showInstance("prefs_spellchecker");
+    LLFloaterReg::showInstance("prefs_spellchecker");
 }
 
 void LLFloaterPreference::onClickActionChange()
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 04e5e37731..c6d6723d78 100755
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -116,6 +116,8 @@ protected:
 	void setHardwareDefaults();
 	// callback for when client turns on shaders
 	void onVertexShaderEnable();
+    // callback for when enhanced skeleton support checkbox toggled.
+    void onEnhancedSkeletonEnable(LLUICtrl *ctrl);
 
 	// callback for commit in the "Single click on land" and "Double click on land" comboboxes.
 	void onClickActionChange();
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index bd6faf4ed8..502c6e0f1f 100755
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  positioning="centered"
  default_tab_group="1"
- height="460"
+ height="512"
  layout="topleft"
  name="Preferences"
  help_topic="preferences"
@@ -19,7 +19,7 @@
      layout="topleft"
      right="-105"
      name="OK"
-     top="433"
+     top="473"
      width="90">
         <button.commit_callback
          function="Pref.OK" />
@@ -40,7 +40,7 @@
     <tab_container
      follows="all"
      halign="left"
-     height="410"
+     height="440"
      layout="topleft"
      left="0"
      name="pref core"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 6c485c0595..923e1f1b06 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="left|top|right|bottom"
- height="418"
+ height="438"
  label="Graphics"
  layout="topleft"
  left="102"
@@ -812,6 +812,19 @@
           <check_box.commit_callback
            function="Pref.VertexShaderEnable" />
       </check_box>
+      <check_box
+       control_name="RenderAvatarEnhancedSkeleton"
+       height="16"
+       initial_value="true"
+       label="Enhanced skeleton"
+       layout="topleft"
+       left_delta="0"
+       name="AvatarEnhancedSkeleton"
+       top_pad="1"
+       width="256">
+          <check_box.commit_callback
+           function="Pref.EnhancedSkeletonEnable" />
+      </check_box>
       <check_box
        control_name="RenderAvatarCloth"
        height="16"
@@ -869,7 +882,7 @@
      layout="topleft"
      left="10"
      name="Apply"
-     top="390"
+     top="400"
      width="115">
         <button.commit_callback
          function="Pref.Apply" />
@@ -881,7 +894,7 @@
      layout="topleft"
      left_pad="3"
      name="Defaults"
-     top="390"
+     top="400"
      width="115">
         <button.commit_callback
          function="Pref.HardwareDefaults" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 615abbaa89..53b74fa645 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="408"
+ height="438"
  label="Sounds"
  layout="topleft"
  left="102"
-- 
cgit v1.2.3