2 files changed, 19 insertions, 0 deletions

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 34c8eb2..60c936a 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -67,6 +67,9 @@ BOOL LLPrefsAdvanced::postBuild()
         childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
         childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
         childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic"));
+        childSetValue("allow_mupose", gSavedSettings.getBOOL("AllowMUpose"));
+        childSetValue("auto_close_ooc", gSavedSettings.getBOOL("AutoCloseOOC"));
+
         childSetValue("lightshare_combo",
                       LLSD((S32)gSavedSettings.getU32("LightShareAllowed")));
 
@@ -90,6 +93,8 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
         gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
         gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
+        gSavedSettings.setBOOL("AllowMUpose", childGetValue("allow_mupose"));
+        gSavedSettings.setBOOL("AutoCloseOOC", childGetValue("auto_close_ooc"));
         gSavedSettings.setU32("LightShareAllowed",
                               (U32)childGetValue("lightshare_combo").asInteger());
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 7528809..ce2bbc1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -94,6 +94,20 @@
        mouse_opaque="true" name="language_is_public"
        radio_style="false" tool_tip="This lets in-world objects know your preferred language."
        width="256" />
+
+  <check_box bottom_delta="-25" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+       initial_value="false" label="Use MU* pose style chat and IM" left="12"
+       mouse_opaque="true" name="allow_mupose"
+       radio_style="false" tool_tip="Use MU* pose style in chat and IM (with ':' as a synonymous to '/me ')."
+       width="256" />
+  <check_box bottom_delta="0" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+       initial_value="false" label="Auto-close OOC chat" left_delta="180"
+       mouse_opaque="true" name="auto_close_ooc"
+       radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
+       width="256" />
+
   <!-- Uncomment when we start using the crash logger - MC -->
   <!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
        bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"