From af22591cc0883d5e39648bda6afc193cc3afb517 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Tue, 7 Feb 2012 10:57:04 -0500
Subject: [PATCH 1/5] Fixed mQuietSnapshotsToDisk compilation error.

---
 indra/newview/ascentprefssys.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h
index 0137ddd29..d439a2242 100644
--- a/indra/newview/ascentprefssys.h
+++ b/indra/newview/ascentprefssys.h
@@ -89,12 +89,13 @@ protected:
     BOOL mCmdMapToKeepPos;
     std::string mCmdLineTP2;
 
-    //Privacy -----------------------------------------------------------------------------
+    //Security ----------------------------------------------------------------------------
     BOOL mBroadcastViewerEffects;
     BOOL mDisablePointAtAndBeam;
     BOOL mPrivateLookAt;
     BOOL mShowLookAt;
-    BOOL mRevokePermsOnStandUp;
+	BOOL mQuietSnapshotsToDisk;
+	BOOL mRevokePermsOnStandUp;
     BOOL mDisableClickSit;
     BOOL mDisplayScriptJumps;
     F32 mNumScriptDiff;

From 6410fb32090781a0c9e08b47a1a34ffa4a9140cf Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Tue, 7 Feb 2012 14:40:10 -0500
Subject: [PATCH 2/5] Fix to make audio panel look nice on Windows as well as
 Linux.

---
 .../skins/default/xui/en-us/panel_audio.xml        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_audio.xml b/indra/newview/skins/default/xui/en-us/panel_audio.xml
index 6375db480..66bf4844a 100644
--- a/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" height="100" label="Audio &amp; Video" name="Media panel" width="250">
-	<slider control_name="AudioLevelMaster" follows="top" height="15" increment="0.005" initial_val="0.5" label="Master" label_width="40" left="3" max_val="1" min_val="0" name="System Volume" show_text="false" volume="true" width="188"/>
+	<slider control_name="AudioLevelMaster" follows="top" height="15" increment="0.005" initial_val="0.5" label="Master" label_width="40" left="10" max_val="1" min_val="0" name="System Volume" show_text="false" volume="true" width="181"/>
 	<button bottom_delta="0" control_name="MuteAudio" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_audio" toggle="true" width="25"/>
-	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.005" initial_val="0.5" label="Music" label_width="40" left="3" max_val="1" min_val="0" name="Music Volume" show_text="false" volume="true" width="188"/>
+	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.005" initial_val="0.5" label="Music" label_width="40" left="10" max_val="1" min_val="0" name="Music Volume" show_text="false" volume="true" width="181"/>
 	<button bottom_delta="0" control_name="MuteMusic" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_music" toggle="true" width="25"/>
-	<slider control_name="AudioLevelMedia" follows="top" height="15" increment="0.005" initial_val="0.5" label="Media" label_width="40" left="3" max_val="1" min_val="0" name="Media Volume" show_text="false" volume="true" width="188"/>
+	<slider control_name="AudioLevelMedia" follows="top" height="15" increment="0.005" initial_val="0.5" label="Media" label_width="40" left="10" max_val="1" min_val="0" name="Media Volume" show_text="false" volume="true" width="181"/>
 	<button bottom_delta="0" control_name="MuteMedia" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_media" toggle="true" width="25"/>
-	<slider control_name="AudioLevelVoice" follows="top" height="15" increment="0.005" initial_val="0.5" label="Voice" label_width="40" left="3" max_val="1" min_val="0" name="Voice Volume" show_text="false" volume="true" width="188"/>
+	<slider control_name="AudioLevelVoice" follows="top" height="15" increment="0.005" initial_val="0.5" label="Voice" label_width="40" left="10" max_val="1" min_val="0" name="Voice Volume" show_text="false" volume="true" width="181"/>
 	<button bottom_delta="0" control_name="MuteVoice" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_voice" toggle="true" width="25"/>
