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 0 - SaveScriptsAsMono - - Comment - When set to TRUE, save scripts in inventory as Mono scripts instead of LSL2 - Persist - 1 - Type - Boolean - Value - 1 - PreviewSoundRect Comment 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"/> - 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'animation est jouée avec votre avatar avant d'être téléchargée." mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false" width="400" /> -