From 01197be897f98b8992bd454e2aecadea9d6147f7 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 5 Nov 2024 17:14:13 +0100
Subject: [PATCH] Clean up formatting in floater_fs_poser.xml and fix various
 issues that showed up in log

---
 indra/newview/fsfloaterposer.cpp              |   19 -
 indra/newview/fsfloaterposer.h                |    3 -
 .../skins/default/xui/en/floater_fs_poser.xml | 2135 ++++++++---------
 .../xui/en/widgets/fs_virtual_trackpad.xml    |    1 -
 4 files changed, 1063 insertions(+), 1095 deletions(-)

diff --git a/indra/newview/fsfloaterposer.cpp b/indra/newview/fsfloaterposer.cpp
index 130ec7ba8c..508574d988 100644
--- a/indra/newview/fsfloaterposer.cpp
+++ b/indra/newview/fsfloaterposer.cpp
@@ -180,7 +180,6 @@ bool FSFloaterPoser::postBuild()
     mAdvScaleYSlider = getChild<LLSliderCtrl>("Advanced_Scale_Y");
     mAdvScaleZSlider = getChild<LLSliderCtrl>("Advanced_Scale_Z");
 
-    mSaveFilePptionsPnl = getChild<LLPanel>("save_file_options");
     mPosesLoadSavePnl = getChild<LLPanel>("poses_loadSave");
     mStartStopPosingBtn = getChild<LLButton>("start_stop_posing_button");
     mToggleLoadSavePanelBtn = getChild<LLButton>("toggleLoadSavePanel");
@@ -212,10 +211,6 @@ bool FSFloaterPoser::postBuild()
     mMiscJointsPnl = getChild<LLPanel>("misc_joints_panel");
     mCollisionVolumesPnl = getChild<LLPanel>("collision_volumes_panel");
 
-    mStopPosingWhenClosed = getChild<LLCheckBoxCtrl>("stop_posing_on_close_checkbox");
-    if (gSavedSettings.getBOOL(POSER_STOPPOSINGWHENCLOSED_SAVE_KEY))
-        mStopPosingWhenClosed->set(true);
-
     return true;
 }
 
@@ -236,9 +231,6 @@ void FSFloaterPoser::onClose(bool app_quitting)
     if (mToggleAdvancedPanelBtn)
         gSavedSettings.setBOOL(POSER_ADVANCEDWINDOWSTATE_SAVE_KEY, mToggleAdvancedPanelBtn->getValue().asBoolean());
 
-    if (mStopPosingWhenClosed)
-        gSavedSettings.setBOOL(POSER_STOPPOSINGWHENCLOSED_SAVE_KEY, mStopPosingWhenClosed->getValue());
-
     if (gSavedSettings.getBOOL(POSER_STOPPOSINGWHENCLOSED_SAVE_KEY))
         stopPosingSelf();
 
@@ -1054,16 +1046,6 @@ void FSFloaterPoser::onToggleLoadSavePanel()
 
     if (loadSavePanelExpanded)
         refreshPoseScroll(mPosesScrollList);
-
-    showOrHideAdvancedSaveOptions();
-}
-
-void FSFloaterPoser::showOrHideAdvancedSaveOptions()
-{
-    bool loadSavePanelExpanded = mToggleLoadSavePanelBtn->getValue().asBoolean();
-    bool advancedPanelExpanded = mToggleAdvancedPanelBtn->getValue().asBoolean();
-
-    mSaveFilePptionsPnl->setVisible(loadSavePanelExpanded && advancedPanelExpanded);
 }
 
 void FSFloaterPoser::onToggleMirrorChange()
@@ -1364,7 +1346,6 @@ void FSFloaterPoser::onToggleAdvancedPanel()
         return;
 
     reshape(poserFloaterWidth, poserFloaterHeight);
-    showOrHideAdvancedSaveOptions();
     onJointSelect();
 }
 
diff --git a/indra/newview/fsfloaterposer.h b/indra/newview/fsfloaterposer.h
index bc0987212e..7f8cfa2a93 100644
--- a/indra/newview/fsfloaterposer.h
+++ b/indra/newview/fsfloaterposer.h
@@ -205,7 +205,6 @@ class FSFloaterPoser : public LLFloater
     bool poseFileStartsFromTeePose(const std::string& poseFileName);
     void setPoseSaveFileTextBoxToUiSelectedAvatarSaveFileName();
     void setUiSelectedAvatarSaveFileName(const std::string& saveFileName);
-    void showOrHideAdvancedSaveOptions();
 
     // UI Event Handlers:
     void onAvatarsRefresh();
@@ -385,7 +384,6 @@ class FSFloaterPoser : public LLFloater
     LLButton* mSetToTposeButton{ nullptr };
     LLButton* mRecaptureJointsButton{ nullptr };
 
-    LLCheckBoxCtrl* mStopPosingWhenClosed{ nullptr };
     LLLineEditor* mPoseSaveNameEditor{ nullptr };
 
     LLPanel* mAdvancedParentPnl{ nullptr };
@@ -397,7 +395,6 @@ class FSFloaterPoser : public LLFloater
     LLPanel* mHandsJointsPnl{ nullptr };
     LLPanel* mMiscJointsPnl{ nullptr };
     LLPanel* mCollisionVolumesPnl{ nullptr };
-    LLPanel* mSaveFilePptionsPnl{ nullptr };
     LLPanel* mPosesLoadSavePnl{ nullptr };
 };
 
diff --git a/indra/newview/skins/default/xui/en/floater_fs_poser.xml b/indra/newview/skins/default/xui/en/floater_fs_poser.xml
index 8d2bad9879..d7cb8f1229 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_poser.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_poser.xml
@@ -256,410 +256,410 @@ width="403">
 
 <!-- The layout is a vertical stack of 3 rows, and each row a horizontal stack of panels -->
 	<layout_stack
-	follows="top|left|right"
-	height="425"
-	layout="topleft"
-	left="3"
-	border_size="-4"
-	close_time_constant="0.02"
-	open_time_constant="0.02"
-	mouse_opaque="false"
-	name="poser_stack"
-	orientation="vertical"
-	top="0"
-	width="607">
+	 follows="top|left|right"
+	 height="425"
+	 layout="topleft"
+	 left="3"
+	 border_size="-4"
+	 close_time_constant="0.02"
+	 open_time_constant="0.02"
+	 mouse_opaque="false"
+	 name="poser_stack"
+	 orientation="vertical"
+	 top="0"
+	 width="607">
 		<layout_panel
-		follows="top|left"
-		layout="topleft"
-		auto_resize="false"
-		visible="true"
-		name="regular_controls_layout"
-		height="290"
-		width="607">
+		 follows="top|left"
+		 layout="topleft"
+		 auto_resize="false"
+		 name="regular_controls_layout"
+		 height="290"
+		 width="607">
 			<panel
-			follows="left"
-			height="290"
-			background_visible="false"
-			layout="topleft"
-			enabled="true"
-			mouse_opaque="false"
-			name="joints_parent_panel"
-			top="0"
-			left="0"
-			width="235">
+			 follows="left"
+			 height="290"
+			 background_visible="false"
+			 layout="topleft"
+			 mouse_opaque="false"
+			 name="joints_parent_panel"
+			 top="0"
+			 left="0"
+			 width="235">
 				<tab_container
-					follows="all"
-					halign="center"
-					height="285"
-					layout="topleft"
-					left="0"
-					enabled="true"
-					name="joints_tabs"
-					tab_height="20"
-					tab_width="55"
-					tab_group="1"
-					tab_position="left"
-					top="0"
-					width="235">
+				 follows="all"
+				 halign="center"
+				 height="285"
+				 layout="topleft"
+				 left="0"
+				 name="joints_tabs"
+				 tab_height="20"
+				 tab_width="55"
+				 tab_group="1"
+				 tab_position="left"
+				 top="0"
+				 width="235">
 					<panel
-					follows="all"
-					background_visible="false"
-					height="302"
-					layout="topleft"
-					title="Move"
-					name="positionRotation_panel"
-					top="0"
-					width="235">
+					 follows="all"
+					 background_visible="false"
+					 height="302"
+					 layout="topleft"
+					 title="Move"
+					 name="positionRotation_panel"
+					 top="0"
+					 width="235">
 						<panel
-						follows="all"
-						height="302"
-						background_visible="false"
-						layout="topleft"
-						mouse_opaque="false"
-						left="5"
-						name="title"
-						top="0"
-						width="235">
+						 follows="all"
+						 height="302"
+						 background_visible="false"
+						 layout="topleft"
+						 mouse_opaque="false"
+						 left="5"
+						 name="title"
+						 top="0"
+						 width="235">
 							<text follows="left|top"
