Merge from viewer-development

1 files changed, 41 insertions, 15 deletions

diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
index 781adcd50b..815bde456e 100644
--- a/indra/newview/skins/default/xui/da/floater_tools.xml
+++ b/indra/newview/skins/default/xui/da/floater_tools.xml
@@ -64,6 +64,8 @@
 		<radio_item label="Vælg overflade" name="radio select face"/>
 	</radio_group>
 	<check_box label="Redigér lænkede" name="checkbox edit linked parts"/>
+	<button label="Sammenkæd" name="link_btn"/>
+	<button label="Adskil" name="unlink_btn"/>
 	<text name="RenderingCost" tool_tip="Hvis beregnede rendering omkostninger for dette objekt">
 		þ: [COUNT]
 	</text>
@@ -120,6 +122,18 @@
 	<text name="prim_count">
 		Prims: [COUNT]
 	</text>
+	<text name="linked_set_count">
+		Lænkede sæt: [COUNT]
+	</text>
+	<text name="linked_set_cost" tool_tip="Pris for nuværende valgte lænkede sæt som [prims] / [physics complexity]">
+		Pris: [COST] / [PHYSICS]
+	</text>
+	<text name="object_count">
+		Objekter: [COUNT]
+	</text>
+	<text name="object_cost" tool_tip="Pris for nuværende valgte objekter som [prims] / [physics complexity]">
+		Pris: [COST] / [PHYSICS]
+	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Generelt" name="General">
 			<panel.string name="text deed continued">
@@ -167,15 +181,9 @@
 			<text name="Creator:">
 				Skaber:
 			</text>
-			<text name="Creator Name">
-				Mrs. Esbee Linden (esbee.linden)
-			</text>
 			<text name="Owner:">
 				Ejer:
 			</text>
-			<text name="Owner Name">
-				Mrs. Erica &quot;Moose&quot; Linden (erica.linden)
-			</text>
 			<text name="Group:">
 				Gruppe:
 			</text>
@@ -270,15 +278,6 @@
 				<combo_box.item label="Ring" name="Ring"/>
 				<combo_box.item label="Sculpted" name="Sculpted"/>
 			</combo_box>
-			<combo_box name="material">
-				<combo_box.item label="Sten" name="Stone"/>
-				<combo_box.item label="Metal" name="Metal"/>
-				<combo_box.item label="Glas" name="Glass"/>
-				<combo_box.item label="Træ" name="Wood"/>
-				<combo_box.item label="Kød" name="Flesh"/>
-				<combo_box.item label="Plastik" name="Plastic"/>
-				<combo_box.item label="Gummi" name="Rubber"/>
-			</combo_box>
 			<text name="text cut">
 				Snit Z-akse (start/slut)
 			</text>
@@ -351,9 +350,19 @@
 				<combo_box.item label="Kuglering" name="Torus"/>
 				<combo_box.item label="Plan" name="Plane"/>
 				<combo_box.item label="Cylinder" name="Cylinder"/>
+				<combo_box.item label="Mesh" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Features" name="Features">
+			<panel.string name="None">
+				Ingen
+			</panel.string>
+			<panel.string name="Prim">
+				Prim
+			</panel.string>
+			<panel.string name="Convex Hull">
+				Konveks skrog
+			</panel.string>
 			<text name="select_single">
 				Vælg kun én prim for at ændre egenskaber.
 			</text>
@@ -378,6 +387,23 @@
 			<spinner label="Fokus" name="Light Focus"/>
 			<spinner label="Udfasning" name="Light Falloff"/>
 			<spinner label="Omgivelser" name="Light Ambiance"/>
+			<text name="label physicsshapetype">
+				Fysisk form type:
+			</text>
+			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="Vælg fysisk form type"/>
+			<combo_box name="material">
+				<combo_box.item label="Sten" name="Stone"/>
+				<combo_box.item label="Metal" name="Metal"/>
+				<combo_box.item label="Glas" name="Glass"/>
+				<combo_box.item label="Træ" name="Wood"/>
+				<combo_box.item label="Kød" name="Flesh"/>
+				<combo_box.item label="Plastik" name="Plastic"/>
+				<combo_box.item label="Gummi" name="Rubber"/>
+			</combo_box>
+			<spinner label="Tyngde" name="Physics Gravity"/>
+			<spinner label="Friktion" name="Physics Friction"/>
+			<spinner label="Tæthed" name="Physics Density"/>
+			<spinner label="Restitution" name="Physics Restitution"/>
 		</panel>
 		<panel label="Tekstur" name="Texture">
 			<panel.string name="string repeats per meter">