Added physics settings to object features panel. Brought in mesh 'prim cost' fetching and now display cost in edit floater if mesh is enabled.

indra/newview/skins/default/xui/en-us/floater_tools.xml

@@ -301,9 +301,7 @@
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
        bottom="-163" left="118" drop_shadow_visible="true" follows="left|top"
        font="SansSerifSmall" h_pad="0" halign="right" height="16"
-       mouse_opaque="true" name="prim_count" v_pad="0" width="143">
-		primitives: [COUNT]
-	</text>
+       mouse_opaque="true" name="prim_count" v_pad="0" width="143"/>
 
 <!-- Sub-tabs -->
 
@@ -1011,6 +1009,9 @@
 
 		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
 		     label="Features" left="1" mouse_opaque="false" name="Features" width="270">
+		     	<string name="None">None</string>
+			<string name="Prim">Prim</string>
+			<string name="Convex Hull">Convex Hull</string>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-20" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -1029,35 +1030,35 @@
 			     tool_tip="Allows object to flex about the Z axis. (Client-side only)"
 			     width="121" />
 			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="1" initial_val="2" label="Softness" label_width="65" left="10"
+			     increment="1" initial_val="2" label="Softness" label_width="55" left="10"
 			     max_val="3" min_val="0" mouse_opaque="true" name="FlexNumSections"
-			     width="128" />
+			     width="118" />
 			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.5" initial_val="0.3" label="Gravity" label_width="65"
+			     increment="0.5" initial_val="0.3" label="Gravity" label_width="55"
 			     left="10" max_val="10" min_val="-10" mouse_opaque="true" name="FlexGravity"
-			     width="128" />
+			     width="118" />
 			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.5" initial_val="2" label="Drag" label_width="65" left="10"
+			     increment="0.5" initial_val="2" label="Drag" label_width="55" left="10"
 			     max_val="10" min_val="0" mouse_opaque="true" name="FlexFriction"
-			     width="128" />
+			     width="118" />
 			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.5" initial_val="0" label="Wind" label_width="65" left="10"
-			     max_val="10" min_val="0" mouse_opaque="true" name="FlexWind" width="128" />
+			     increment="0.5" initial_val="0" label="Wind" label_width="55" left="10"
+			     max_val="10" min_val="0" mouse_opaque="true" name="FlexWind" width="118" />
 			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.5" initial_val="1" label="Tension" label_width="65" left="10"
-			     max_val="10" min_val="0" mouse_opaque="true" name="FlexTension" width="128" />
+			     increment="0.5" initial_val="1" label="Tension" label_width="55" left="10"
+			     max_val="10" min_val="0" mouse_opaque="true" name="FlexTension" width="118" />
 			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Force X" label_width="65" left="10"
+			     increment="0.01" initial_val="0" label="Force X" label_width="55" left="10"
 			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceX"
-			     width="128" />
+			     width="118" />
 			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Force Y" label_width="65" left="10"
+			     increment="0.01" initial_val="0" label="Force Y" label_width="55" left="10"
 			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceY"
-			     width="128" />
+			     width="118" />
 			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Force Z" label_width="65" left="10"
+			     increment="0.01" initial_val="0" label="Force Z" label_width="55" left="10"
 			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceZ"
-			     width="128" />
+			     width="118" />
 			<check_box bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16"
 			     initial_value="false" label="Light" left="10" mouse_opaque="true"
 			     name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"
@@ -1123,12 +1124,102 @@
 			     max_val="2" min_val="0" mouse_opaque="true"
 			     name="Light Falloff" 
 			     width="108" />
-			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
+			<spinner bottom_delta="0" 
+				decimal_digits="3" 
+				follows="left|top" 
+				height="16"
 				left_delta="114" 
-			     increment="0.05" initial_val="1" label="Ambiance" label_width="55"
-			     max_val="1" min_val="0" mouse_opaque="true"
-			     name="Light Ambiance" 
-			     width="118" />
+			     	ncrement="0.05" 
+				initial_val="1" 
+				label="Ambiance" 
+				label_width="55"
+			     	max_val="1" 
+			     	min_val="0" 
+			     	mouse_opaque="true"
+			     	name="Light Ambiance" 
+			     	width="118" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             name="label physicsshapetype"
+	     left_delta="13"
+             bottom="-41"
+             width="121">
+                Physics Shape Type:
+            </text>
+			<combo_box
+			   height="19"
+			   bottom_delta="-26" 
+			   layout="topleft"
+			   follows="left|top"
+			   name="Physics Shape Type Combo Ctrl"
+			   tool_tip="Choose the physics shape type"
+			   width="108"/>
+	    <spinner
+             follows="left|top"
+             height="19"
+             increment="1"
+             initial_value="1"
+             label="Gravity"
+             label_width="55"
+             layout="topleft"
+             min_val="-1"
+             max_val="28"
+             name="Physics Gravity"
+             top_pad="10"
+             width="118" />
+
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.1"
+             initial_value="0"
+             label="Friction"
+             label_width="55"
+             layout="topleft"
+             left_delta="0"
+             max_val="255"
+             min_val="0"
+             name="Physics Friction"
+             top_pad="4"
+	     bottom_delta="-20"
+             width="118" />
+
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.1"
+             initial_value="0"
+             label="Density"
+             label_width="55"
+             label_wrap="true"
+             layout="topleft"
+             left_delta="0"
+             max_val="22587"
+             min_val="1"
+             name="Physics Density"
+             top_pad="4"
+	     bottom_delta="-20"
+             width="118" />
+
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="Restitution"
+             label_width="55"
+             layout="topleft"
+             left_delta="0"
+             max_val="1"
+             min_val="0"
+             name="Physics Restitution"
+             top_pad="8"
+	     bottom_delta="-20"
+             width="118" />
 		</panel>
 
 <!-- Texture sub-tab -->
@@ -1469,4 +1560,10 @@
 	<string name="grid_attachment_text">
 		Attachment
 	</string>
+  <string name="status_selectprimequiv">
+    , Cost: [SEL_WEIGHT]
+  </string>
+  <string name="status_selectcount">
+    Primitives: [COUNT][PE_STRING]
+  </string>
 </floater>