-								name="av_position_updown_label"
-								height="10"
-								layout="topleft"
-								left_delta="0"
-								top_pad="5"
-								width="172">Up/Down:</text>
-							<slider decimal_digits="2"
-								follows="left|top"
-								height="16"
-								increment="0.01"
-								initial_value="0"
-								layout="topleft"
-								left_delta="5"
-								min_val="-1.5"
-								max_val="1.5"
-								name="av_position_updown"
-								top_pad="5"
-								width="172"
-								tool_tip="Move the selected avatar up or down"
-								can_edit_text="true">
+							 name="av_position_updown_label"
+							 height="10"
+							 layout="topleft"
+							 left_delta="0"
+							 top_pad="5"
+							 width="172">
+								Up/Down:
+							</text>
+							<slider
+							 decimal_digits="2"
+							 follows="left|top"
+							 height="16"
+							 increment="0.01"
+							 initial_value="0"
+							 layout="topleft"
+							 left_delta="5"
+							 min_val="-1.5"
+							 max_val="1.5"
+							 name="av_position_updown"
+							 top_pad="5"
+							 width="172"
+							 tool_tip="Move the selected avatar up or down"
+							 can_edit_text="true">
 								<slider.commit_callback
-								function="Poser.PositionSet"/>
+								 function="Poser.PositionSet"/>
 							</slider>
-							<text follows="left|top"
-								name="av_position_leftright_label"
-								height="10"
-								layout="topleft"
-								left_delta="-5"
-								top_pad="5"
-								width="172">Left/Right:</text>
-							<slider decimal_digits="2"
-								follows="left|top"
-								height="16"
-								increment="0.01"
-								initial_value="0"
-								layout="topleft"
-								left_delta="5"
-								min_val="-1.5"
-								max_val="1.5"
-								name="av_position_leftright"
-								top_pad="5"
-								width="172"
-								tool_tip="Move the selected avatar left or right"
-								can_edit_text="true">
+							<text
+							 follows="left|top"
+							 name="av_position_leftright_label"
+							 height="10"
+							 layout="topleft"
+							 left_delta="-5"
+							 top_pad="5"
+							 width="172">
+								Left/Right:
+							</text>
+							<slider
+							 decimal_digits="2"
+							 follows="left|top"
+							 height="16"
+							 increment="0.01"
+							 initial_value="0"
+							 layout="topleft"
+							 left_delta="5"
+							 min_val="-1.5"
+							 max_val="1.5"
+							 name="av_position_leftright"
+							 top_pad="5"
+							 width="172"
+							 tool_tip="Move the selected avatar left or right"
+							 can_edit_text="true">
 								<slider.commit_callback
-								function="Poser.PositionSet"/>
+								 function="Poser.PositionSet"/>
 							</slider>
-							<text follows="left|top"
-								name="av_position_inout_label"
-								height="10"
-								layout="topleft"
-								left_delta="-5"
-								top_pad="5"
-								width="172">In/Out:</text>
-							<slider decimal_digits="2"
-								follows="left|top"
-								height="16"
-								increment="0.01"
-								initial_value="0"
-								layout="topleft"
-								left_delta="5"
-								min_val="-1.5"
-								max_val="1.5"
-								name="av_position_inout"
-								top_pad="5"
-								width="172"
-								tool_tip="Move the selected avatar in or out"
-								can_edit_text="true">
+							<text
+							 follows="left|top"
+							 name="av_position_inout_label"
+							 height="10"
+							 layout="topleft"
+							 left_delta="-5"
+							 top_pad="5"
+							 width="172">
+								In/Out:
+							</text>
+							<slider
+							 decimal_digits="2"
+							 follows="left|top"
+							 height="16"
+							 increment="0.01"
+							 initial_value="0"
+							 layout="topleft"
+							 left_delta="5"
+							 min_val="-1.5"
+							 max_val="1.5"
+							 name="av_position_inout"
+							 top_pad="5"
+							 width="172"
+							 tool_tip="Move the selected avatar in or out"
+							 can_edit_text="true">
 								<slider.commit_callback
-								function="Poser.PositionSet"/>
+								 function="Poser.PositionSet"/>
 							</slider>
 							<!-- so this panel behaves like the others in the code behind, it has an invisible list... -->
 							<scroll_list
-								visible="false"
-								column_padding="2"
-								draw_heading="true"
-								height="300"
-								follows="all"
-								can_sort="false"
-								layout="topleft"
-								left="2"
-								width="479"
-								multi_select="true"
-								name="entireAv_joint_scroll"
-								top="0">
+							 visible="false"
+							 column_padding="2"
+							 height="300"
+							 follows="all"
+							 can_sort="false"
+							 layout="topleft"
+							 left="2"
+							 width="479"
+							 multi_select="true"
+							 name="entireAv_joint_scroll"
+							 top="0">
 								<scroll_list.columns
-								label=""
-								name="icon"
-								relative_width="0.1"  />
+								 label=""
+								 name="icon"
+								 relative_width="0.1"/>
 								<scroll_list.columns
-								label="Body Part"
-								name="joint"
-								relative_width="0.9"  />
+								 label="Body Part"
+								 name="joint"
+								 relative_width="0.9"/>
 							</scroll_list>
 						</panel>
 					</panel>
 					<panel
-					follows="all"
-					background_visible="false"
-					height="299"
-					layout="topleft"
-					left="0"
-					title="Body"
-					name="body_joints_panel"
-					top="0"
-					width="481">
+					 follows="all"
+					 background_visible="false"
+					 height="299"
+					 layout="topleft"
+					 left="0"
+					 title="Body"
+					 name="body_joints_panel"
+					 top="0"
+					 width="481">
 						<scroll_list
-						column_padding="2"
-						draw_heading="true"
-						height="300"
-						follows="all"
-						can_sort="false"
-						layout="topleft"
-						left="2"
-						width="479"
-						multi_select="true"
-						name="body_joints_scroll"
-						top="0">
+						 column_padding="2"
+						 height="300"
+						 follows="all"
+						 can_sort="false"
+						 layout="topleft"
+						 left="2"
+						 width="479"
+						 multi_select="true"
+						 name="body_joints_scroll"
+						 top="0">
 							<scroll_list.columns
-							label=""
-							name="icon"
-							relative_width="0.1"  />
+							 label=""
+							 name="icon"
+							 relative_width="0.1"/>
 							<scroll_list.columns
-							label="Body Part"
-							name="joint"
-							relative_width="0.9"  />
+							 label="Body Part"
+							 name="joint"
+							 relative_width="0.9"/>
 						</scroll_list>
 					</panel>
 					<panel
-					follows="all"
-					background_visible="false"
-					height="299"
-					layout="topleft"
-					left="0"
-					title="Face"
-					name="face_joints_panel"
-					top="0"
-					width="481">
+					 follows="all"
+					 background_visible="false"
+					 height="299"
+					 layout="topleft"
+					 left="0"
+					 title="Face"
+					 name="face_joints_panel"
+					 top="0"
+					 width="481">
 						<scroll_list
-						column_padding="2"
-						draw_heading="true"
-						height="300"
-						follows="all"
-						can_sort="false"
-						layout="topleft"
-						left="2"
-						width="479"
-						multi_select="true"
-						name="face_joints_scroll"
-						top="0">
+						 column_padding="2"
+						 height="300"
+						 follows="all"
+						 can_sort="false"
+						 layout="topleft"
+						 left="2"
+						 width="479"
+						 multi_select="true"
+						 name="face_joints_scroll"
+						 top="0">
 							<scroll_list.columns
-							label=""
-							name="icon"
-							relative_width="0.1"  />
+							 label=""
+							 name="icon"
+							 relative_width="0.1"/>
 							<scroll_list.columns
-							label="Body Part"
-							name="joint"
-							relative_width="0.9"  />
+							 label="Body Part"
+							 name="joint"
+							 relative_width="0.9"/>
 						</scroll_list>
 					</panel>
 					<tab_container
-					follows="all"
-					halign="center"
-					height="285"
-					layout="topleft"
-					left="0"
-					enabled="true"
-					title="Hands"
-					name="hands_tabs"
-					tab_height="20"
-					tab_width="50"
-					tab_group="1"
-					tab_position="top"
-					top="0"
-					width="235">
+					 follows="all"
+					 halign="center"
+					 height="285"
+					 layout="topleft"
+					 left="0"
+					 title="Hands"
+					 name="hands_tabs"
+					 tab_height="20"
+					 tab_width="50"
+					 tab_group="1"
+					 tab_position="top"
+					 top="0"
+					 width="235">
 						<panel
-						follows="all"
-						background_visible="false"
-						height="299"
-						layout="topleft"
-						left="0"
-						title="Adjust"
-						name="hands_joints_panel"
-						top="0"
-						width="481">
+						 follows="all"
+						 background_visible="false"
+						 height="299"
+						 layout="topleft"
+						 left="0"
+						 title="Adjust"
+						 name="hands_joints_panel"
+						 top="0"
+						 width="481">
 							<scroll_list
-							column_padding="2"
-							draw_heading="true"
-							height="300"
-							follows="all"
-							can_sort="false"
-							layout="topleft"
-							left="2"
-							width="479"
-							multi_select="true"
-							name="hand_joints_scroll"
-							top="0">
+							 column_padding="2"
+							 height="300"
+							 follows="all"
+							 can_sort="false"
+							 layout="topleft"
+							 left="2"
+							 width="479"
+							 multi_select="true"
+							 name="hand_joints_scroll"
+							 top="0">
 								<scroll_list.columns
-								label=""
-								name="icon"
-								relative_width="0.1"  />
+								 label=""
+								 name="icon"
+								 relative_width="0.1"/>
 								<scroll_list.columns
-								label="Body Part"
-								name="joint"
-								relative_width="0.9"  />
+								 label="Body Part"
+								 name="joint"
+								 relative_width="0.9"/>
 							</scroll_list>
 						</panel>
 						<panel
