From a8e1bd1538065f9d333e9540c3140d352d151a76 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 3 Dec 2012 11:33:24 -0600
Subject: [PATCH] 'Save scripts in inventory as Mono scripts instead of LSL2'
 checkbox was not functioning. For whatever reason it was not implemented in
 the actual panel, and referenced the incorrect setting. The proper setting
 will be 'SaveInventoryScriptsAsMono' not 'SaveScriptsAsMono'

---
 indra/newview/app_settings/settings.xml               | 11 -----------
 indra/newview/ascentprefssys.cpp                      |  4 ++--
 indra/newview/ascentprefssys.h                        |  2 +-
 .../xui/en-us/panel_preferences_ascent_system.xml     |  2 +-
 .../xui/fr/panel_preferences_ascent_system.xml        |  2 +-
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 843a46459..ba53a42a1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9882,17 +9882,6 @@ Found in Advanced->Rendering->Info Displays</string>
         <integer>0</integer>
       </array>
     </map>
-    <key>SaveScriptsAsMono</key>
-    <map>
-      <key>Comment</key>
-      <string>When set to TRUE, save scripts in inventory as Mono scripts instead of LSL2</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>PreviewSoundRect</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index 8b90011f2..f8eac7fec 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -268,7 +268,7 @@ void LLPrefsAscentSys::refreshValues()
         mResetCameraAfterTP		= gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP");
         mOffsetTPByUserHeight	= gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
     mPreviewAnimInWorld			= gSavedSettings.getBOOL("PreviewAnimInWorld");
-//    mSaveScriptsAsMono			= gSavedSettings.getBOOL("SaveScriptsAsMono");
+    mSaveScriptsAsMono			= gSavedSettings.getBOOL("SaveInventoryScriptsAsMono");
     mAlwaysRezInGroup			= gSavedSettings.getBOOL("AscentAlwaysRezInGroup");
     mBuildAlwaysEnabled			= gSavedSettings.getBOOL("AscentBuildAlwaysEnabled");
     mAlwaysShowFly				= gSavedSettings.getBOOL("AscentFlyAlwaysEnabled");
@@ -417,7 +417,7 @@ void LLPrefsAscentSys::cancel()
         gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", mResetCameraAfterTP);
         gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", mOffsetTPByUserHeight);
     gSavedSettings.setBOOL("PreviewAnimInWorld", mPreviewAnimInWorld);
-//    gSavedSettings.setBOOL("SaveScriptsAsMono", mSaveScriptsAsMono);
+    gSavedSettings.setBOOL("SaveInventoryScriptsAsMono", mSaveScriptsAsMono);
     gSavedSettings.setBOOL("AscentAlwaysRezInGroup", mAlwaysRezInGroup);
     gSavedSettings.setBOOL("AscentBuildAlwaysEnabled", mBuildAlwaysEnabled);
     gSavedSettings.setBOOL("AscentFlyAlwaysEnabled", mAlwaysShowFly);
diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h
index 3b233bb28..336828999 100644
--- a/indra/newview/ascentprefssys.h
+++ b/indra/newview/ascentprefssys.h
@@ -59,7 +59,7 @@ protected:
         BOOL mResetCameraAfterTP;
         BOOL mOffsetTPByUserHeight;
     BOOL mPreviewAnimInWorld;
-//    BOOL mSaveScriptsAsMono;
+    BOOL mSaveScriptsAsMono;
     BOOL mAlwaysRezInGroup;
     BOOL mBuildAlwaysEnabled;
     BOOL mAlwaysShowFly;
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
index 7e0017333..5412db7df 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -11,7 +11,7 @@
         label="Offset TP target by half agent height" tool_tip="Tries to aim the TP so that your feet land at the point you're aiming for." name="offset_teleport_check"/>
       <check_box left="10" bottom_delta="-20" control_name="PreviewAnimInWorld" follows="top" initial_value="false"
         label="Preview animations on the avatar instead on a dummy before uploading" tool_tip="The Animation upload window will play animations on your avatar when previewing them." name="preview_anim_in_world_check"/>
-      <check_box bottom_delta="-20" control_name="SaveScriptsAsMono" follows="left|top" initial_value="true"
+      <check_box bottom_delta="-20" control_name="SaveInventoryScriptsAsMono" follows="left|top" initial_value="true"
         label="Save scripts in inventory as Mono scripts instead of LSL2" tool_tip="Scripts will automatically be compiled in Mono when saving - Usually only possible when placed in an object." name="save_scripts_as_mono_check"/>
       <check_box bottom_delta="-20" control_name="AscentAlwaysRezInGroup" follows="left|top" initial_value="true"
         label="Always rez objects as land group when available" tool_tip="Rez objects with the same group that the object is being rezzed on has, regardless of your active tag." name="always_rez_in_group_check"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
index 1a12b036d..2c974d9ce 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
@@ -30,7 +30,7 @@
         tool_tip="L&#x27;animation est jou&#xE9;e avec votre avatar avant d&#x27;&#xEA;tre t&#xE9;l&#xE9;charg&#xE9;e."
         mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
         width="400" />
-      <check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="false"
+      <check_box bottom_delta="-20" control_name="SaveInventoryScriptsAsMono" enabled="false"
         follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         label="Enregistrer les scripts syst&#xE9;matiquement en Mono" left="10"
         tool_tip="Compile les scripts en Mono quand cela est possible."