From 5a46b59284ac313a0e7737fd600d020c07c352cd Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@serpentine.com>
Date: Wed, 20 Jan 2010 10:25:06 -0800
Subject: Convert all XML files to Unix line endings

---
 .../default/xui/de/floater_avatar_textures.xml     | 84 +++++++++++-----------
 1 file changed, 42 insertions(+), 42 deletions(-)

(limited to 'indra/newview/skins/default/xui/de/floater_avatar_textures.xml')

diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index dde940db38..6f5fe23d4c 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatar_texture_debug" title="AVATAR-TEXTUREN">
-	<floater.string name="InvalidAvatar">
-		UNGÜLTIGER AVATAR
-	</floater.string>
-	<text name="label">
-		Gebackene Texturen
-	</text>
-	<text name="composite_label" width="150">
-		Zusammengesetzte Texturen
-	</text>
-	<button label="Läd IDs in Konsole ab" label_selected="Abladen" name="Dump"/>
-	<texture_picker label="Haare" name="hair-baked"/>
-	<texture_picker label="Haare" name="hair_grain"/>
-	<texture_picker label="Alpha: Haare" name="hair_alpha"/>
-	<texture_picker label="Kopf" name="head-baked"/>
-	<texture_picker label="Make-Uup" name="head_bodypaint"/>
-	<texture_picker label="Kopf: Alpha" name="head_alpha"/>
-	<texture_picker label="Kopftattoo" name="head_tattoo"/>
-	<texture_picker label="Augen" name="eyes-baked"/>
-	<texture_picker label="Auge" name="eyes_iris"/>
-	<texture_picker label="Alpha: Augen" name="eyes_alpha"/>
-	<texture_picker label="Oberkörper" name="upper-baked"/>
-	<texture_picker label="Oberkörper: Körperfarbe" name="upper_bodypaint"/>
-	<texture_picker label="Unterhemd" name="upper_undershirt"/>
-	<texture_picker label="Handschuhe" name="upper_gloves"/>
-	<texture_picker label="Hemd" name="upper_shirt"/>
-	<texture_picker label="Oberjacke" name="upper_jacket"/>
-	<texture_picker label="Alpha: Oben" name="upper_alpha"/>
-	<texture_picker label="Obere Tattoos" name="upper_tattoo"/>
-	<texture_picker label="Unterkörper" name="lower-baked"/>
-	<texture_picker label="Unterkörper: Körperfarbe" name="lower_bodypaint"/>
-	<texture_picker label="Unterhose" name="lower_underpants"/>
-	<texture_picker label="Socken" name="lower_socks"/>
-	<texture_picker label="Schuhe" name="lower_shoes"/>
-	<texture_picker label="Hose" name="lower_pants"/>
-	<texture_picker label="Jacke" name="lower_jacket"/>
-	<texture_picker label="Alpha: Unten" name="lower_alpha"/>
-	<texture_picker label="Untere Tattoos" name="lower_tattoo"/>
-	<texture_picker label="Rock" name="skirt-baked"/>
-	<texture_picker label="Rock" name="skirt"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatar_texture_debug" title="AVATAR-TEXTUREN">
+	<floater.string name="InvalidAvatar">
+		UNGÜLTIGER AVATAR
+	</floater.string>
+	<text name="label">
+		Gebackene Texturen
+	</text>
+	<text name="composite_label" width="150">
+		Zusammengesetzte Texturen
+	</text>
+	<button label="Läd IDs in Konsole ab" label_selected="Abladen" name="Dump"/>
+	<texture_picker label="Haare" name="hair-baked"/>
+	<texture_picker label="Haare" name="hair_grain"/>
+	<texture_picker label="Alpha: Haare" name="hair_alpha"/>
+	<texture_picker label="Kopf" name="head-baked"/>
+	<texture_picker label="Make-Uup" name="head_bodypaint"/>
+	<texture_picker label="Kopf: Alpha" name="head_alpha"/>
+	<texture_picker label="Kopftattoo" name="head_tattoo"/>
+	<texture_picker label="Augen" name="eyes-baked"/>
+	<texture_picker label="Auge" name="eyes_iris"/>
+	<texture_picker label="Alpha: Augen" name="eyes_alpha"/>
+	<texture_picker label="Oberkörper" name="upper-baked"/>
+	<texture_picker label="Oberkörper: Körperfarbe" name="upper_bodypaint"/>
+	<texture_picker label="Unterhemd" name="upper_undershirt"/>
+	<texture_picker label="Handschuhe" name="upper_gloves"/>
+	<texture_picker label="Hemd" name="upper_shirt"/>
+	<texture_picker label="Oberjacke" name="upper_jacket"/>
+	<texture_picker label="Alpha: Oben" name="upper_alpha"/>
+	<texture_picker label="Obere Tattoos" name="upper_tattoo"/>
+	<texture_picker label="Unterkörper" name="lower-baked"/>
+	<texture_picker label="Unterkörper: Körperfarbe" name="lower_bodypaint"/>
+	<texture_picker label="Unterhose" name="lower_underpants"/>
+	<texture_picker label="Socken" name="lower_socks"/>
+	<texture_picker label="Schuhe" name="lower_shoes"/>
+	<texture_picker label="Hose" name="lower_pants"/>
+	<texture_picker label="Jacke" name="lower_jacket"/>
+	<texture_picker label="Alpha: Unten" name="lower_alpha"/>
+	<texture_picker label="Untere Tattoos" name="lower_tattoo"/>
+	<texture_picker label="Rock" name="skirt-baked"/>
+	<texture_picker label="Rock" name="skirt"/>
+</floater>
-- 
cgit v1.2.3