-						follows="all"
-						background_visible="false"
-						height="299"
-						layout="topleft"
-						left="0"
-						title="Presets"
-						name="hands_presets_panel"
-						top="0"
-						width="481">
+						 follows="all"
+						 background_visible="false"
+						 height="299"
+						 layout="topleft"
+						 left="0"
+						 title="Presets"
+						 name="hands_presets_panel"
+						 top="0"
+						 width="481">
 							<scroll_list
-							column_padding="2"
-							draw_heading="true"
-							height="275"
-							follows="all"
-							can_sort="false"
-							layout="topleft"
-							left="2"
-							width="479"
-							multi_select="false"
-							name="hand_presets_scroll"
-							top="0">
+							 column_padding="2"
+							 height="275"
+							 follows="all"
+							 can_sort="false"
+							 layout="topleft"
+							 left="2"
+							 width="479"
+							 multi_select="false"
+							 name="hand_presets_scroll"
+							 top="0">
 								<scroll_list.columns
-								label="Preset Name"
-								name="name"
-								relative_width="0.9"  />
+								 label="Preset Name"
+								 name="name"
+								 relative_width="0.9"/>
 							</scroll_list>
 							<button
-							follows="top|left"
-							height="21"
-							layout="topleft"
-							label="Set Left"
-							name="button_loadHandPoseLeft"
-							tool_tip="Double click to set your left hand to the selected preset"
-							top_delta="238"
-							left_pad="1"
-							left="2"
-							width="88" >
+							 follows="top|left"
+							 height="21"
+							 layout="topleft"
+							 label="Set Left"
+							 name="button_loadHandPoseLeft"
+							 tool_tip="Double click to set your left hand to the selected preset"
+							 top_delta="238"
+							 left_pad="1"
+							 left="2"
+							 width="88" >
 								<button.commit_callback
-								function="Poser.LoadLeftHand"/>
+								 function="Poser.LoadLeftHand"/>
 							</button>
 							<button
-							follows="left|top"
-							height="21"
-							layout="topleft"
-							label="Set Right"
-							name="button_loadHandPoseRight"
-							tool_tip="Double click to set your right hand to the selected preset"
-							left_pad="1"
-							top_delta="0"
-							width="88" >
+							 follows="left|top"
+							 height="21"
+							 layout="topleft"
+							 label="Set Right"
+							 name="button_loadHandPoseRight"
+							 tool_tip="Double click to set your right hand to the selected preset"
+							 left_pad="1"
+							 top_delta="0"
+							 width="88" >
 								<button.commit_callback
-								function="Poser.LoadRightHand"/>
+								 function="Poser.LoadRightHand"/>
 							</button>
 						</panel>
 					</tab_container>
 					<panel
-					follows="all"
-					background_visible="false"
-					height="299"
-					layout="topleft"
-					left="0"
-					title="Misc"
-					name="misc_joints_panel"
-					top="0"
-					width="481">
+					 follows="all"
+					 background_visible="false"
+					 height="299"
+					 layout="topleft"
+					 left="0"
+					 title="Misc"
+					 name="misc_joints_panel"
+					 top="0"
+					 width="481">
 						<scroll_list
-						column_padding="2"
-						draw_heading="true"
-						height="300"
-						follows="all"
-						can_sort="false"
-						layout="topleft"
-						left="2"
-						width="479"
-						multi_select="true"
-						name="misc_joints_scroll"
-						top="0">
+						 column_padding="2"
+						 height="300"
+						 follows="all"
+						 can_sort="false"
+						 layout="topleft"
+						 left="2"
+						 width="479"
+						 multi_select="true"
+						 name="misc_joints_scroll"
+						 top="0">
 							<scroll_list.columns
-							label=""
-							name="icon"
-							relative_width="0.1"  />
+							 label=""
+							 name="icon"
+							 relative_width="0.1"/>
 							<scroll_list.columns
-							label="Body Part"
-							name="joint"
-							relative_width="0.9"  />
+							 label="Body Part"
+							 name="joint"
+							 relative_width="0.9"/>
 						</scroll_list>
 					</panel>
 					<panel
-					follows="all"
-					background_visible="false"
-					height="299"
-					layout="topleft"
-					left="0"
-					title="Physics"
-					name="collision_volumes_panel"
-					top="0"
-					width="481">
+					 follows="all"
+					 background_visible="false"
+					 height="299"
+					 layout="topleft"
+					 left="0"
+					 title="Physics"
+					 name="collision_volumes_panel"
+					 top="0"
+					 width="481">
 						<scroll_list
-						column_padding="2"
-						draw_heading="true"
-						height="300"
-						follows="all"
-						can_sort="false"
-						layout="topleft"
-						left="2"
-						width="479"
-						multi_select="true"
-						name="collision_volumes_scroll"
-						top="0">
+						 column_padding="2"
+						 height="300"
+						 follows="all"
+						 can_sort="false"
+						 layout="topleft"
+						 left="2"
+						 width="479"
+						 multi_select="true"
+						 name="collision_volumes_scroll"
+						 top="0">
 							<scroll_list.columns
-							label=""
-							name="icon"
-							relative_width="0.1"  />
+							 label=""
+							 name="icon"
+							 relative_width="0.1"/>
 							<scroll_list.columns
-							label="Physics"
-							name="joint"
-							relative_width="0.9"  />
+							 label="Physics"
+							 name="joint"
+							 relative_width="0.9"/>
 						</scroll_list>
 					</panel>
 					<panel
-					follows="left|top|bottom"
-					height="302"
-					background_visible="false"
-					layout="topleft"
-					visible="true"
-					title="Model"
-					mouse_opaque="false"
-					name="avatarSelection_panel"
-					top="0"
-					left="0"
-					width="153">
+					 follows="all"
+					 height="302"
+					 background_visible="false"
+					 layout="topleft"
+					 visible="true"
+					 title="Model"
+					 mouse_opaque="false"
+					 name="avatarSelection_panel"
+					 top="0"
+					 left="0"
+					 width="153">
 						<avatar_list
 						 allow_select="true"
 						 follows="all"
@@ -671,858 +671,849 @@ width="403">
 						 show_permissions_granted="true"
 						 width="317" />
 						<scroll_list
-						column_padding="0"
-						draw_heading="true"
-						height="160"
-						can_sort="false"
-						follows="all"
-						layout="topleft"
-						left="3"
-						tool_tip="Select the Avatar or Animesh you want to animate."
-						width="151"
-						multi_select="false"
-						name="avatarSelection_scroll"
-						top="0">
+						 column_padding="0"
+						 height="160"
+						 can_sort="false"
+						 follows="all"
+						 layout="topleft"
+						 left="3"
+						 tool_tip="Select the Avatar or Animesh you want to animate."
+						 width="151"
+						 multi_select="false"
+						 name="avatarSelection_scroll"
+						 top="0">
 							<scroll_list.columns
-							label=""
-							name="icon"
-							relative_width="0.0"  />
+							 label=""
+							 name="icon"
+							 relative_width="0.0"/>
 							<scroll_list.columns
-							label="Select Someone to Pose..."
-							name="name"
-							relative_width="1.0"  />
+							 label="Select Someone to Pose..."
+							 name="name"
+							 relative_width="1.0"/>
 							<scroll_list.columns
-							label="UUID"
-							name="uuid"
-							relative_width="0.0"  />
+							 label="UUID"
+							 name="uuid"
+							 relative_width="0.0"/>
 							<scroll_list.columns
-							label="SaveFileName"
-							name="saveFileName"
-							relative_width="0.0"  />
+							 label="SaveFileName"
+							 name="saveFileName"
+							 relative_width="0.0"/>
 						</scroll_list>
 						<button
-							height="21"
-							follows="top|left"
-							layout="topleft"
-							label=""
-							image_overlay="Refresh_Off"
-							image_unselected="Toolbar_Middle_Off"
-							name="refresh_avatars"
-							tool_tip="Refresh the list of avatars and animeshes"
-							width="20"
-							top="142"
-							left="3">
-								<button.commit_callback
-								function="Poser.RefreshAvatars"/>
+						 height="21"
+						 follows="top|left"
+						 layout="topleft"
+						 label=""
+						 image_overlay="Refresh_Off"
+						 image_unselected="Toolbar_Middle_Off"
+						 name="refresh_avatars"
+						 tool_tip="Refresh the list of avatars and animeshes"
+						 width="20"
+						 top="142"
+						 left="3">
+							<button.commit_callback
+							 function="Poser.RefreshAvatars"/>
 						</button>
 						<button