-	<slider control_name="AudioLevelSFX" follows="top" height="15" increment="0.005" initial_val="0.5" label="Sounds" label_width="40" left="3" max_val="1" min_val="0" name="SFX Volume" show_text="false" volume="true" width="188"/>
+	<slider control_name="AudioLevelSFX" follows="top" height="15" increment="0.005" initial_val="0.5" label="Sounds" label_width="40" left="10" max_val="1" min_val="0" name="SFX Volume" show_text="false" volume="true" width="181"/>
 	<button bottom_delta="0" control_name="MuteSounds" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_sfx" toggle="true" width="25"/>
-	<slider control_name="AudioLevelAmbient" follows="top" height="15" increment="0.005" initial_val="0.5" label="Ambient" label_width="40" left="3" max_val="1" min_val="0" name="Wind Volume" show_text="false" volume="true" width="188"/>
+	<slider control_name="AudioLevelAmbient" follows="top" height="15" increment="0.005" initial_val="0.5" label="Ambient" label_width="40" left="10" max_val="1" min_val="0" name="Wind Volume" show_text="false" volume="true" width="181"/>
 	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
-	<slider control_name="AudioLevelUI" follows="top" height="15" increment="0.005" initial_val="0.5" label="UI" label_width="40" left="3" max_val="1" min_val="0" name="UI Volume" show_text="false" volume="true" width="188"/>
+	<slider control_name="AudioLevelUI" follows="top" height="15" increment="0.005" initial_val="0.5" label="UI" label_width="40" left="10" max_val="1" min_val="0" name="UI Volume" show_text="false" volume="true" width="181"/>
 	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
 </panel>

From c294456e2a6279213e25bc6e4e43673fd18a6845 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Tue, 7 Feb 2012 14:41:07 -0500
Subject: [PATCH 3/5] Added keyboard shortcut for build.

Consistency with other toolbar tooltips.
---
 indra/newview/skins/default/xui/en-us/panel_toolbar.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
