From d1cb6d33351baef4512848936f18be0b2bbab639 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Fri, 17 Jun 2011 01:03:27 +0200
Subject: [PATCH] Silly old merge unbotch

---
 .../en-us/panel_preferences_ascent_system.xml | 296 +-----------------
 1 file changed, 3 insertions(+), 293 deletions(-)

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 5221e04d9..b2027fbed 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
@@ -1,298 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
-	border="true" label="Singularity" name="ascsys" enabled="true" mouse_opaque="true">
-	<tab_container label="Singularity System" bottom="0" height="440" width="497" left="0"
-		name="Ascent System" tab_min_width="70" tab_position="top">
-		<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-			follows="left|top|right|bottom" label="General" name="User Interface">
-			<check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Enable teleporting via double-click in-world" left="10"
-				tool_tip="Double-clicking on an object/person will teleport you to that location."
-			    mouse_opaque="true" name="double_click_teleport_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="OptionRotateCamAfterLocalTP" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Reset camera after teleporting" left="20"
-				tool_tip="Centers the camera behind you after a local teleport."
-			    mouse_opaque="true" name="center_after_teleport_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="OptionOffsetTPByAgentHeight" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Offset TP target by half agent height" left="20"
-				tool_tip="Tries to aim the TP so that your feet land at the point you're aiming for."
-			    mouse_opaque="true" name="offset_teleport_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="PreviewAnimInWorld" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Preview animations on the avatar instead on a dummy before uploading" left="10"
-				tool_tip="The Animation upload window will play animations on your avatar when previewing them."
-			    mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	    		label="Save scripts in inventory as Mono scripts instead of LSL2" left="10"
-				tool_tip="Scripts will automatically be compiled in Mono when saving - Usually only possible when placed in an object."
-		    	mouse_opaque="true" name="save_scripts_as_mono_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="AscentAlwaysRezInGroup" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Always rez objects as land group when available" left="10"
-				tool_tip="Rez objects with the same group that the object is being rezzed on has, regardless of your active tag."
-				mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentBuildAlwaysEnabled" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Always show Build as enabled" left="10"
-				tool_tip="Allows you to use the Build menu without having to be tricky about it. May not mean you can actually build there."
-				mouse_opaque="true" name="always_build_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentFlyAlwaysEnabled" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Always allow Fly" left="10"
-				tool_tip="Lets you fly in locations you shouldn't be allowed to. Use at your own risk - Just because you can doesn't mean you should."
-				mouse_opaque="true" name="always_fly_check" radio_style="false"
-				width="400" />	
-			<check_box bottom_delta="-20" control_name="AscentDisableMinZoomDist" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Disable camera minimum distance" left="10"
-				tool_tip="Allows the camera to get reeeaaally close to things."
-				mouse_opaque="true" name="disable_camera_zoom_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentPowerfulWizardCheck1" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Enable Power User functionality" left="10"
-				tool_tip="Adds features deemed too dangerous for normal use. These features can wreak havoc or do bad things if misused - Mostly to yourself or your belongings. If you're sure, activate the checkbox below as well."
-				mouse_opaque="true" name="power_user_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentPowerfulWizardCheck2" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Confirm Power User functionality" left="10"
-				tool_tip="Confirms Power User activation. Turn this on at your own risk, and use any features it enables responsibly. Ascent devs will not replace anything you break if you ruin something important. Unlike most checkboxes, you must apply/ok changes before this will activate."
-				mouse_opaque="true" name="power_user_confirm_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentUseSystemFolder" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-				label="Enable Ascent System Inventory (Requires Restart)" left="10"
-				tool_tip="Creates a new folder in the inventory for storing settings files and non-permanent assets."
-				mouse_opaque="true" name="system_folder_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentSystemTemporary" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Temporary uploads go in the System Asset folder." left="20"
-				tool_tip="Puts temporary uploads in the Asset folder which separates them from actual uploads, making them easier to find."
-			    mouse_opaque="true" name="temp_in_system_check" radio_style="false"
-			    width="400" />
-		</panel>
-    	<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-			follows="left|top|right|bottom" label="Chat/IM" name="Chat/IM">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			    bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-		    	left="15" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
-			    width="300">
-				IMs:
-			</text>
-			<check_box bottom_delta="-25" control_name="WoLfVerticalIMTabs" enabled="true"
-		    	follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-		    	label="Use Vertical IMs (Requires a restart)" left="10"
-			    mouse_opaque="true" name="use_vertical_ims_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Announce incoming instant messages" left="10" mouse_opaque="true"
-				control_name="AscentInstantMessageAnnounceIncoming" radio_style="false" width="270"
-				name="quickstart_im_check"
-				tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter. "/>
-			<check_box bottom_delta="-20" control_name="AscentHideTypingNotification" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-				label="Don't send '[name] is typing...' in IMs" left="10"
-				tool_tip="IM partners will not see '______ is typing...' when you're responding."
-				mouse_opaque="true" name="hide_typing_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="OptionShowGroupNameInChatIM" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-				label="Show group name in chat" left="10"
-				tool_tip="The name of the group will also be displayed if the IM is from group chat."
-				mouse_opaque="true" name="append_group_name_check" radio_style="false"
-				width="400" />
-			<!-- Left/Right Column split -->
-			<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
-						 left="235" name="CmdDivisor" width="0"/>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			    bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-		    	left="250" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
-			    width="300">
-				Chat:
-			</text>
-			<check_box bottom_delta="-25" control_name="PlayTypingSound" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	    		label="Play the typing sound for local chat" left_delta="-5"
-				tool_tip="Silences the chatting type sound, making it quieter for things like performances."
-		    	mouse_opaque="true" name="play_typing_sound_check" radio_style="false"
-			    width="400" />
-			<check_box bottom_delta="-20" control_name="HideNotificationsInChat" enabled="true"
-		    	follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-		    	label="Do not echo/log notifications in chat" left_delta="00"
-			    mouse_opaque="true" name="hide_notifications_in_chat_check" radio_style="false"
-			    width="400" />
-			<check_box bottom="-120" control_name="AscentAllowMUpose" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-				label="Allow MU pose method." left="10"
-				tool_tip="Allows the use of both /me and : to perform emotes."
-				mouse_opaque="true" name="allow_mu_pose_check" radio_style="false"
-				width="400" />
-			<check_box bottom_delta="-20" control_name="AscentAutoCloseOOC" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-				label="Auto-close OOC comments." left="10"
-				tool_tip="Will automatically append '))' to any message starting with '((', or visa versa."
-				mouse_opaque="true" name="close_ooc_check" radio_style="false"
-				width="400" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			    bottom_delta="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-		    	left_delta="0" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
-			    width="300">
-				Show links on chatting object names in chat history for:
-			</text>
-			<radio_group bottom_delta="-26" control_name="LinksForChattingObjects" draw_border="true" enabled="true"
-				tool_tip="Enables a link to show you the owner of the speaking object."
-			    follows="left|top" height="20" left="20" mouse_opaque="true" name="objects_link" width="350">
-				<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
-					left_delta="5" mouse_opaque="true" name="no_object" width="48">
-					No object
-				</radio_item>
-				<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18" 
-					left_delta="45" mouse_opaque="true" name="others_objects" width="48">
-					Others' objects
-				</radio_item>
-				<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18" 
-					left_delta="60" mouse_opaque="true" name="anyones_objects" width="48">
-					Anyone's objects
-				</radio_item>
-			</radio_group>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		    	bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-		    	left="10" mouse_opaque="true" name="time_format_text_box" v_pad="0"
-			    width="80">
-				Time format:
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
-		    	height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
-				tool_tip="Show hours in either 12-23 or 12PM-11PM format."
-		    	name="time_format_combobox" width="130">
-				<combo_item type="string" length="1" enabled="true" name="24hours" value="default">
-					24-hour clock
-				</combo_item>
-				<combo_item type="string" length="1" enabled="true" name="12hours" value="default">
-					12-hour clock
-				</combo_item>
-			</combo_box>
-			<check_box bottom_delta="0" control_name="SecondsInChatAndIMs" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-		    	label="Seconds in chat/IMs timestamps" left="240"
-			    mouse_opaque="true" name="seconds_in_chat_and_ims_check" radio_style="false"
-		    	width="260" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			    bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-	    		font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-		    	left="10" mouse_opaque="true" name="date_format_text_box" v_pad="0"
-			    width="80">
-					Date format:
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
-	    		height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
-			    name="date_format_combobox" width="130">
-				<combo_item type="string" length="1" enabled="true" name="year_first" value="default">
-					YYYY-MM-DD
-				</combo_item>
-				<combo_item type="string" length="1" enabled="true" name="day_first" value="default">
-					DD/MM/YYYY
-				</combo_item>
-				<combo_item type="string" length="1" enabled="true" name="month_first" value="default">
-					MM/DD/YYYY
-				</combo_item>
-			</combo_box>
-			<!-- Auto-responder -->
-			<view_border bevel_style="none" border_thickness="1" bottom="-420" follows="top|left"
-				height="190" left="5" name="GraphicsBorder" width="485" />
-			<check_box bottom_delta="168" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Enable Autoresponse" left="10" mouse_opaque="true"
-				name="AscentInstantMessageResponseAnyone" radio_style="false" width="270"
-                tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
-			<!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-				h_pad="0" halign="left" height="18" left_delta="10" mouse_opaque="false"
-				name="text_box1" v_pad="0" width="430">
-				Response:
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="2" enabled="true" follows="left|top"
-		    	height="18" hidden="false" left_delta="67" max_chars="20" mouse_opaque="true"
-				tool_tip="Saved response to use."
-		    	name="autoresponse_combobox" width="90">
-				<combo_item type="string" length="1" enabled="true" name="default" value="default">
-					Default
-				</combo_item>
-			</combo_box>
-			<button bottom_delta="0" control_name="addResponse" name="add_current" follows="left|top" 
-				label="+" height="18" left_delta="90" width="20"/>
-			<button bottom_delta="0" control_name="removeResponse" name="remove_current" follows="left|top" 
-				label="-" height="18" left_delta="20" width="20"/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Autorespond to non-friends" left_delta="-187" mouse_opaque="true"-->
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Autorespond to non-friends" left_delta="0" mouse_opaque="true"
-				name="AscentInstantMessageResponseFriends" radio_style="false" width="270"
-				tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Autorespond to people you have muted" left_delta="0"
-				mouse_opaque="true" name="AscentInstantMessageResponseMuted" radio_style="false"
-				width="270" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Send as soon as they start typing" left_delta="0" mouse_opaque="true"
-				name="AscentInstantMessageShowOnTyping" radio_style="false" width="270"/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="26"
-				initial_value="false" label="Don't show IMs you auto-responsed to" left_delta="0"
-				mouse_opaque="true" name="AscentInstantMessageShowResponded" radio_style="false"
-				width="170"/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Autorespond to every message" left_delta="0" mouse_opaque="true"
-				name="AscentInstantMessageResponseRepeat" radio_style="false" width="270"/>
-			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" label="Send an item along with the response" left_delta="0"
-				mouse_opaque="true" name="AscentInstantMessageResponseItem" radio_style="false"
-				width="270" tool_tip="You can include an inventory item to send along with your auto response by dragging it from your inventory to the location below"/>
-			<!--<view_border blevel_style="in" bottom_delta="-20" follows="left|top" height="18" left_delta="5"
-				mouse_opaque="false" name="im_give_drop_target_rect" width="220"/>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom_delta="0"
-				drop_shadow_visible="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="center"
-				height="16" left_delta="0" mouse_opaque="true" name="Give inventory" tool_tip="Drop an inventory item here to have it given along with the auto-response."
-				v_pad="2" width="230">
-				Drop item here (Currently: NONE)
-			</text>-->
-			<!-- Right Column -->
-			<!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="160" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-				h_pad="0" halign="left" height="18" left_delta="245" mouse_opaque="false"-->
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="120" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-				h_pad="0" halign="left" height="18" left_delta="245" mouse_opaque="false"
-				name="text_box1" v_pad="0" width="430">
-				Response Text:
-			</text>
-			<text_editor type="string" length="1" bottom_delta="-110" embedded_items="false" enabled="true"
-				follows="left|top" font="SansSerifSmall" height="110" left_delta="0" max_length="1100"
-				mouse_opaque="true" name="im_response" width="230" word_wrap="true" spell_check="true"/>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-				h_pad="0" halign="left" height="18" left_delta="0" mouse_opaque="false"
-				name="text_box1" v_pad="0" width="430">
-Use #f for user's first name, #l for last name, 
-#t for timestamp, #r for SLURL to you, 
-#i for your idle time. (e.g. "5 mins")
-			</text>
-		</panel>
+  border="true" label="SG System" name="ascsys" enabled="true" mouse_opaque="true">
+  <tab_container label="SG System" bottom="0" height="440" width="497" left="0"
+    name="Ascent System" tab_min_width="70" tab_position="top">
 
     <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
       follows="left|top|right|bottom" label="General" name="User Interface">