-							height="21"
-							follows="top|left"
-							enabled="false"
-							is_toggle="true"
-							label="Start Posing"
-							top_delta="0"
-							left_pad="2"
-							label_selected="Stop Posing"
-							image_hover_unselected="Toolbar_Middle_Over"
-							image_selected="Toolbar_Middle_Selected"
-							image_unselected="Toolbar_Middle_Off"
-							button_flash_enable="true"
-							flash_color="0.7 0.7 1 1"
-							button_flash_count="64"
-							button_flash_rate="0.5"
-							tool_tip="Start posing the selected avatar or animesh, if you are allowed to"
-							name="start_stop_posing_button"
-							width="150">
-								<button.commit_callback
-								function="Poser.StartStopAnimating"/>
+						 height="21"
+						 follows="top|left"
+						 enabled="false"
+						 is_toggle="true"
+						 label="Start Posing"
+						 top_delta="0"
+						 left_pad="2"
+						 label_selected="Stop Posing"
+						 image_hover_unselected="Toolbar_Middle_Over"
+						 image_selected="Toolbar_Middle_Selected"
+						 image_unselected="Toolbar_Middle_Off"
+						 button_flash_enable="true"
+						 flash_color="0.7 0.7 1 1"
+						 button_flash_count="64"
+						 button_flash_rate="0.5"
+						 tool_tip="Start posing the selected avatar or animesh, if you are allowed to"
+						 name="start_stop_posing_button"
+						 width="150">
+							<button.commit_callback
+							 function="Poser.StartStopAnimating"/>
 						</button>
 						<button
-							height="21"
-							follows="top|left"
-							layout="topleft"
-							left="3"
-							top_pad="1"
-							label="Set to T-Pose"
-							image_unselected="Toolbar_Middle_Off"
-							name="set_t_pose_button"
-							tool_tip="Double-click to set the selected avatar to a 'T-Pose'"
-							width="172">
-								<button.commit_callback
-								function="Poser.SetToTPose"/>
+						 height="21"
+						 follows="top|left"
+						 layout="topleft"
+						 left="3"
+						 top_pad="1"
+						 label="Set to T-Pose"
+						 image_unselected="Toolbar_Middle_Off"
+						 name="set_t_pose_button"
+						 tool_tip="Double-click to set the selected avatar to a 'T-Pose'"
+						 width="172">
+							<button.commit_callback
+							 function="Poser.SetToTPose"/>
 						</button>
 					</panel>
 					<panel
-					follows="all"
-					background_visible="false"
-					height="299"
-					layout="topleft"
-					left="0"
-					title="Settings"
-					name="settings_panel"
-					top="0"
-					width="481">
-						<text follows="left|top"
-							name="trackpad_sensitivity_label"
-							height="10"
-							layout="topleft"
-							left_delta="3"
-							top_pad="2"
-							width="200">Trackpad Sensitivity:</text>
+					 follows="all"
+					 background_visible="false"
+					 height="299"
+					 layout="topleft"
+					 left="0"
+					 title="Settings"
+					 name="settings_panel"
+					 top="0"
+					 width="481">
+						<text
+						 follows="left|top"
+						 name="trackpad_sensitivity_label"
+						 height="10"
+						 layout="topleft"
+						 left_delta="3"
+						 top_pad="2"
+						 width="200">
+							Trackpad Sensitivity:
+						</text>
 						<slider
-						decimal_digits="2"
-						can_edit_text="true"
-						follows="left|top"
-						height="14"
-						increment="0.01"
-						initial_value="0"
-						layout="topleft"
-						left_delta="0"
-						max_val="2"
-						min_val="0.01"
-						name="trackpad_sensitivity_slider"
-						tool_tip="Adjusts the sensitivity of the trackball"
-						top_pad="3"
-						logarithmic="1"
-						width="170" >
+						 decimal_digits="2"
+						 can_edit_text="true"
+						 follows="left|top"
+						 height="14"
+						 increment="0.01"
+						 initial_value="0"
+						 layout="topleft"
+						 left_delta="0"
+						 max_val="2"
+						 min_val="0.01"
+						 name="trackpad_sensitivity_slider"
+						 tool_tip="Adjusts the sensitivity of the trackball"
+						 top_pad="3"
+						 width="170" >
 							<slider.commit_callback
-							function="Poser.AdjustTrackPadSensitivity"
-							parameter="2"/>
+							 function="Poser.AdjustTrackPadSensitivity"/>
 						</slider>
 						<check_box
-							name="stop_posing_on_close_checkbox"
-							height="16"
-							label="Stop posing when closed"
-							follows="left|top"
-							left="5"
-							tool_tip="Not stopping you pose can be helpful if you do a lot of work, and don't want to accidentally lose it."
-							top_pad="5"
-							width="134" />
+						 control_name="FSPoserStopPosingWhenClosed"
+						 name="stop_posing_on_close_checkbox"
+						 height="16"
+						 label="Stop posing when closed"
+						 follows="left|top"
+						 left="5"
+						 tool_tip="Not stopping you pose can be helpful if you do a lot of work, and don't want to accidentally lose it."
+						 top_pad="5"
+						 width="134" />
 					</panel>
 				</tab_container>
 			</panel>
 			<panel
-			follows="left|top|bottom"
-			height="290"
-			background_visible="false"
-			layout="topleft"
-			mouse_opaque="false"
-			name="trackball_panel"
-			enabled="false"
-			top="0"
-			width="160"
-			left_pad="2">
-				<text follows="top|left"
-					font="SansSerifBold"
-					height="10"
-					layout="topleft"
-					name="rotation_label"
-					left="5"
-					top="2"
-					width="105">Rotation:</text>
-				<fs_virtual_trackpad name="limb_rotation"
-									follows="left|top"
-									left_delta="0"
-									top_delta="15"
-									height="153"
-									width="153"
-									tool_tip="Change the rotation of the currently selected body part(s). Hold Ctrl to move slow. Roll the wheel to adjust the 3rd axis. Use Shift or Alt to swap which rotations change"
-									pinch_mode="false"
-									infinite_scroll_mode="true"/>
+			 follows="left|top|bottom"
+			 height="290"
+			 background_visible="false"
+			 layout="topleft"
+			 mouse_opaque="false"
+			 name="trackball_panel"
+			 enabled="false"
+			 top="0"
+			 width="160"
+			 left_pad="2">
+				<text
+				 follows="top|left"
+				 font="SansSerifBold"
+				 height="10"
+				 layout="topleft"
+				 name="rotation_label"
+				 left="5"
+				 top="2"
+				 width="105">
+					Rotation:
+				</text>
+				<fs_virtual_trackpad
+				 name="limb_rotation"
+				 follows="left|top"
+				 left_delta="0"
+				 top_delta="15"
+				 height="153"
+				 width="153"
+				 tool_tip="Change the rotation of the currently selected body part(s). Hold Ctrl to move slow. Roll the wheel to adjust the 3rd axis. Use Shift or Alt to swap which rotations change"
+				 pinch_mode="false"
+				 infinite_scroll_mode="true"/>
 				<panel
-				follows="left|top|bottom"
-				height="22"
-				background_visible="false"
-				layout="topleft"
-				visible="true"
-				mouse_opaque="false"
-				left="0"
-				top_pad="2"
-				name="trackball_button_panel"
-				width="232">
+				 follows="left|top|bottom"
+				 height="22"
+				 background_visible="false"
+				 layout="topleft"
+				 mouse_opaque="false"
+				 left="0"
+				 top_pad="2"
+				 name="trackball_button_panel"
+				 width="232">
 					<button
-					height="21"
-					follows="top|left"
-					layout="topleft"
-					label=""
-					image_overlay="Script_Undo"
-					image_unselected="Toolbar_Middle_Off"
-					name="undo_change"
-					tool_tip="Undo the last rotation change"
-					width="18"
-					top_pad="0"
-					left="4">
+					 height="21"
+					 follows="top|left"
+					 layout="topleft"
+					 image_overlay="Script_Undo"
+					 image_unselected="Toolbar_Middle_Off"
+					 name="undo_change"
+					 tool_tip="Undo the last rotation change"
+					 width="18"
+					 top_pad="0"
+					 left="4">
 						<button.commit_callback
-						function="Poser.UndoLastRotation"/>
+						 function="Poser.UndoLastRotation"/>
 					</button>
 					<button
-					height="21"
-					follows="top|left"
-					layout="topleft"
-					label=""
-					image_overlay="Script_Redo"
-					image_unselected="Toolbar_Middle_Off"
-					name="button_redo_change"
-					tool_tip="Re-do the last Undo change"
-					enabled="false"
-					width="18"
-					top_delta="0"
-					left_pad="1">
+					 height="21"
+					 follows="top|left"
+					 layout="topleft"
+					 image_overlay="Script_Redo"
+					 image_unselected="Toolbar_Middle_Off"
+					 name="button_redo_change"
+					 tool_tip="Re-do the last Undo change"
+					 enabled="false"
+					 width="18"
+					 top_delta="0"
+					 left_pad="1">
 						<button.commit_callback
-						function="Poser.RedoLastRotation"/>
+						 function="Poser.RedoLastRotation"/>
 					</button>
 					<button
-					height="21"
-					follows="top|left"
-					layout="topleft"
-					label=""
-					image_overlay="Inv_TrashOpen"
-					image_unselected="Toolbar_Middle_Off"
-					name="refresh_avatars"
-					tool_tip="Double click to reset all selected body parts to when you first started posing"
-					width="18"
-					top_delta="0"
-					left_pad="1">
+					 height="21"
+					 follows="top|left"
+					 layout="topleft"
+					 image_overlay="Inv_TrashOpen"
+					 image_unselected="Toolbar_Middle_Off"
+					 name="refresh_avatars"
+					 tool_tip="Double click to reset all selected body parts to when you first started posing"
+					 width="18"
+					 top_delta="0"
+					 left_pad="1">
 						<button.commit_callback