From 3f7ed7ef1de1012e3bea719e8042a256deb10ac3 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 26 Jan 2010 14:28:07 -0800
Subject: DEV-43688 cycle3 for DE

---
 .../default/xui/de/floater_avatar_textures.xml     | 62 ++++++++++++----------
 1 file changed, 33 insertions(+), 29 deletions(-)

(limited to 'indra/newview/skins/default/xui/de/floater_avatar_textures.xml')

diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index 6f5fe23d4c..3be5194a8f 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -10,33 +10,37 @@
 		Zusammengesetzte Texturen
 	</text>
 	<button label="Läd IDs in Konsole ab" label_selected="Abladen" name="Dump"/>
-	<texture_picker label="Haare" name="hair-baked"/>
-	<texture_picker label="Haare" name="hair_grain"/>
-	<texture_picker label="Alpha: Haare" name="hair_alpha"/>
-	<texture_picker label="Kopf" name="head-baked"/>
-	<texture_picker label="Make-Uup" name="head_bodypaint"/>
-	<texture_picker label="Kopf: Alpha" name="head_alpha"/>
-	<texture_picker label="Kopftattoo" name="head_tattoo"/>
-	<texture_picker label="Augen" name="eyes-baked"/>
-	<texture_picker label="Auge" name="eyes_iris"/>
-	<texture_picker label="Alpha: Augen" name="eyes_alpha"/>
-	<texture_picker label="Oberkörper" name="upper-baked"/>
-	<texture_picker label="Oberkörper: Körperfarbe" name="upper_bodypaint"/>
-	<texture_picker label="Unterhemd" name="upper_undershirt"/>
-	<texture_picker label="Handschuhe" name="upper_gloves"/>
-	<texture_picker label="Hemd" name="upper_shirt"/>
-	<texture_picker label="Oberjacke" name="upper_jacket"/>
-	<texture_picker label="Alpha: Oben" name="upper_alpha"/>
-	<texture_picker label="Obere Tattoos" name="upper_tattoo"/>
-	<texture_picker label="Unterkörper" name="lower-baked"/>
-	<texture_picker label="Unterkörper: Körperfarbe" name="lower_bodypaint"/>
-	<texture_picker label="Unterhose" name="lower_underpants"/>
-	<texture_picker label="Socken" name="lower_socks"/>
-	<texture_picker label="Schuhe" name="lower_shoes"/>
-	<texture_picker label="Hose" name="lower_pants"/>
-	<texture_picker label="Jacke" name="lower_jacket"/>
-	<texture_picker label="Alpha: Unten" name="lower_alpha"/>
-	<texture_picker label="Untere Tattoos" name="lower_tattoo"/>
-	<texture_picker label="Rock" name="skirt-baked"/>
-	<texture_picker label="Rock" name="skirt"/>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<texture_picker label="Haare" name="hair-baked"/>
+			<texture_picker label="Haare" name="hair_grain"/>
+			<texture_picker label="Alpha: Haare" name="hair_alpha"/>
+			<texture_picker label="Kopf" name="head-baked"/>
+			<texture_picker label="Make-Uup" name="head_bodypaint"/>
+			<texture_picker label="Kopf: Alpha" name="head_alpha"/>
+			<texture_picker label="Kopftattoo" name="head_tattoo"/>
+			<texture_picker label="Augen" name="eyes-baked"/>
+			<texture_picker label="Auge" name="eyes_iris"/>
+			<texture_picker label="Alpha: Augen" name="eyes_alpha"/>
+			<texture_picker label="Oberkörper" name="upper-baked"/>
+			<texture_picker label="Oberkörper: Körperfarbe" name="upper_bodypaint"/>
+			<texture_picker label="Unterhemd" name="upper_undershirt"/>
+			<texture_picker label="Handschuhe" name="upper_gloves"/>
+			<texture_picker label="Hemd" name="upper_shirt"/>
+			<texture_picker label="Oberjacke" name="upper_jacket"/>
+			<texture_picker label="Alpha: Oben" name="upper_alpha"/>
+			<texture_picker label="Obere Tattoos" name="upper_tattoo"/>
+			<texture_picker label="Unterkörper" name="lower-baked"/>
+			<texture_picker label="Unterkörper: Körperfarbe" name="lower_bodypaint"/>
+			<texture_picker label="Unterhose" name="lower_underpants"/>
+			<texture_picker label="Socken" name="lower_socks"/>
+			<texture_picker label="Schuhe" name="lower_shoes"/>
+			<texture_picker label="Hose" name="lower_pants"/>
+			<texture_picker label="Jacke" name="lower_jacket"/>
+			<texture_picker label="Alpha: Unten" name="lower_alpha"/>
+			<texture_picker label="Untere Tattoos" name="lower_tattoo"/>
+			<texture_picker label="Rock" name="skirt-baked"/>
+			<texture_picker label="Rock" name="skirt"/>
+		</panel>
+	</scroll_container>
 </floater>
-- 
cgit v1.2.3