index a1ec31469..38178813f 100644
--- a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -12,7 +12,7 @@
 	<button bottom="0" height="24" label="Fly" image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Stop Flying" name="fly_btn" tool_tip="Start flying(F or Home). Use E/C or PgUp/PgDn to fly up and down." width="50" follows="left|right" user_resize="false"/>
 	<button bottom="0" height="24" label="Snapshot" image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory.(Ctrl-Shift-S for floater, Ctrl-`(~) takes snapshot w/o floater)" width="50" follows="left|right" user_resize="false"/>
     <button bottom="0" height="24" label="Search" image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="directory_btn" tool_tip="Search for places, events, people, and more.(Ctrl-F)" width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" height="24" label="Build" name="build_btn" image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Create new objects." width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" height="24" label="Build" name="build_btn" image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Create new objects. (B)" width="50" follows="left|right" user_resize="false"/>
     <button bottom="0" height="24" label="Map" name="map_btn" image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right" user_resize="false"/>
     <button bottom="0" height="24" label="Mini-Map" image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)" width="50" follows="left|right" user_resize="false"/>
     <button bottom="0" height="24" label="Inventory" image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" user_resize="false"/>

From fec75d94367df6b1212707b36d60a7667ab5bfca Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 8 Feb 2012 00:35:42 -0500
Subject: [PATCH 4/5] Added commandline for Fake Away Status.

Users can turn on and off the fake away status by typing a command.
Can be placed inside gesture to be performed together with going away.
---
 indra/newview/app_settings/settings_ascent.xml        | 11 +++++++++++
 indra/newview/ascentprefssys.cpp                      |  7 +++++++
 indra/newview/ascentprefssys.h                        |  1 +
 indra/newview/chatbar_as_cmdline.cpp                  |  5 +++++
 indra/newview/llviewermenu.h                          |  1 +
 .../xui/en-us/panel_preferences_ascent_system.xml     |  2 ++
 6 files changed, 27 insertions(+)

diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml
index ec2b81116..ff03528a0 100644
--- a/indra/newview/app_settings/settings_ascent.xml
+++ b/indra/newview/app_settings/settings_ascent.xml
@@ -620,5 +620,16 @@
 			<key>Value</key>
 			<string>tp2</string>
 		</map>
+		<key>SinguCmdLineAway</key>
+		<map>
+			<key>Comment</key>
+			<string>Toggle Fake Away Status.</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>String</string>
+			<key>Value</key>
+			<string>/away</string>
+		</map>
     </map>
 </llsd>
diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index 88a3361fc..493bb7a69 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -71,6 +71,7 @@ LLPrefsAscentSys::LLPrefsAscentSys()
     childSetCommitCallback("AscentCmdLineOfferTp", onCommitCmdLine, this);
     childSetCommitCallback("AscentCmdLineMapTo", onCommitCmdLine, this);
     childSetCommitCallback("AscentCmdLineTP2", onCommitCmdLine, this);
+    childSetCommitCallback("SinguCmdLineAway", onCommitCmdLine, this);
 
     refreshValues();
     refresh();
@@ -169,6 +170,7 @@ void LLPrefsAscentSys::onCommitCmdLine(LLUICtrl* ctrl, void* user_data)
         self->childSetEnabled("AscentCmdLineMapTo",        enabled);
         self->childSetEnabled("map_to_keep_pos",           enabled);
         self->childSetEnabled("AscentCmdLineTP2",          enabled);
+        self->childSetEnabled("SinguCmdLineAway",          enabled);
     }
 
     gSavedSettings.setString("AscentCmdLinePos",          self->childGetValue("AscentCmdLinePos"));
@@ -184,6 +186,7 @@ void LLPrefsAscentSys::onCommitCmdLine(LLUICtrl* ctrl, void* user_data)
     gSavedSettings.setString("AscentCmdLineOfferTp",      self->childGetValue("AscentCmdLineOfferTp"));
     gSavedSettings.setString("AscentCmdLineMapTo",        self->childGetValue("AscentCmdLineMapTo"));
     gSavedSettings.setString("AscentCmdLineTP2",          self->childGetValue("AscentCmdLineTP2"));
+    gSavedSettings.setString("SinguCmdLineAway",          self->childGetValue("SinguCmdLineAway"));
 }
 
 void LLPrefsAscentSys::refreshValues()
@@ -225,6 +228,7 @@ void LLPrefsAscentSys::refreshValues()
     mCmdLineMapTo               = gSavedSettings.getString("AscentCmdLineMapTo");
     mCmdMapToKeepPos            = gSavedSettings.getBOOL("AscentMapToKeepPos");
     mCmdLineTP2                 = gSavedSettings.getString("AscentCmdLineTP2");
+    mCmdLineAway                = gSavedSettings.getString("SinguCmdLineAway");
 
     //Security ----------------------------------------------------------------------------
     mBroadcastViewerEffects		= gSavedSettings.getBOOL("BroadcastViewerEffects");
@@ -276,6 +280,7 @@ void LLPrefsAscentSys::refresh()
     childSetEnabled("AscentCmdLineMapTo",         mCmdLine);
     childSetEnabled("map_to_keep_pos",            mCmdLine);
     childSetEnabled("AscentCmdLineTP2",           mCmdLine);
+    childSetEnabled("SinguCmdLineAway",           mCmdLine);
 
     childSetValue("AscentCmdLinePos",           mCmdLinePos);
     childSetValue("AscentCmdLineGround",        mCmdLineGround);
@@ -290,6 +295,7 @@ void LLPrefsAscentSys::refresh()
     childSetValue("AscentCmdLineOfferTp",       mCmdLineOfferTp);
     childSetValue("AscentCmdLineMapTo",         mCmdLineMapTo);
     childSetValue("AscentCmdLineTP2",           mCmdLineTP2);
+    childSetValue("SinguCmdLineAway",           mCmdLineAway);
 }
 
 void LLPrefsAscentSys::cancel()
@@ -330,6 +336,7 @@ void LLPrefsAscentSys::cancel()
     gSavedSettings.setString("AscentCmdLineMapTo",			mCmdLineMapTo);
     gSavedSettings.setBOOL("AscentMapToKeepPos",            mCmdMapToKeepPos);
     gSavedSettings.setString("AscentCmdLineTP2",			mCmdLineTP2);
+    gSavedSettings.setString("SinguCmdLineAway",			mCmdLineAway);
 
     //Security ----------------------------------------------------------------------------
     gSavedSettings.setBOOL("BroadcastViewerEffects",        mBroadcastViewerEffects);
diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h
index d439a2242..c31751574 100644
--- a/indra/newview/ascentprefssys.h
+++ b/indra/newview/ascentprefssys.h
@@ -88,6 +88,7 @@ protected:
     std::string mCmdLineMapTo;
     BOOL mCmdMapToKeepPos;
     std::string mCmdLineTP2;
+    std::string mCmdLineAway;
 
     //Security ----------------------------------------------------------------------------
     BOOL mBroadcastViewerEffects;
diff --git a/indra/newview/chatbar_as_cmdline.cpp b/indra/newview/chatbar_as_cmdline.cpp
index 4539b3a34..a0051de59 100644
--- a/indra/newview/chatbar_as_cmdline.cpp
+++ b/indra/newview/chatbar_as_cmdline.cpp
@@ -55,6 +55,7 @@
 #include "llfloateravatarlist.h"
 #include "llviewerobjectlist.h"
 #include "llviewertexteditor.h"
+#include "llviewermenu.h"
 #include "llvoavatar.h"
 #include "lltooldraganddrop.h"
 #include "llinventorymodel.h"
@@ -398,6 +399,10 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
 					cmdline_tp2name(name);
 				}
 				return false;
+			}else if(command == utf8str_tolower(gSavedSettings.getString("SinguCmdLineAway")))
+			{
+				handle_fake_away_status(NULL);
+				return false;
 			}else if(command == "typingstop")
 			{
 				std::string text;
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index a6d96c08c..4a32dfe26 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -99,6 +99,7 @@ bool toggle_build_mode();
 void handle_object_build(void*);
 void handle_save_snapshot(void *);
 void handle_toggle_flycam();
+void handle_fake_away_status(void*);
 
 bool handle_sit_or_stand();
 bool handle_give_money_dialog();
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 117457d1e..7cb672eb6 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
@@ -74,6 +74,8 @@
       <check_box bottom_delta="-24" follows="top" initial_value="false" label="Use same position between sims" name="map_to_keep_pos" control_name="AscentMapToKeepPos"/>
       <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_13">Teleport to avatar (usage: cmd name)</text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open." name="AscentCmdLineTP2" width="200"/>
+      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_14">Toggle Fake Away Status (usage: cmd)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="SinguCmdLineAway" width="200"/>
     </panel>
 
     <panel border="true" left="1" bottom="-408" height="408" width="500" label="Security" name="Security">

From 66c3f282dea11b34f72709765762daddc90bb566 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 8 Feb 2012 12:47:02 -0500
Subject: [PATCH 5/5] Removed repetitive search text.

---
 indra/newview/skins/default/xui/en-us/panel_friends.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_friends.xml b/indra/newview/skins/default/xui/en-us/panel_friends.xml
index da9dec4ef..58cdb514a 100644
--- a/indra/newview/skins/default/xui/en-us/panel_friends.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_friends.xml
@@ -17,8 +17,8 @@
 	<!--combo_box allow_text_entry="false" enabled="true" follows="right|top" bottom_delta="20" height="18" hidden="false" left="-255" max_chars="20" tool_tip="Buddy group" name="buddy_group_combobox" width="130">
 		<combo_item type="string" length="20" enabled="true" name="All" value="All">All</combo_item>
 	</combo_box-->
-	<text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text>
-	<search_editor bottom_delta="0" enabled="true" follows="left|top" font="SansSerif" height="18" left="90" name="buddy_search_lineedit" label="Type here to search" tool_tip="The friend name you want to search for" width="160"/>
+	<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text-->
+	<search_editor bottom_delta="-40" enabled="true" follows="left|top" font="SansSerif" height="18" name="buddy_search_lineedit" label="Contact Search" tool_tip="The friend name you want to search for" width="160"/>
 	<button bottom_delta="0" follows="top|right" height="22" label="0" left="-120" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info" width="22"/>
 	<pad bottom="-7" height="0" left="-90" width="1"/>
 	<!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/-->