-						function="Poser.PoseJointsReset"/>
+						 function="Poser.PoseJointsReset"/>
 					</button>
 					<button
-					height="21"
-					follows="top|left"
-					layout="topleft"
-					is_toggle="true"
-					label=""
-					image_overlay="Inv_Mesh"
-					image_unselected="Toolbar_Middle_Off"
-					name="delta_mode_toggle"
-					tool_tip="If changing multiple joints each changes by the same amount, rather than all of them getting the same rotation."
-					width="18"
-					top_delta="0"
-					left_pad="1">
+					 height="21"
+					 follows="top|left"
+					 layout="topleft"
+					 is_toggle="true"
+					 image_overlay="Inv_Mesh"
+					 image_unselected="Toolbar_Middle_Off"
+					 name="delta_mode_toggle"
+					 tool_tip="If changing multiple joints each changes by the same amount, rather than all of them getting the same rotation."
+					 width="18"
+					 top_delta="0"
+					 left_pad="1">
 						<button.commit_callback
-						function="Poser.ToggleDeltaModeChanges"/>
+						 function="Poser.ToggleDeltaModeChanges"/>
 					</button>
 					<button
-					follows="left|top"
-					height="21"
-					is_toggle="true"
-					layout="topleft"
-					label="Mirr."
-					image_hover_unselected="Toolbar_Middle_Over"
-					image_selected="Toolbar_Middle_Selected"
-					image_unselected="Toolbar_Middle_Off"
-					button_flash_enable="true"
-					flash_color="0.7 0.7 1 1"
-					button_flash_count="64"
-					button_flash_rate="0.5"
-					name="button_toggleMirrorRotation"
-					tool_tip="Change the opposite joint, like in a mirror."
-					left_pad="1"
-					top_delta="0"
-					width="38" >
+					 follows="left|top"
+					 height="21"
+					 is_toggle="true"
+					 layout="topleft"
+					 label="Mirr."
+					 image_hover_unselected="Toolbar_Middle_Over"
+					 image_selected="Toolbar_Middle_Selected"
+					 image_unselected="Toolbar_Middle_Off"
+					 button_flash_enable="true"
+					 flash_color="0.7 0.7 1 1"
+					 button_flash_count="64"
+					 button_flash_rate="0.5"
+					 name="button_toggleMirrorRotation"
+					 tool_tip="Change the opposite joint, like in a mirror."
+					 left_pad="1"
+					 top_delta="0"
+					 width="38" >
 						<button.commit_callback
-						function="Poser.ToggleMirrorChanges"/>
+						 function="Poser.ToggleMirrorChanges"/>
 					</button>
 					<button
-					follows="left|top"
-					height="21"
-					is_toggle="true"
-					layout="topleft"
-					label="Sym."
-					image_hover_unselected="Toolbar_Middle_Over"
-					image_selected="Toolbar_Middle_Selected"
-					image_unselected="Toolbar_Middle_Off"
-					button_flash_enable="true"
-					flash_color="0.7 0.7 1 1"
-					button_flash_count="64"
-					button_flash_rate="0.5"
-					name="button_toggleSympatheticRotation"
-					tool_tip="Change the opposite joint, but in the same way."
-					left_pad="1"
-					top_delta="0"
-					width="38" >
+					 follows="left|top"
+					 height="21"
+					 is_toggle="true"
+					 layout="topleft"
+					 label="Sym."
+					 image_hover_unselected="Toolbar_Middle_Over"
+					 image_selected="Toolbar_Middle_Selected"
+					 image_unselected="Toolbar_Middle_Off"
+					 button_flash_enable="true"
+					 flash_color="0.7 0.7 1 1"
+					 button_flash_count="64"
+					 button_flash_rate="0.5"
+					 name="button_toggleSympatheticRotation"
+					 tool_tip="Change the opposite joint, but in the same way."
+					 left_pad="1"
+					 top_delta="0"
+					 width="38" >
 						<button.commit_callback
-						function="Poser.ToggleSympatheticChanges"/>
+						 function="Poser.ToggleSympatheticChanges"/>
 					</button>
 				</panel>
-				<text follows="left|top"
-					name="limb_pitch_label"
-					height="10"
-					layout="topleft"
-					left_delta="0"
-					top_pad="2"
-					width="200">Up/Down:</text>
-				<slider decimal_digits="1"
-					follows="left|top"
-					height="16"
-					increment="0.1"
-					initial_value="0"
-					layout="topleft"
-					left_delta="5"
-					min_val="-180"
-					max_val="180"
-					name="limb_pitch"
-					top_pad="2"
-					width="150"
-					can_edit_text="true"/>
-				<text follows="left|top"
-					name="limb_yaw_label"
-					height="10"
-					layout="topleft"
-					left_delta="-5"
-					top_pad="0"
-					width="200">Left/Right:</text>
-				<slider decimal_digits="1"
-					follows="left|top"
-					height="16"
-					increment="0.1"
-					initial_value="0"
-					layout="topleft"
-					left_delta="5"
-					min_val="-180"
-					max_val="180"
-					name="limb_yaw"
-					top_pad="0"
-					width="150"
-					can_edit_text="true"/>
-				<text follows="left|top"
-					name="limb_roll_label"
-					height="10"
-					layout="topleft"
-					left_delta="-5"
-					top_pad="-1"
-					width="200">Roll:</text>
-				<slider decimal_digits="1"
-					follows="left|top"
-					height="16"
-					increment="0.1"
-					initial_value="0"
-					layout="topleft"
-					left_delta="5"
-					min_val="-180"
-					max_val="180"
-					name="limb_roll"
-					top_pad="-1"
-					width="150"
-					can_edit_text="true"/>
+				<text
+				 follows="left|top"
+				 name="limb_pitch_label"
+				 height="10"
+				 layout="topleft"
+				 left_delta="0"
+				 top_pad="2"
+				 width="200">
+					Up/Down:
+				</text>
+				<slider
+				 decimal_digits="1"
+				 follows="left|top"
+				 height="16"
+				 increment="0.1"
+				 initial_value="0"
+				 layout="topleft"
+				 left_delta="5"
+				 min_val="-180"
+				 max_val="180"
+				 name="limb_pitch"
+				 top_pad="2"
+				 width="150"
+				 can_edit_text="true"/>
+				<text
+				 follows="left|top"
+				 name="limb_yaw_label"
+				 height="10"
+				 layout="topleft"
+				 left_delta="-5"
+				 top_pad="0"
+				 width="200">
+					Left/Right:
+				</text>
+				<slider
+				 decimal_digits="1"
+				 follows="left|top"
+				 height="16"
+				 increment="0.1"
+				 initial_value="0"
+				 layout="topleft"
+				 left_delta="5"
+				 min_val="-180"
+				 max_val="180"
+				 name="limb_yaw"
+				 top_pad="0"
+				 width="150"
+				 can_edit_text="true"/>
+				<text
+				 follows="left|top"
+				 name="limb_roll_label"
+				 height="10"
+				 layout="topleft"
+				 left_delta="-5"
+				 top_pad="-1"
+				 width="200">
+					Roll:
+				</text>
+				<slider
+				 decimal_digits="1"
+				 follows="left|top"
+				 height="16"
+				 increment="0.1"
+				 initial_value="0"
+				 layout="topleft"
+				 left_delta="5"
+				 min_val="-180"
+				 max_val="180"
+				 name="limb_roll"
+				 top_pad="-1"
+				 width="150"
+				 can_edit_text="true"/>
 			</panel>
 			<panel
-			follows="top|left|bottom"
-			height="290"
-			background_visible="false"
-			layout="topleft"
-			mouse_opaque="false"
-			left_pad="2"
-			visible="false"
-			name="poses_loadSave"
-			top="0"
-			width="225">
+			 follows="top|left|bottom"
+			 height="290"
+			 background_visible="false"
+			 layout="topleft"
+			 mouse_opaque="false"
+			 left_pad="2"
+			 visible="false"
+			 name="poses_loadSave"
+			 top="0"
+			 width="225">
 				<scroll_list
-				column_padding="0"
-				draw_heading="true"
-				height="268"
-				follows="left|top|right"
-				layout="topleft"
-				tool_tip="Load a pose for who you are animating."
-				width="225"
-				multi_select="true"
-				name="poses_scroll"
-				top="0">
+				 column_padding="0"
+				 height="268"
+				 follows="left|top|right"
+				 layout="topleft"
+				 tool_tip="Load a pose for who you are animating."
+				 width="225"
+				 multi_select="true"
+				 name="poses_scroll"
+				 top="0">
 					<scroll_list.columns
-					label="Pose Name"
-					name="name"/>
+					 label="Pose Name"
+					 name="name"/>
 				</scroll_list>
 				<line_editor
-				follows="top|left"
-				layout="topleft"
-				height="21"
-				top_pad="-2"
-				commit_on_focus_lost="false"
-				label="Enter Pose Name To Save..."
-				enabled="true"
-				name="pose_save_name"
-				width="225"/>
+				 follows="top|left"
+				 layout="topleft"
+				 height="21"
+				 top_pad="-2"
+				 commit_on_focus_lost="false"
+				 label="Enter Pose Name To Save..."
+				 name="pose_save_name"
+				 width="225"/>
 			</panel>
 		</layout_panel>
 		<layout_panel
