From 96fdb00e9d84b5ac832c66a539ff1db16e223355 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Fri, 8 Sep 2017 22:44:55 +0100
Subject: [PATCH] Add Physics Shape view to Starlight, StarlightCUI and Vintage
 skins

---
 .../skins/starlight/xui/en/floater_tools.xml  | 35 +++++++++++++------
 .../starlightcui/xui/en/floater_tools.xml     | 35 +++++++++++++------
 .../skins/vintage/xui/en/floater_tools.xml    | 35 +++++++++++++------
 3 files changed, 75 insertions(+), 30 deletions(-)

diff --git a/indra/newview/skins/starlight/xui/en/floater_tools.xml b/indra/newview/skins/starlight/xui/en/floater_tools.xml
index 490d3f350d..b09b70a668 100644
--- a/indra/newview/skins/starlight/xui/en/floater_tools.xml
+++ b/indra/newview/skins/starlight/xui/en/floater_tools.xml
@@ -2780,21 +2780,36 @@ even though the user gets a free copy.
              width="130">
                 Physics Shape Type:
             </text>
-			<combo_box
-			   height="19"
-			   top_delta="15" 
-			   layout="topleft"
-			   follows="left|top"
-			   name="Physics Shape Type Combo Ctrl"
-			   tool_tip="Choose the physics shape type"
-			   width="108"/>
+			      <combo_box
+			         height="19"
+			         top_delta="15" 
+			         layout="topleft"
+			         follows="left|top"
+			         name="Physics Shape Type Combo Ctrl"
+			         tool_tip="Choose the physics shape type"
+			         width="108"/>
+            <button
+               follows="left|top"
+               height="19"
+               is_toggle="true"
+               control_name="ShowPhysicsShapeInEdit"
+               image_disabled="PhysicsView_Off"
+               image_disabled_selected="PhysicsView_Off"
+               image_selected="PhysicsView_On"
+               image_unselected="PhysicsView_Off"
+               layout="topleft"
+               left_delta="117"
+               name="PhysicsViewToggle"
+               tool_tip="Toggle the physics view on in edit mode"
+               width="19"/>          
             <combo_box
              height="19"
              layout="topleft"
              name="material"
              top_pad="5"
-             width="150">
-                <combo_box.item
+             width="150"
+             left="144">
+              <combo_box.item
                  label="Stone"
                  name="Stone"
                  value="Stone" />
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_tools.xml b/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
index 5b685e6db5..6db6e2e8a2 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
@@ -2780,20 +2780,35 @@ even though the user gets a free copy.
              width="130">
                 Physics Shape Type:
             </text>
-			<combo_box
-			   height="19"
-			   top_delta="15" 
-			   layout="topleft"
-			   follows="left|top"
-			   name="Physics Shape Type Combo Ctrl"
-			   tool_tip="Choose the physics shape type"
-			   width="108"/>
-            <combo_box
+      			<combo_box
+			         height="19"
+			         top_delta="15" 
+			         layout="topleft"
+			         follows="left|top"
+			         name="Physics Shape Type Combo Ctrl"
+			         tool_tip="Choose the physics shape type"
+			         width="108"/>
+            <button
+              follows="left|top"
+              height="19"
+              is_toggle="true"
+              control_name="ShowPhysicsShapeInEdit"
+              image_disabled="PhysicsView_Off"
+              image_disabled_selected="PhysicsView_Off"
+              image_selected="PhysicsView_On"
+              image_unselected="PhysicsView_Off"
+              layout="topleft"
+              left_delta="117"
+              name="PhysicsViewToggle"
+              tool_tip="Toggle the physics view on in edit mode"
+              width="19"/>
+          <combo_box
              height="19"
              layout="topleft"
              name="material"
              top_pad="5"
-             width="150">
+             width="150"
+             left="144">
                 <combo_box.item
                  label="Stone"
                  name="Stone"
diff --git a/indra/newview/skins/vintage/xui/en/floater_tools.xml b/indra/newview/skins/vintage/xui/en/floater_tools.xml
index e2a617f3a2..237416b86f 100644
--- a/indra/newview/skins/vintage/xui/en/floater_tools.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_tools.xml
@@ -2714,20 +2714,35 @@ even though the user gets a free copy.
              width="130">
                 Physics Shape Type:
             </text>
-			<combo_box
-			   height="19"
-			   top_delta="15" 
-			   layout="topleft"
-			   follows="left|top"
-			   name="Physics Shape Type Combo Ctrl"
-			   tool_tip="Choose the physics shape type"
-			   width="108"/>
-            <combo_box
+			    <combo_box
+			       height="19"
+			       top_delta="15" 
+			       layout="topleft"
+			       follows="left|top"
+			       name="Physics Shape Type Combo Ctrl"
+			       tool_tip="Choose the physics shape type"
+			       width="108"/>
+          <button
+             follows="left|top"
+             height="19"
+             is_toggle="true"
+             control_name="ShowPhysicsShapeInEdit"
+             image_disabled="PhysicsView_Off"
+             image_disabled_selected="PhysicsView_Off"
+             image_selected="PhysicsView_On"
+             image_unselected="PhysicsView_Off"
+             layout="topleft"
+             left_delta="117"
+             name="PhysicsViewToggle"
+             tool_tip="Toggle the physics view on in edit mode"
+             width="19"/>
+          <combo_box
              height="19"
              layout="topleft"
              name="material"
              top_pad="5"
-             width="150">
+             width="150"
+             left="144">
                 <combo_box.item
                  label="Stone"
                  name="Stone"