-		follows="top|left|right"
-		layout="topleft"
-		height="22"
-		auto_resize="false"
-		visible="true"
-		name="button_controls_layout"
-		width="800">
+		 follows="top|left|right"
+		 layout="topleft"
+		 height="22"
+		 auto_resize="false"
+		 name="button_controls_layout"
+		 width="800">
 			<panel
-			follows="left|top|bottom"
-			height="100"
-			background_visible="false"
-			layout="topleft"
-			visible="true"
-			mouse_opaque="false"
-			top="0"
-			left="0"
-			name="button_controls_panel"
-			width="800">
+			 follows="left|top|bottom"
+			 height="100"
+			 background_visible="false"
+			 layout="topleft"
+			 mouse_opaque="false"
+			 top="0"
+			 left="0"
+			 name="button_controls_panel"
+			 width="800">
 				<button
-				height="21"
-				follows="top|left"
-				layout="topleft"
-				enabled="true"
-				visible="true"
-				is_toggle="true"
-				image_overlay="Script_Config"
-				image_hover_unselected="Toolbar_Middle_Over"
-				image_selected="Toolbar_Middle_Selected"
-				image_unselected="Toolbar_Middle_Off"
-				name="toggleAdvancedPanel"
-				tool_tip="Toggle the Advanced Settings area"
-				width="20"
-				top_pad="-1"
-				left="2">
+				 height="21"
+				 follows="top|left"
+				 layout="topleft"
+				 is_toggle="true"
+				 image_overlay="Script_Config"
+				 image_hover_unselected="Toolbar_Middle_Over"
+				 image_selected="Toolbar_Middle_Selected"
+				 image_unselected="Toolbar_Middle_Off"
+				 name="toggleAdvancedPanel"
+				 tool_tip="Toggle the Advanced Settings area"
+				 width="20"
+				 top_pad="-1"
+				 left="2">
 					<button.commit_callback
-					function="Poser.ToggleAdvancedPanel"/>
+					 function="Poser.ToggleAdvancedPanel"/>
 				</button>
 				<panel
-				follows="left|top|bottom"
-				height="22"
-				background_visible="false"
-				layout="topleft"
-				visible="true"
-				mouse_opaque="false"
-				left_pad="0"
-				top_delta="0"
-				name="advbutton_spacer_panel"
-				width="36"/>
+				 follows="left|top|bottom"
+				 height="22"
+				 background_visible="false"
+				 layout="topleft"
+				 mouse_opaque="false"
+				 left_pad="0"
+				 top_delta="0"
+				 name="advbutton_spacer_panel"
+				 width="36"/>
 				<button
-				height="21"
-				follows="top|left"
-				layout="topleft"
-				enabled="false"
-				label=""
-				image_overlay="Inv_Physics"
-				image_unselected="Toolbar_Middle_Off"
-				name="FlipPose_avatar"
-				tool_tip="Flip the whole pose left/right"
-				width="21"
-				top_delta="0"
-				left_pad="1">
+				 height="21"
+				 follows="top|left"
+				 layout="topleft"
+				 enabled="false"
+				 image_overlay="Inv_Physics"
+				 image_unselected="Toolbar_Middle_Off"
+				 name="FlipPose_avatar"
+				 tool_tip="Flip the whole pose left/right"
+				 width="21"
+				 top_delta="0"
+				 left_pad="1">
 					<button.commit_callback
-					function="Poser.FlipPose"/>
+					 function="Poser.FlipPose"/>
 				</button>
 				<button
-				height="21"
-				follows="top|left"
-				layout="topleft"
-				enabled="false"
-				label=""
-				image_overlay="Edit_Flip_X"
-				image_unselected="Toolbar_Middle_Off"
-				name="FlipJoint_avatar"
-				tool_tip="Mirror the selected body part(s) left/right"
-				width="21"
-				top_delta="0"
-				left_pad="1">
+				 height="21"
+				 follows="top|left"
+				 layout="topleft"
+				 enabled="false"
+				 image_overlay="Edit_Flip_X"
+				 image_unselected="Toolbar_Middle_Off"
+				 name="FlipJoint_avatar"
+				 tool_tip="Mirror the selected body part(s) left/right"
+				 width="21"
+				 top_delta="0"
+				 left_pad="1">
 					<button.commit_callback
-					function="Poser.FlipJoint"/>
+					 function="Poser.FlipJoint"/>
 				</button>
 				<button
-				follows="left|top"
-				height="21"
-				layout="topleft"
-				enabled="false"
-				label="Recap"
-				image_hover_unselected="Toolbar_Middle_Over"
-				image_selected="Toolbar_Middle_Selected"
-				image_unselected="Toolbar_Middle_Off"
-				name="button_RecaptureParts"
-				left_pad="1"
-				top_delta="0"
-				tool_tip="If the selected body part(s) is/are OFF, this Recaptures what those body parts are doing right now. This button disables if you start from a T-Pose"
-				width="45" >
+				 follows="left|top"
+				 height="21"
+				 layout="topleft"
+				 enabled="false"
+				 label="Recap"
+				 image_hover_unselected="Toolbar_Middle_Over"
+				 image_selected="Toolbar_Middle_Selected"
+				 image_unselected="Toolbar_Middle_Off"
+				 name="button_RecaptureParts"
+				 left_pad="1"
+				 top_delta="0"
+				 tool_tip="If the selected body part(s) is/are OFF, this Recaptures what those body parts are doing right now. This button disables if you start from a T-Pose"
+				 width="45" >
 					<button.commit_callback
-					function="Poser.RecaptureSelectedBones"/>
+					 function="Poser.RecaptureSelectedBones"/>
 				</button>
 				<button
-				follows="left|top"
-				height="21"
-				layout="topleft"
-				enabled="false"
-				label="Part(s) On/Off"
-				image_hover_unselected="Toolbar_Middle_Over"
-				image_selected="Toolbar_Middle_Selected"
-				image_unselected="Toolbar_Middle_Off"
-				name="toggle_PosingSelectedBones"
-				left_pad="1"
-				top_delta="0"
-				tool_tip="Turn the Poser on or off for the selected body part(s). When off, that body part animates like normal (with your AO or a pose-ball/etc.)"
-				width="84" >
+				 follows="left|top"
+				 height="21"
+				 layout="topleft"
+				 enabled="false"
+				 label="Part(s) On/Off"
+				 image_hover_unselected="Toolbar_Middle_Over"
+				 image_selected="Toolbar_Middle_Selected"
+				 image_unselected="Toolbar_Middle_Off"
+				 name="toggle_PosingSelectedBones"
+				 left_pad="1"
+				 top_delta="0"
+				 tool_tip="Turn the Poser on or off for the selected body part(s). When off, that body part animates like normal (with your AO or a pose-ball/etc.)"
+				 width="84" >
 					<button.commit_callback
-					function="Poser.TogglePosingSelectedBones"/>
+					 function="Poser.TogglePosingSelectedBones"/>
 				</button>
 				<panel
-				follows="left|top|bottom"
-				height="22"
-				background_visible="false"
-				layout="topleft"
-				visible="true"
-				mouse_opaque="false"
-				left_pad="0"
-				top_delta="0"
-				name="button_spacer_panel"
-				width="58"/>
+				 follows="left|top|bottom"
+				 height="22"
+				 background_visible="false"
+				 layout="topleft"
+				 mouse_opaque="false"
+				 left_pad="0"
+				 top_delta="0"
+				 name="button_spacer_panel"
+				 width="58"/>
 				<button
-				follows="left|top"
-				height="21"
-				is_toggle="true"
-				layout="topleft"
-				enabled="true"
-				label="Own Poses"
-				image_overlay="Hierarchy_View_On"
-				image_overlay_alignment="left"
-				image_bottom_pad="1"
-				image_hover_unselected="Toolbar_Middle_Over"
-				image_selected="Toolbar_Middle_Selected"
-				image_unselected="Toolbar_Middle_Off"
-				button_flash_enable="true"
-				flash_color="0.7 0.7 1 1"
-				button_flash_count="64"
-				button_flash_rate="0.5"
-				name="toggleLoadSavePanel"
-				left_pad="1"
-				top_delta="0"
-				tool_tip="Load, save and manage the poses you make"
-				width="105" >
+				 follows="left|top"
+				 height="21"
+				 is_toggle="true"
+				 layout="topleft"
+				 label="Own Poses"
+				 image_overlay="Hierarchy_View_On"
+				 image_overlay_alignment="left"
+				 image_bottom_pad="1"
+				 image_hover_unselected="Toolbar_Middle_Over"
+				 image_selected="Toolbar_Middle_Selected"
+				 image_unselected="Toolbar_Middle_Off"
+				 button_flash_enable="true"
+				 flash_color="0.7 0.7 1 1"
+				 button_flash_count="64"
+				 button_flash_rate="0.5"
+				 name="toggleLoadSavePanel"
+				 left_pad="1"
+				 top_delta="0"
+				 tool_tip="Load, save and manage the poses you make"
+				 width="105" >
 					<button.commit_callback
-					function="Poser.ToggleLoadSavePanel"/>
+					 function="Poser.ToggleLoadSavePanel"/>
 				</button>
 				<button
-				height="21"
-				follows="top|left"
-				layout="topleft"
-				label=""
-				enabled="true"
-				visible="false"
-				tool_tip="Manage your pose directory"
-				image_overlay="Inv_FolderOpen"
-				image_overlay_alignment="center"
-				image_hover_unselected="Toolbar_Middle_Over"
-				image_selected="Toolbar_Middle_Selected"
-				image_unselected="Toolbar_Middle_Off"
-				name="open_poseDir_button"
-				width="30"
-				top_delta="0"
-				left_pad="1">
+				 height="21"
+				 follows="top|left"
+				 layout="topleft"
+				 visible="false"
+				 tool_tip="Manage your pose directory"
+				 image_overlay="Inv_FolderOpen"
+				 image_overlay_alignment="center"
+				 image_hover_unselected="Toolbar_Middle_Over"
+				 image_selected="Toolbar_Middle_Selected"
+				 image_unselected="Toolbar_Middle_Off"
+				 name="open_poseDir_button"
+				 width="30"
+				 top_delta="0"
+				 left_pad="1">
 					<button.commit_callback
-					function="Poser.BrowseCache"/>
+					 function="Poser.BrowseCache"/>
 				</button>
 				<menu_button
-				height="21"
-				follows="top|left"
-				layout="topleft"
-				label="Load Pose"
-				enabled="false"
-				visible="false"
-				tool_tip="Load the currently selected pose."
-				image_overlay="Icon_Undock_Foreground"
-				image_overlay_alignment="left"
-				image_hover_unselected="Toolbar_Middle_Over"
-				image_selected="Toolbar_Middle_Selected"
-				image_unselected="Toolbar_Middle_Off"
-				menu_filename="menu_fs_poser_poses_btn.xml"
-				menu_position="topright"
-				name="load_poses_button"
-				left_pad="1"
-				top_delta="0"
-				width="97"/>
+				 height="21"
+				 follows="top|left"
+				 layout="topleft"
+				 label="Load Pose"
+				 enabled="false"
+				 visible="false"
+				 tool_tip="Load the currently selected pose."
+				 image_overlay="Icon_Undock_Foreground"
+				 image_overlay_alignment="left"
+				 image_hover_unselected="Toolbar_Middle_Over"
+				 image_selected="Toolbar_Middle_Selected"
+				 image_unselected="Toolbar_Middle_Off"
+				 menu_filename="menu_fs_poser_poses_btn.xml"
+				 menu_position="topright"
+				 name="load_poses_button"
+				 left_pad="1"
+				 top_delta="0"
+				 width="97"/>
 				<button
-				height="21"
-				follows="top|left"
-				layout="topleft"
-				label="Save Diff"
-				enabled="false"
-				visible="false"
-				tool_tip="A Diff is just your changes to an existing Pose. Start from a T-Pose to save a new work."
-				image_overlay="Icon_Dock_Foreground"
-				image_overlay_alignment="left"
-				image_hover_unselected="Toolbar_Middle_Over"
-				image_selected="Toolbar_Middle_Selected"
-				image_unselected="Toolbar_Middle_Off"
-				name="save_poses_button"
-				width="97"
-				top_delta="0"
-				left_pad="1">
+				 height="21"
+				 follows="top|left"
+				 layout="topleft"
+				 label="Save Diff"
+				 enabled="false"
+				 visible="false"
+				 tool_tip="A Diff is just your changes to an existing Pose. Start from a T-Pose to save a new work."
+				 image_overlay="Icon_Dock_Foreground"
+				 image_overlay_alignment="left"
+				 image_hover_unselected="Toolbar_Middle_Over"
+				 image_selected="Toolbar_Middle_Selected"
+				 image_unselected="Toolbar_Middle_Off"
+				 name="save_poses_button"
+				 width="97"
+				 top_delta="0"
+				 left_pad="1">
 					<button.commit_callback
-					function="Poser.Save"/>
+					 function="Poser.Save"/>
 				</button>
 			</panel>
 		</layout_panel>
 		<layout_panel
-		follows="top|left|right"
-		layout="topleft"
-		height="97"
-		visible="true"
-		auto_resize="false"
-		name="advanced_controls_layout"
-		width="600">
+		 follows="top|left|right"
+		 layout="topleft"
+		 height="97"
+		 auto_resize="false"
+		 name="advanced_controls_layout"
+		 width="600">
 			<panel
-				follows="top|left|right"
-				height="97"
-				left="0"
-				layout="all"
-				enabled="false"
-				background_visible="false"
-				mouse_opaque="false"
-				visible="false"
-				name="advanced_parent_panel"
-				width="555">
+			 follows="top|left|right"
+			 height="97"
+			 left="0"
+			 layout="all"
+			 enabled="false"
+			 background_visible="false"
+			 mouse_opaque="false"
+			 visible="false"
+			 name="advanced_parent_panel"
+			 width="555">
 				<tab_container
-				follows="all"
-				halign="center"
-				height="97"
-				layout="topleft"
-				name="modifier_tabs"
-				enabled="true"
-				tab_height="20"
-				tab_group="1"
-				tab_position="top"
-				top_pad="0"
-				width="555">
+				 follows="all"
+				 halign="center"
+				 height="97"
+				 layout="topleft"
+				 name="modifier_tabs"
+				 tab_height="20"
+				 tab_group="1"
+				 tab_position="top"
+				 top_pad="0"
+				 width="555">
 					<panel
-					follows="all"
-					background_visible="false"
-					height="97"
-					layout="topleft"
-					left="0"
-					title="Body Part Position"
-					name="position_panel"
-					top="0"
-					width="555">
+					 follows="all"
+					 background_visible="false"
+					 height="97"
+					 layout="topleft"
+					 left="0"
+					 title="Body Part Position"
+					 name="position_panel"
+					 top="0"
+					 width="555">
 						<slider
-						decimal_digits="3"
-						can_edit_text="true"
-						follows="left|top"
-						height="14"
-						increment="0.001"
-						initial_value="0"
-						label="Position X:"
-						label_width="70"
-						layout="topleft"
-						left="10"
-						max_val="0.5"
-						min_val="-0.5"
-						name="Advanced_Position_X"
-						top_pad="6"
-						width="380" >
+						 decimal_digits="3"
+						 can_edit_text="true"
+						 follows="left|top"
+						 height="14"
+						 increment="0.001"
+						 initial_value="0"
+						 label="Position X:"
+						 label_width="70"
+						 layout="topleft"
+						 left="10"
+						 max_val="0.5"
+						 min_val="-0.5"
+						 name="Advanced_Position_X"
+						 top_pad="6"
+						 width="380" >
 							<slider.commit_callback
-							function="Poser.Advanced.PositionSet"
-							parameter="0"/>
+							 function="Poser.Advanced.PositionSet"/>
 						</slider>
 						<slider
-						decimal_digits="3"
-						can_edit_text="true"
-						follows="left|top"
-						height="14"
-						increment="0.001"
-						initial_value="0"
-						label="Position Y:"
-						label_width="70"
-						layout="topleft"
-						left_delta="0"
-						max_val="0.5"
-						min_val="-0.5"
-						name="Advanced_Position_Y"
-						top_pad="1"
-						width="380" >
+						 decimal_digits="3"
+						 can_edit_text="true"
+						 follows="left|top"
+						 height="14"
+						 increment="0.001"
+						 initial_value="0"
+						 label="Position Y:"
+						 label_width="70"
+						 layout="topleft"
+						 left_delta="0"
+						 max_val="0.5"
+						 min_val="-0.5"
+						 name="Advanced_Position_Y"
+						 top_pad="1"
+						 width="380" >
 							<slider.commit_callback
-							function="Poser.Advanced.PositionSet"
-							parameter="1"/>
+							 function="Poser.Advanced.PositionSet"/>
 						</slider>
 						<slider
-						decimal_digits="3"
-						can_edit_text="true"
-						follows="left|top"
-						height="14"
-						increment="0.001"
-						initial_value="0"
-						label="Position Z:"
-						label_width="70"
-						layout="topleft"
-						left_delta="0"
-						max_val="0.5"
-						min_val="-0.5"
-						name="Advanced_Position_Z"
-						top_pad="1"
-						width="380" >
+						 decimal_digits="3"
+						 can_edit_text="true"
+						 follows="left|top"
+						 height="14"
+						 increment="0.001"
+						 initial_value="0"
+						 label="Position Z:"
+						 label_width="70"
+						 layout="topleft"
+						 left_delta="0"
+						 max_val="0.5"
+						 min_val="-0.5"
+						 name="Advanced_Position_Z"
+						 top_pad="1"
+						 width="380" >
 							<slider.commit_callback
-							function="Poser.Advanced.PositionSet"
-							parameter="2"/>
+							 function="Poser.Advanced.PositionSet"/>
 						</slider>
 						<button
-						height="21"
-						follows="left|top"
-						layout="topleft"
-						label="Undo Position Change"
-						image_overlay="Script_Undo"
-						image_overlay_alignment="left"
-						image_unselected="Toolbar_Middle_Off"
-						name="undo_position_change"
-						tool_tip="Undo the last position change"
-						width="150"
-						top_pad="2"
-						left_delta="0">
+						 height="21"
+						 follows="left|top"
+						 layout="topleft"
+						 label="Undo Position Change"
+						 image_overlay="Script_Undo"
+						 image_overlay_alignment="left"
+						 image_unselected="Toolbar_Middle_Off"
+						 name="undo_position_change"
+						 tool_tip="Undo the last position change"
+						 width="150"
+						 top_pad="2"
+						 left_delta="0">
 							<button.commit_callback
-							function="Poser.UndoLastPosition"/>
+							 function="Poser.UndoLastPosition"/>
 						</button>
 						<button
-						height="21"
-						follows="left|top"
-						layout="topleft"
-						label="Redo Position"
-						image_overlay="Script_Redo"
-						image_overlay_alignment="left"
-						image_unselected="Toolbar_Middle_Off"
-						name="redo_position_change"
-						tool_tip="Redo the last position change"
-						width="110"
-						top_delta="0"
-						left_pad="4">
+						 height="21"
+						 follows="left|top"
+						 layout="topleft"
+						 label="Redo Position"
+						 image_overlay="Script_Redo"
+						 image_overlay_alignment="left"
+						 image_unselected="Toolbar_Middle_Off"
+						 name="redo_position_change"
+						 tool_tip="Redo the last position change"
+						 width="110"
+						 top_delta="0"
+						 left_pad="4">
 							<button.commit_callback
-							function="Poser.RedoLastPosition"/>
+							 function="Poser.RedoLastPosition"/>
 						</button>
 						<button
-						height="21"
-						follows="left|top"
-						layout="topleft"
-						label="Reset Position"
-						image_overlay="Inv_TrashOpen"
-						image_overlay_alignment="left"
-						image_unselected="Toolbar_Middle_Off"
-						name="reset_positions"
-						tool_tip="Double click to reset position back to original"
-						width="110"
-						top_delta="0"
-						left_pad="4">
+						 height="21"
+						 follows="left|top"
+						 layout="topleft"
+						 label="Reset Position"
+						 image_overlay="Inv_TrashOpen"
+						 image_overlay_alignment="left"
+						 image_unselected="Toolbar_Middle_Off"
+						 name="reset_positions"
+						 tool_tip="Double click to reset position back to original"
+						 width="110"
+						 top_delta="0"
+						 left_pad="4">
 							<button.commit_callback
-							function="Poser.ResetPosition"/>
+							 function="Poser.ResetPosition"/>
 						</button>
 					</panel>
 					<panel
-					follows="all"
-					background_visible="false"
-					height="97"
-					layout="topleft"
-					left="0"
-					title="Body Part Scale"
-					name="scale_panel"
-					top="0"
-					width="607">
+					 follows="all"
+					 background_visible="false"
+					 height="97"
+					 layout="topleft"
+					 left="0"
+					 title="Body Part Scale"
+					 name="scale_panel"
+					 top="0"
+					 width="607">
 						<slider
-						decimal_digits="3"
-						can_edit_text="true"
-						follows="left|top"
-						height="14"
-						increment="0.001"
-						initial_value="0"
-						label="Scale X:"
-						label_width="70"
-						layout="topleft"
-						left="10"
-						max_val="2"
-						min_val="0"
-						name="Advanced_Scale_X"
-						top_pad="6"
-						width="380" >
+						 decimal_digits="3"
+						 can_edit_text="true"
+						 follows="left|top"
+						 height="14"
+						 increment="0.001"
+						 initial_value="0"
+						 label="Scale X:"
+						 label_width="70"
+						 layout="topleft"
+						 left="10"
+						 max_val="2"
+						 min_val="0"
+						 name="Advanced_Scale_X"
+						 top_pad="6"
+						 width="380" >
 							<slider.commit_callback
-							function="Poser.Advanced.ScaleSet"
-							parameter="0"/>
+							 function="Poser.Advanced.ScaleSet"/>
 						</slider>
 						<slider
-						decimal_digits="3"
-						can_edit_text="true"
-						follows="left|top"
-						height="14"
-						increment="0.001"
-						initial_value="0"
-						label="Scale Y:"
-						label_width="70"
-						layout="topleft"
-						left_delta="0"
-						max_val="2"
-						min_val="0"
-						name="Advanced_Scale_Y"
-						top_pad="1"
-						width="380" >
+						 decimal_digits="3"
+						 can_edit_text="true"
+						 follows="left|top"
+						 height="14"
+						 increment="0.001"
+						 initial_value="0"
+						 label="Scale Y:"
+						 label_width="70"
+						 layout="topleft"
+						 left_delta="0"
+						 max_val="2"
+						 min_val="0"
+						 name="Advanced_Scale_Y"
+						 top_pad="1"
+						 width="380" >
 							<slider.commit_callback
-							function="Poser.Advanced.ScaleSet"
-							parameter="1"/>
+							 function="Poser.Advanced.ScaleSet"/>
 						</slider>
 						<slider
-						decimal_digits="3"
-						can_edit_text="true"
-						follows="left|top"
-						height="14"
-						increment="0.001"
-						initial_value="0"
-						label="Scale Z:"
-						label_width="70"
-						layout="topleft"
-						left_delta="0"
-						max_val="2"
-						min_val="0"
-						name="Advanced_Scale_Z"
-						top_pad="1"
-						width="380" >
+						 decimal_digits="3"
+						 can_edit_text="true"
+						 follows="left|top"
+						 height="14"
+						 increment="0.001"
+						 initial_value="0"
+						 label="Scale Z:"
+						 label_width="70"
+						 layout="topleft"
+						 left_delta="0"
+						 max_val="2"
+						 min_val="0"
+						 name="Advanced_Scale_Z"
+						 top_pad="1"
+						 width="380" >
 							<slider.commit_callback
-							function="Poser.Advanced.ScaleSet"
-							parameter="2"/>
+							 function="Poser.Advanced.ScaleSet"/>
 						</slider>
 						<button
-						height="21"
-						follows="left|top"
-						layout="topleft"
-						label="Undo Scale Change"
-						image_overlay="Script_Undo"
-						image_overlay_alignment="left"
-						image_unselected="Toolbar_Middle_Off"
-						name="undo_scale_change"
-						tool_tip="Undo the last scale change"
-						width="150"
-						top_pad="2"
-						left_delta="0">
+						 height="21"
+						 follows="left|top"
+						 layout="topleft"
+						 label="Undo Scale Change"
+						 image_overlay="Script_Undo"
+						 image_overlay_alignment="left"
+						 image_unselected="Toolbar_Middle_Off"
+						 name="undo_scale_change"
+						 tool_tip="Undo the last scale change"
+						 width="150"
+						 top_pad="2"
+						 left_delta="0">
 							<button.commit_callback
-							function="Poser.UndoLastScale"/>
+							 function="Poser.UndoLastScale"/>
 						</button>
 						<button
-						height="21"
-						follows="left|top"
-						layout="topleft"
-						label="Redo Scale"
-						image_overlay="Script_Redo"
-						image_overlay_alignment="left"
-						image_unselected="Toolbar_Middle_Off"
-						name="redo_scale_change"
-						tool_tip="Redo the last scale change"
-						width="110"
-						top_delta="0"
-						left_pad="4">
+						 height="21"
+						 follows="left|top"
+						 layout="topleft"
+						 label="Redo Scale"
+						 image_overlay="Script_Redo"
+						 image_overlay_alignment="left"
+						 image_unselected="Toolbar_Middle_Off"
+						 name="redo_scale_change"
+						 tool_tip="Redo the last scale change"
+						 width="110"
+						 top_delta="0"
+						 left_pad="4">
 							<button.commit_callback
-							function="Poser.RedoLastScale"/>
+							 function="Poser.RedoLastScale"/>
 						</button>
 						<button
-						height="21"
-						follows="left|top"
-						layout="topleft"
-						label="Reset Scale"
-						image_overlay="Inv_TrashOpen"
-						image_overlay_alignment="left"
-						image_unselected="Toolbar_Middle_Off"
-						name="reset_scales"
-						tool_tip="Double click to reset scale back to original"
-						width="110"
-						top_delta="0"
-						left_pad="4">
+						 height="21"
+						 follows="left|top"
+						 layout="topleft"
+						 label="Reset Scale"
+						 image_overlay="Inv_TrashOpen"
+						 image_overlay_alignment="left"
+						 image_unselected="Toolbar_Middle_Off"
+						 name="reset_scales"
+						 tool_tip="Double click to reset scale back to original"
+						 width="110"
+						 top_delta="0"
+						 left_pad="4">
 							<button.commit_callback
-							function="Poser.ResetScale"/>
+							 function="Poser.ResetScale"/>
 						</button>
 					</panel>
 				</tab_container>
diff --git a/indra/newview/skins/default/xui/en/widgets/fs_virtual_trackpad.xml b/indra/newview/skins/default/xui/en/widgets/fs_virtual_trackpad.xml
index e9fba5ac27..b3151312f7 100644
--- a/indra/newview/skins/default/xui/en/widgets/fs_virtual_trackpad.xml
+++ b/indra/newview/skins/default/xui/en/widgets/fs_virtual_trackpad.xml
@@ -4,7 +4,6 @@
     width="150"
     height="150"
     pinch_mode="false"
-    user_resize="false"
     image_sphere="VirtualTrackball_Sphere"
     image_moon_back="VirtualTrackball_Moon_Back"
     image_moon_front="VirtualTrackball_Moon_Front"