From 28ed8f954d73d4be28d9fae881682dfa551b0cbb Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Tue, 14 Apr 2009 20:04:08 +0000
Subject: Re-add character data.

---
 indra/newview/character/attentions.xml             |    51 +
 indra/newview/character/attentionsN.xml            |    51 +
 indra/newview/character/avatar_eye.llm             |   Bin 0 -> 16011 bytes
 indra/newview/character/avatar_eye_1.llm           |   Bin 0 -> 5591 bytes
 indra/newview/character/avatar_eyelashes.llm       |   Bin 0 -> 65637 bytes
 indra/newview/character/avatar_hair.llm            |   Bin 0 -> 690581 bytes
 indra/newview/character/avatar_hair_1.llm          |   Bin 0 -> 5031 bytes
 indra/newview/character/avatar_hair_2.llm          |   Bin 0 -> 3261 bytes
 indra/newview/character/avatar_hair_3.llm          |   Bin 0 -> 1845 bytes
 indra/newview/character/avatar_hair_4.llm          |   Bin 0 -> 927 bytes
 indra/newview/character/avatar_hair_5.llm          |   Bin 0 -> 927 bytes
 indra/newview/character/avatar_head.llm            |   Bin 0 -> 1665493 bytes
 indra/newview/character/avatar_head_1.llm          |   Bin 0 -> 7875 bytes
 indra/newview/character/avatar_head_2.llm          |   Bin 0 -> 3675 bytes
 indra/newview/character/avatar_head_3.llm          |   Bin 0 -> 1797 bytes
 indra/newview/character/avatar_head_4.llm          |   Bin 0 -> 1239 bytes
 indra/newview/character/avatar_lad.xml             | 11264 +++++++++++++++++++
 indra/newview/character/avatar_lower_body.llm      |   Bin 0 -> 337125 bytes
 indra/newview/character/avatar_lower_body_1.llm    |   Bin 0 -> 7083 bytes
 indra/newview/character/avatar_lower_body_2.llm    |   Bin 0 -> 4107 bytes
 indra/newview/character/avatar_lower_body_3.llm    |   Bin 0 -> 2115 bytes
 indra/newview/character/avatar_lower_body_4.llm    |   Bin 0 -> 1629 bytes
 indra/newview/character/avatar_skeleton.xml        |    74 +
 indra/newview/character/avatar_skirt.llm           |   Bin 0 -> 72497 bytes
 indra/newview/character/avatar_skirt_1.llm         |   Bin 0 -> 1899 bytes
 indra/newview/character/avatar_skirt_2.llm         |   Bin 0 -> 1551 bytes
 indra/newview/character/avatar_skirt_3.llm         |   Bin 0 -> 1191 bytes
 indra/newview/character/avatar_skirt_4.llm         |   Bin 0 -> 843 bytes
 indra/newview/character/avatar_upper_body.llm      |   Bin 0 -> 929297 bytes
 indra/newview/character/avatar_upper_body_1.llm    |   Bin 0 -> 15627 bytes
 indra/newview/character/avatar_upper_body_2.llm    |   Bin 0 -> 8991 bytes
 indra/newview/character/avatar_upper_body_3.llm    |   Bin 0 -> 4557 bytes
 indra/newview/character/avatar_upper_body_4.llm    |   Bin 0 -> 3453 bytes
 indra/newview/character/blush_alpha.tga            |   Bin 0 -> 17352 bytes
 indra/newview/character/body_skingrain.tga         |   Bin 0 -> 262188 bytes
 indra/newview/character/bodyfreckles_alpha.tga     |   Bin 0 -> 257249 bytes
 indra/newview/character/bump_face_wrinkles.tga     |   Bin 0 -> 25243 bytes
 indra/newview/character/bump_head_base.tga         |   Bin 0 -> 105525 bytes
 indra/newview/character/bump_lowerbody_base.tga    |   Bin 0 -> 112782 bytes
 indra/newview/character/bump_pants_wrinkles.tga    |   Bin 0 -> 83183 bytes
 indra/newview/character/bump_shirt_wrinkles.tga    |   Bin 0 -> 81501 bytes
 indra/newview/character/bump_upperbody_base.tga    |   Bin 0 -> 147581 bytes
 indra/newview/character/eyebrows_alpha.tga         |   Bin 0 -> 9469 bytes
 indra/newview/character/eyeliner_alpha.tga         |   Bin 0 -> 4720 bytes
 indra/newview/character/eyeshadow_inner_alpha.tga  |   Bin 0 -> 5466 bytes
 indra/newview/character/eyeshadow_outer_alpha.tga  |   Bin 0 -> 7382 bytes
 indra/newview/character/eyewhite.tga               |   Bin 0 -> 42353 bytes
 .../character/facehair_chincurtains_alpha.tga      |   Bin 0 -> 34610 bytes
 .../newview/character/facehair_moustache_alpha.tga |   Bin 0 -> 14017 bytes
 .../newview/character/facehair_sideburns_alpha.tga |   Bin 0 -> 27328 bytes
 .../newview/character/facehair_soulpatch_alpha.tga |   Bin 0 -> 11277 bytes
 indra/newview/character/freckles_alpha.tga         |   Bin 0 -> 140558 bytes
 indra/newview/character/genepool.xml               |  7107 ++++++++++++
 indra/newview/character/glove_length_alpha.tga     |   Bin 0 -> 49745 bytes
 indra/newview/character/gloves_fingers_alpha.tga   |   Bin 0 -> 39616 bytes
 indra/newview/character/head_alpha.tga             |   Bin 0 -> 6066 bytes
 indra/newview/character/head_color.tga             |   Bin 0 -> 70715 bytes
 indra/newview/character/head_hair.tga              |   Bin 0 -> 75600 bytes
 indra/newview/character/head_highlights_alpha.tga  |   Bin 0 -> 20503 bytes
 indra/newview/character/head_shading_alpha.tga     |   Bin 0 -> 35304 bytes
 indra/newview/character/head_skingrain.tga         |   Bin 0 -> 262376 bytes
 .../character/jacket_length_lower_alpha.tga        |   Bin 0 -> 9768 bytes
 .../character/jacket_length_upper_alpha.tga        |   Bin 0 -> 14617 bytes
 .../newview/character/jacket_open_lower_alpha.tga  |   Bin 0 -> 19732 bytes
 .../newview/character/jacket_open_upper_alpha.tga  |   Bin 0 -> 41606 bytes
 indra/newview/character/lipgloss_alpha.tga         |   Bin 0 -> 4738 bytes
 indra/newview/character/lips_mask.tga              |   Bin 0 -> 6110 bytes
 indra/newview/character/lipstick_alpha.tga         |   Bin 0 -> 7966 bytes
 indra/newview/character/lowerbody_color.tga        |   Bin 0 -> 135395 bytes
 .../character/lowerbody_highlights_alpha.tga       |   Bin 0 -> 8695 bytes
 .../newview/character/lowerbody_shading_alpha.tga  |   Bin 0 -> 41766 bytes
 indra/newview/character/nailpolish_alpha.tga       |   Bin 0 -> 4656 bytes
 indra/newview/character/pants_length_alpha.tga     |   Bin 0 -> 26843 bytes
 indra/newview/character/pants_waist_alpha.tga      |   Bin 0 -> 10487 bytes
 indra/newview/character/rosyface_alpha.tga         |   Bin 0 -> 44382 bytes
 indra/newview/character/rouge_alpha.tga            |   Bin 0 -> 44382 bytes
 indra/newview/character/shirt_bottom_alpha.tga     |   Bin 0 -> 32242 bytes
 indra/newview/character/shirt_collar_alpha.tga     |   Bin 0 -> 14417 bytes
 .../newview/character/shirt_collar_back_alpha.tga  |   Bin 0 -> 12789 bytes
 indra/newview/character/shirt_sleeve_alpha.tga     |   Bin 0 -> 72196 bytes
 indra/newview/character/shoe_height_alpha.tga      |   Bin 0 -> 24461 bytes
 indra/newview/character/skirt_length_alpha.tga     |   Bin 0 -> 4114 bytes
 indra/newview/character/skirt_slit_back_alpha.tga  |   Bin 0 -> 90350 bytes
 indra/newview/character/skirt_slit_front_alpha.tga |   Bin 0 -> 90350 bytes
 indra/newview/character/skirt_slit_left_alpha.tga  |   Bin 0 -> 82006 bytes
 indra/newview/character/skirt_slit_right_alpha.tga |   Bin 0 -> 91410 bytes
 .../newview/character/underpants_trial_female.tga  |   Bin 0 -> 48063 bytes
 indra/newview/character/underpants_trial_male.tga  |   Bin 0 -> 144983 bytes
 .../newview/character/undershirt_trial_female.tga  |   Bin 0 -> 81390 bytes
 indra/newview/character/upperbody_color.tga        |   Bin 0 -> 23348 bytes
 .../character/upperbody_highlights_alpha.tga       |   Bin 0 -> 6509 bytes
 .../newview/character/upperbody_shading_alpha.tga  |   Bin 0 -> 25297 bytes
 .../newview/character/upperbodyfreckles_alpha.tga  |   Bin 0 -> 180104 bytes
 93 files changed, 18547 insertions(+)
 create mode 100644 indra/newview/character/attentions.xml
 create mode 100644 indra/newview/character/attentionsN.xml
 create mode 100644 indra/newview/character/avatar_eye.llm
 create mode 100644 indra/newview/character/avatar_eye_1.llm
 create mode 100644 indra/newview/character/avatar_eyelashes.llm
 create mode 100644 indra/newview/character/avatar_hair.llm
 create mode 100644 indra/newview/character/avatar_hair_1.llm
 create mode 100644 indra/newview/character/avatar_hair_2.llm
 create mode 100644 indra/newview/character/avatar_hair_3.llm
 create mode 100644 indra/newview/character/avatar_hair_4.llm
 create mode 100644 indra/newview/character/avatar_hair_5.llm
 create mode 100644 indra/newview/character/avatar_head.llm
 create mode 100644 indra/newview/character/avatar_head_1.llm
 create mode 100644 indra/newview/character/avatar_head_2.llm
 create mode 100644 indra/newview/character/avatar_head_3.llm
 create mode 100644 indra/newview/character/avatar_head_4.llm
 create mode 100644 indra/newview/character/avatar_lad.xml
 create mode 100644 indra/newview/character/avatar_lower_body.llm
 create mode 100644 indra/newview/character/avatar_lower_body_1.llm
 create mode 100644 indra/newview/character/avatar_lower_body_2.llm
 create mode 100644 indra/newview/character/avatar_lower_body_3.llm
 create mode 100644 indra/newview/character/avatar_lower_body_4.llm
 create mode 100644 indra/newview/character/avatar_skeleton.xml
 create mode 100644 indra/newview/character/avatar_skirt.llm
 create mode 100644 indra/newview/character/avatar_skirt_1.llm
 create mode 100644 indra/newview/character/avatar_skirt_2.llm
 create mode 100644 indra/newview/character/avatar_skirt_3.llm
 create mode 100644 indra/newview/character/avatar_skirt_4.llm
 create mode 100644 indra/newview/character/avatar_upper_body.llm
 create mode 100644 indra/newview/character/avatar_upper_body_1.llm
 create mode 100644 indra/newview/character/avatar_upper_body_2.llm
 create mode 100644 indra/newview/character/avatar_upper_body_3.llm
 create mode 100644 indra/newview/character/avatar_upper_body_4.llm
 create mode 100644 indra/newview/character/blush_alpha.tga
 create mode 100644 indra/newview/character/body_skingrain.tga
 create mode 100644 indra/newview/character/bodyfreckles_alpha.tga
 create mode 100644 indra/newview/character/bump_face_wrinkles.tga
 create mode 100644 indra/newview/character/bump_head_base.tga
 create mode 100644 indra/newview/character/bump_lowerbody_base.tga
 create mode 100644 indra/newview/character/bump_pants_wrinkles.tga
 create mode 100644 indra/newview/character/bump_shirt_wrinkles.tga
 create mode 100644 indra/newview/character/bump_upperbody_base.tga
 create mode 100644 indra/newview/character/eyebrows_alpha.tga
 create mode 100644 indra/newview/character/eyeliner_alpha.tga
 create mode 100644 indra/newview/character/eyeshadow_inner_alpha.tga
 create mode 100644 indra/newview/character/eyeshadow_outer_alpha.tga
 create mode 100644 indra/newview/character/eyewhite.tga
 create mode 100644 indra/newview/character/facehair_chincurtains_alpha.tga
 create mode 100644 indra/newview/character/facehair_moustache_alpha.tga
 create mode 100644 indra/newview/character/facehair_sideburns_alpha.tga
 create mode 100644 indra/newview/character/facehair_soulpatch_alpha.tga
 create mode 100644 indra/newview/character/freckles_alpha.tga
 create mode 100644 indra/newview/character/genepool.xml
 create mode 100644 indra/newview/character/glove_length_alpha.tga
 create mode 100644 indra/newview/character/gloves_fingers_alpha.tga
 create mode 100644 indra/newview/character/head_alpha.tga
 create mode 100644 indra/newview/character/head_color.tga
 create mode 100644 indra/newview/character/head_hair.tga
 create mode 100644 indra/newview/character/head_highlights_alpha.tga
 create mode 100644 indra/newview/character/head_shading_alpha.tga
 create mode 100644 indra/newview/character/head_skingrain.tga
 create mode 100644 indra/newview/character/jacket_length_lower_alpha.tga
 create mode 100644 indra/newview/character/jacket_length_upper_alpha.tga
 create mode 100644 indra/newview/character/jacket_open_lower_alpha.tga
 create mode 100644 indra/newview/character/jacket_open_upper_alpha.tga
 create mode 100644 indra/newview/character/lipgloss_alpha.tga
 create mode 100644 indra/newview/character/lips_mask.tga
 create mode 100644 indra/newview/character/lipstick_alpha.tga
 create mode 100644 indra/newview/character/lowerbody_color.tga
 create mode 100644 indra/newview/character/lowerbody_highlights_alpha.tga
 create mode 100644 indra/newview/character/lowerbody_shading_alpha.tga
 create mode 100644 indra/newview/character/nailpolish_alpha.tga
 create mode 100644 indra/newview/character/pants_length_alpha.tga
 create mode 100644 indra/newview/character/pants_waist_alpha.tga
 create mode 100644 indra/newview/character/rosyface_alpha.tga
 create mode 100644 indra/newview/character/rouge_alpha.tga
 create mode 100644 indra/newview/character/shirt_bottom_alpha.tga
 create mode 100644 indra/newview/character/shirt_collar_alpha.tga
 create mode 100644 indra/newview/character/shirt_collar_back_alpha.tga
 create mode 100644 indra/newview/character/shirt_sleeve_alpha.tga
 create mode 100644 indra/newview/character/shoe_height_alpha.tga
 create mode 100644 indra/newview/character/skirt_length_alpha.tga
 create mode 100644 indra/newview/character/skirt_slit_back_alpha.tga
 create mode 100644 indra/newview/character/skirt_slit_front_alpha.tga
 create mode 100644 indra/newview/character/skirt_slit_left_alpha.tga
 create mode 100644 indra/newview/character/skirt_slit_right_alpha.tga
 create mode 100644 indra/newview/character/underpants_trial_female.tga
 create mode 100644 indra/newview/character/underpants_trial_male.tga
 create mode 100644 indra/newview/character/undershirt_trial_female.tga
 create mode 100644 indra/newview/character/upperbody_color.tga
 create mode 100644 indra/newview/character/upperbody_highlights_alpha.tga
 create mode 100644 indra/newview/character/upperbody_shading_alpha.tga
 create mode 100644 indra/newview/character/upperbodyfreckles_alpha.tga

(limited to 'indra')

diff --git a/indra/newview/character/attentions.xml b/indra/newview/character/attentions.xml
new file mode 100644
index 0000000000..be9a2b28fc
--- /dev/null
+++ b/indra/newview/character/attentions.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
+<!--
+Default values for "Look At" controls.
+Various events compete for avatar attention. I.E. control where the
+user's avatar looks.
+The avatar's head will turn to look towards the source of those events
+as much as is possible. 
+If the head cannot turn due to an animation override, the eyes will still
+track those events.
+Avatar attention will be taken by events of equal of greater priorities
+and will last for timeout number of seconds before reverting to idle.
+Negative timeout values indicate attentions that never time out.
+Avatar sex determines which set of attention settings are used.
+Within each set, the following named attentions relate to the indicated events:
+
+IDLE: Tracks the mouse pointer movement.
+AUTO LISTEN: Tracks nearby chat.
+FREELOOK: Tracks "target objects" and a case of mouse moved in 3rd person mode.
+RESPOND: Tracks the beginning of typing.
+HOVER: Tracks objects the mouse lingers over when "show hover tooltips" is on.
+CONVERSATION: Tracks avatars and other objects clicked on.
+SEOECT: Tracks objects grabbed and being moved.
+FOCUS: Freezes during avatar customization and when focused on object or point.
+MOUSELOOK: Tracks center of view when in mouselook view mode.
+-->
+
+<linden_attentions version="1.0">
+   <gender name="Masculine">
+      <param attention="idle"         priority="1.0" timeout="3.0"  />
+      <param attention="auto_listen"  priority="3.0" timeout="4.0"  />
+      <param attention="freelook"     priority="2.0" timeout="2.0"  />
+      <param attention="respond"      priority="3.0" timeout="4.0"  />
+      <param attention="hover"        priority="4.0" timeout="1.0"  />
+      <param attention="conversation" priority="0.0" timeout="-1"   />
+      <param attention="select"       priority="6.0" timeout="-1"   />
+      <param attention="focus"        priority="6.0" timeout="-1"   />
+      <param attention="mouselook"    priority="7.0" timeout="-1"   />
+   </gender>
+   <gender name="Feminine">
+      <param attention="idle"         priority="1.0" timeout="3.0"  />
+      <param attention="auto_listen"  priority="3.0" timeout="4.0"  />
+      <param attention="freelook"     priority="2.0" timeout="2.0"  />
+      <param attention="respond"      priority="3.0" timeout="4.0"  />
+      <param attention="hover"        priority="4.0" timeout="1.0"  />
+      <param attention="conversation" priority="0.0" timeout="-1"   />
+      <param attention="select"       priority="6.0" timeout="-1"   />
+      <param attention="focus"        priority="6.0" timeout="-1"   />
+      <param attention="mouselook"    priority="7.0" timeout="-1"   />
+   </gender>
+</linden_attentions>
+
diff --git a/indra/newview/character/attentionsN.xml b/indra/newview/character/attentionsN.xml
new file mode 100644
index 0000000000..e7d9bb6a16
--- /dev/null
+++ b/indra/newview/character/attentionsN.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
+<!--
+Default values for "Look At" controls.
+Various events compete for avatar attention. I.E. control where the
+user's avatar looks.
+The avatar's head will turn to look towards the source of those events
+as much as is possible. 
+If the head cannot turn due to an animation override, the eyes will still
+track those events.
+Avatar attention will be taken by events of equal of greater priorities
+and will last for timeout number of seconds before reverting to idle.
+Negative timeout values indicate attentions that never time out.
+Avatar sex determines which set of attention settings are used.
+Within each set, the following named attentions relate to the indicated events:
+
+IDLE: Tracks the mouse pointer movement.
+AUTO LISTEN: Tracks nearby chat.
+FREELOOK: Tracks "target objects" and a case of mouse moved in 3rd person mode.
+RESPOND: Tracks the beginning of typing.
+HOVER: Tracks objects the mouse lingers over when "show hover tooltips" is on.
+CONVERSATION: Tracks avatars and other objects clicked on.
+SEOECT: Tracks objects grabbed and being moved.
+FOCUS: Freezes during avatar customization and when focused on object or point.
+MOUSELOOK: Tracks center of view when in mouselook view mode.
+-->
+
+<linden_attentions version="1.0">
+   <gender name="Masculine">
+      <param attention="idle"         priority="1.0" timeout="3.0"  />
+      <param attention="auto_listen"  priority="3.0" timeout="4.0"  />
+      <param attention="freelook"     priority="2.0" timeout="2.0"  />
+      <param attention="respond"      priority="3.0" timeout="3.0"  />
+      <param attention="hover"        priority="4.0" timeout="1.0"  />
+      <param attention="conversation" priority="5.0" timeout="3.0"  />
+      <param attention="select"       priority="3.5" timeout="-1"   />
+      <param attention="focus"        priority="3.5" timeout="20.0" />
+      <param attention="mouselook"    priority="7.0" timeout="-1"   />
+   </gender>
+   <gender name="Feminine">
+      <param attention="idle"         priority="1.0" timeout="3.0"  />
+      <param attention="auto_listen"  priority="3.0" timeout="4.0"  />
+      <param attention="freelook"     priority="2.0" timeout="2.0"  />
+      <param attention="respond"      priority="3.0" timeout="6.0"  />
+      <param attention="hover"        priority="4.0" timeout="1.0"  />
+      <param attention="conversation" priority="5.0" timeout="6.0"  />
+      <param attention="select"       priority="2.5" timeout="-1"   />
+      <param attention="focus"        priority="2.5" timeout="10.0" />
+      <param attention="mouselook"    priority="7.0" timeout="-1"   />
+   </gender>
+</linden_attentions>
+
diff --git a/indra/newview/character/avatar_eye.llm b/indra/newview/character/avatar_eye.llm
new file mode 100644
index 0000000000..8c6e74e1de
Binary files /dev/null and b/indra/newview/character/avatar_eye.llm differ
diff --git a/indra/newview/character/avatar_eye_1.llm b/indra/newview/character/avatar_eye_1.llm
new file mode 100644
index 0000000000..7a3b0d6f28
Binary files /dev/null and b/indra/newview/character/avatar_eye_1.llm differ
diff --git a/indra/newview/character/avatar_eyelashes.llm b/indra/newview/character/avatar_eyelashes.llm
new file mode 100644
index 0000000000..99995b5758
Binary files /dev/null and b/indra/newview/character/avatar_eyelashes.llm differ
diff --git a/indra/newview/character/avatar_hair.llm b/indra/newview/character/avatar_hair.llm
new file mode 100644
index 0000000000..df99de8db7
Binary files /dev/null and b/indra/newview/character/avatar_hair.llm differ
diff --git a/indra/newview/character/avatar_hair_1.llm b/indra/newview/character/avatar_hair_1.llm
new file mode 100644
index 0000000000..6de31fdc23
Binary files /dev/null and b/indra/newview/character/avatar_hair_1.llm differ
diff --git a/indra/newview/character/avatar_hair_2.llm b/indra/newview/character/avatar_hair_2.llm
new file mode 100644
index 0000000000..47d02ba9ce
Binary files /dev/null and b/indra/newview/character/avatar_hair_2.llm differ
diff --git a/indra/newview/character/avatar_hair_3.llm b/indra/newview/character/avatar_hair_3.llm
new file mode 100644
index 0000000000..107f9e2a53
Binary files /dev/null and b/indra/newview/character/avatar_hair_3.llm differ
diff --git a/indra/newview/character/avatar_hair_4.llm b/indra/newview/character/avatar_hair_4.llm
new file mode 100644
index 0000000000..1b9a12a0ca
Binary files /dev/null and b/indra/newview/character/avatar_hair_4.llm differ
diff --git a/indra/newview/character/avatar_hair_5.llm b/indra/newview/character/avatar_hair_5.llm
new file mode 100644
index 0000000000..1b9a12a0ca
Binary files /dev/null and b/indra/newview/character/avatar_hair_5.llm differ
diff --git a/indra/newview/character/avatar_head.llm b/indra/newview/character/avatar_head.llm
new file mode 100644
index 0000000000..8d8b5e0442
Binary files /dev/null and b/indra/newview/character/avatar_head.llm differ
diff --git a/indra/newview/character/avatar_head_1.llm b/indra/newview/character/avatar_head_1.llm
new file mode 100644
index 0000000000..26291e6584
Binary files /dev/null and b/indra/newview/character/avatar_head_1.llm differ
diff --git a/indra/newview/character/avatar_head_2.llm b/indra/newview/character/avatar_head_2.llm
new file mode 100644
index 0000000000..c2b808b1a6
Binary files /dev/null and b/indra/newview/character/avatar_head_2.llm differ
diff --git a/indra/newview/character/avatar_head_3.llm b/indra/newview/character/avatar_head_3.llm
new file mode 100644
index 0000000000..a0676b1f1c
Binary files /dev/null and b/indra/newview/character/avatar_head_3.llm differ
diff --git a/indra/newview/character/avatar_head_4.llm b/indra/newview/character/avatar_head_4.llm
new file mode 100644
index 0000000000..5035585770
Binary files /dev/null and b/indra/newview/character/avatar_head_4.llm differ
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
new file mode 100644
index 0000000000..f484167cab
--- /dev/null
+++ b/indra/newview/character/avatar_lad.xml
@@ -0,0 +1,11264 @@
+<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
+<linden_avatar
+ version="1.0"
+ wearable_definition_version="22">  
+ <!-- The wearable_definition_version is checked during asset upload. -->
+ <!-- If you increment it, check indra/lib/python/indra/assetutil.py.  -->
+   <skeleton
+    file_name="avatar_skeleton.xml">
+      <attachment_point
+       id="1"
+       group="6"
+       pie_slice="2"
+       name="Chest"
+       joint="mChest"
+       position="0.15 0 -0.1"
+       rotation="0 90 90"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="2"
+       group="2"
+       pie_slice="2"
+       name="Skull"
+       joint="mHead"
+       position="0 0 0.15"
+       rotation="0 0 90"
+       visible_in_first_person="false" />
+
+      <attachment_point
+       id="3"
+       group="3"
+       pie_slice="3"
+       name="Left Shoulder"
+       joint="mCollarLeft"
+       position="0 0 0.08"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="4"
+       group="1"
+       pie_slice="1"
+       name="Right Shoulder"
+       joint="mCollarRight"
+       position="0 0 0.08"
+       rotation="0 0 0" 
+	   visible_in_first_person="true"/>
+
+      <attachment_point
+       id="5"
+       group="4"
+       name="Left Hand"
+       joint="mWristLeft"
+       position="0 0.08 -0.02"
+       rotation="0 0 0"
+       visible_in_first_person="true"
+       max_attachment_offset="1.5" />
+
+      <attachment_point
+       id="6"
+       group="0"
+       name="Right Hand"
+       joint="mWristRight"
+       position="0 -0.08 -0.02"
+       rotation="0 0 0"
+       visible_in_first_person="true"
+       max_attachment_offset="1.5" />
+
+      <attachment_point
+       id="7"
+       group="5"
+       pie_slice="6"
+       name="Left Foot"
+       joint="mFootLeft"
+       position="0 0.0 0.0"
+       rotation="0 0 0" 
+	   visible_in_first_person="true"/>
+
+      <attachment_point
+       id="8"
+       group="7"
+       pie_slice="6"
+       name="Right Foot"
+       joint="mFootRight"
+       position="0 0.0 0.0"
+       rotation="0 0 0" 
+	   visible_in_first_person="true"/>
+
+      <attachment_point
+       id="9"
+       group="6"
+       pie_slice="7"
+       name="Spine"
+       joint="mChest"
+       position="-0.15 0 -0.1"
+       rotation="0 -90 90"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="10"
+       group="6"
+       pie_slice="6"
+       name="Pelvis"
+       joint="mPelvis"
+       position="0 0 -0.15"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="11"
+       group="2"
+       pie_slice="6"
+       name="Mouth"
+       joint="mHead"
+       position="0.12 0 0.001"
+       rotation="0 0 0" 
+	   visible_in_first_person="false"/>
+
+      <attachment_point
+       id="12"
+       group="2"
+       pie_slice="7"
+       name="Chin"
+       joint="mHead"
+       position="0.12 0 -0.04"
+       rotation="0 0 0"
+	   visible_in_first_person="false" />
+
+      <attachment_point
+       id="13"
+       group="2"
+       pie_slice="4"
+       name="Left Ear"
+       joint="mHead"
+       position="0.015 0.08 0.017"
+       rotation="0 0 0"
+	   visible_in_first_person="false" />
+
+      <attachment_point
+       id="14"
+       group="2"
+       pie_slice="0"
+       name="Right Ear"
+       joint="mHead"
+       position="0.015 -0.08 0.017"
+       rotation="0 0 0"
+	   visible_in_first_person="false" />
+
+      <attachment_point
+       id="15"
+       group="2"
+       pie_slice="3"
+       name="Left Eyeball"
+       joint="mEyeLeft"
+       position="0 0 0"
+       rotation="0 0 0" 
+	   visible_in_first_person="false"/>
+
+      <attachment_point
+       id="16"
+       group="2"
+       pie_slice="1"
+       name="Right Eyeball"
+       joint="mEyeRight"
+       position="0 0 0"
+       rotation="0 0 0"
+	   visible_in_first_person="false" />
+
+      <attachment_point
+       id="17"
+       group="2"
+       pie_slice="5"
+       name="Nose"
+       joint="mHead"
+       position="0.1 0 0.05"
+       rotation="0 0 0" 
+	   visible_in_first_person="false"/>
+
+      <attachment_point
+       id="18"
+       group="1"
+       pie_slice="0"
+       name="R Upper Arm"
+       joint="mShoulderRight"
+       position="0.01 -0.13 0.01"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="19"
+       group="1"
+       pie_slice="7"
+       name="R Forearm"
+       joint="mElbowRight"
+       position="0 -0.12 0"
+       rotation="0 0 0"
+	   visible_in_first_person="true"/>
+
+      <attachment_point
+       id="20"
+       group="3"
+       pie_slice="4"
+       name="L Upper Arm"
+       joint="mShoulderLeft"
+       position="0.01 0.15 -0.01"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="21"
+       group="3"
+       pie_slice="5"
+       name="L Forearm"
+       joint="mElbowLeft"
+       position="0 0.113 0"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="22"
+       group="7"
+       pie_slice="1"
+       name="Right Hip"
+       joint="mHipRight"
+       position="0 0 0"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="23"
+       group="7"
+       pie_slice="0"
+       name="R Upper Leg"
+       joint="mHipRight"
+       position="-0.017 0.041 -0.310"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="24"
+       group="7"
+       pie_slice="7"
+       name="R Lower Leg"
+       joint="mKneeRight"
+       position="-0.044 -0.007 -0.262"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="25"
+       group="5"
+       pie_slice="3"
+       name="Left Hip"
+       joint="mHipLeft"
+       position="0 0 0"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="26"
+       group="5"
+       pie_slice="4"
+       name="L Upper Leg"
+       joint="mHipLeft"
+       position="-0.019 -0.034 -0.310"
+       rotation="0 0 0" 
+	   visible_in_first_person="true"/>
+
+      <attachment_point
+       id="27"
+       group="5"
+       pie_slice="5"
+       name="L Lower Leg"
+       joint="mKneeLeft"
+       position="-0.044 -0.007 -0.261"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="28"
+       group="6"
+       pie_slice="5"
+       name="Stomach"
+       joint="mPelvis"
+       position="0.092 0.0 0.088"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="29"
+       group="6"
+       pie_slice="3"
+       name="Left Pec"
+       joint="mTorso"
+       position="0.104 0.082 0.247"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="30"
+       group="6"
+       pie_slice="1"
+       name="Right Pec"
+       joint="mTorso"
+       position="0.104 -0.082 0.247"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+    <attachment_point
+       id="31"
+       group="8"
+       name="Center 2"
+       joint="mScreen"
+       position="0 0 0"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="32"
+       group="8"
+       name="Top Right"
+       joint="mScreen"
+       position="0 -0.5 0.5"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="33"
+       group="8"
+       name="Top"
+       joint="mScreen"
+       position="0 0 0.5"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="34"
+       group="8"
+       name="Top Left"
+       joint="mScreen"
+       position="0 0.5 0.5"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="35"
+       group="8"
+       name="Center"
+       joint="mScreen"
+       position="0 0 0"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="36"
+       group="8"
+       name="Bottom Left"
+       joint="mScreen"
+       position="0 0.5 -0.5"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="37"
+       group="8"
+       name="Bottom"
+       joint="mScreen"
+       position="0 0 -0.5"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="38"
+       group="8"
+       name="Bottom Right"
+       joint="mScreen"
+       position="0 -0.5 -0.5"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+       
+    <param
+       id="32"
+       group="1"
+       wearable="shape"
+       name="Male_Skeleton"
+       label_min="Female"
+       label_max="Male"
+       value_min="0"
+       value_max="1">
+         <param_skeleton>
+            <bone
+             name="mNeck"
+             scale="0 0 .2" />
+
+            <bone
+             name="mCollarLeft"
+             scale="0 .4 0" />
+
+            <bone
+             name="mCollarRight"
+             scale="0 .4 0" />
+
+            <bone
+             name="mShoulderLeft"
+             scale="0 .35 0" />
+
+            <bone
+             name="mShoulderRight"
+             scale="0 .35 0" />
+
+            <bone
+             name="mElbowLeft"
+             scale="0 .1 0" />
+
+            <bone
+             name="mElbowRight"
+             scale="0 .1 0" />
+
+            <bone
+             name="mChest"
+             scale=".05 .05 .05" />
+
+            <bone
+             name="mTorso"
+             scale="0 0 .05" />
+
+            <bone
+             name="mPelvis"
+             scale="0 0 0" />
+
+            <bone
+             name="mHipLeft"
+             scale=".05 .05 0" />
+
+            <bone
+             name="mHipRight"
+             scale=".05 .05 0" />
+
+            <bone
+             name="mKneeLeft"
+             scale=".05 .05 .1" />
+
+            <bone
+             name="mKneeRight"
+             scale=".05 .05 .1" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="33"
+       group="0"
+       name="Height"
+       label="Height"
+       wearable="shape"
+       edit_group="shape_body"
+       edit_group_order="1"
+       label_min="Short"
+       label_max="Tall"
+       show_simple="true"
+       value_min="-2.3"
+       value_max="2"
+       camera_distance="2.2">
+         <param_skeleton>
+            <bone
+             name="mNeck"
+             scale="0 0 .02" />
+
+            <bone
+             name="mCollarLeft"
+             scale="0 0 0" />
+
+            <bone
+             name="mCollarRight"
+             scale="0 0 0" />
+
+            <bone
+             name="mShoulderLeft"
+             scale="0 0.08 0" />
+
+            <bone
+             name="mShoulderRight"
+             scale="0 0.08 0" />
+
+            <bone
+             name="mElbowLeft"
+             scale="0 0.06 0" />
+
+            <bone
+             name="mElbowRight"
+             scale="0 0.06 0" />
+
+            <bone
+             name="mChest"
+             scale="0 0 0.05" />
+
+            <bone
+             name="mTorso"
+             scale="0 0 0.05" />
+
+            <bone
+             name="mPelvis"
+             scale="0 0 0" />
+
+            <bone
+             name="mHipLeft"
+             scale="0 0 0.1" />
+
+            <bone
+             name="mHipRight"
+             scale="0 0 0.1" />
+
+            <bone
+             name="mKneeLeft"
+             scale="0 0 0.1" />
+
+            <bone
+             name="mKneeRight"
+             scale="0 0 0.1" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="34"
+       group="0"
+       name="Thickness"
+       label="Body Thickness"
+       wearable="shape"
+       edit_group="shape_body"
+       edit_group_order="2"
+       label_min="Body Thin"
+       label_max="Body Thick"
+       show_simple="true"
+       value_min="-0.7"
+       value_max="1.5"
+       camera_distance="1.8">
+         <param_skeleton>
+            <bone
+             name="mNeck"
+             scale="0.1 0.1 0" />
+
+            <bone
+             name="mCollarLeft"
+             scale="0 0.2 0" />
+
+            <bone
+             name="mCollarRight"
+             scale="0 0.2 0" />
+
+            <bone
+             name="mShoulderLeft"
+             scale="0.1 0 0.1" />
+
+            <bone
+             name="mShoulderRight"
+             scale="0.1 0 0.1" />
+
+            <bone
+             name="mElbowLeft"
+             scale="0.1 0 0.1" />
+
+            <bone
+             name="mElbowRight"
+             scale="0.1 0 0.1" />
+
+            <bone
+             name="mChest"
+             scale="0.1 0.1 0" />
+
+            <bone
+             name="mTorso"
+             scale="0.1 0.1 0" />
+
+            <bone
+             name="mPelvis"
+             scale="0.1 0.1 0" />
+
+            <bone
+             name="mHipLeft"
+             scale="0.13 0.13 0" />
+
+            <bone
+             name="mHipRight"
+             scale="0.13 0.13 0" />
+
+            <bone
+             name="mKneeLeft"
+             scale="0.12 0.12 0" />
+
+            <bone
+             name="mKneeRight"
+             scale="0.12 0.12 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="36"
+       group="0"
+       name="Shoulders"
+	   label="Shoulders"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="4"
+       label_min="Narrow"
+       label_max="Broad"
+       show_simple="true"
+       value_min="-1.8"
+       value_max="1.4"
+       value_default="-0.5"
+       camera_elevation=".1"
+       camera_distance="1.2"
+       camera_angle="0">
+         <param_skeleton>
+            <bone
+             name="mNeck"
+             scale="0.01 0.03 0" />
+
+            <bone
+             name="mCollarLeft"
+             scale="0 0 0"
+             offset="0 .02 0" />
+
+            <bone
+             name="mCollarRight"
+             scale="0 0 0"
+             offset="0 -.02 0" />
+
+            <bone
+             name="mChest"
+             scale="0.02 0.08 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="37"
+       group="0"
+       name="Hip Width"
+	   label="Hip Width"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="3"
+       label_min="Narrow"
+       label_max="Wide"
+       show_simple="true"
+       value_min="-3.2"
+       value_max="2.8"
+       camera_distance="1.8">
+         <param_skeleton>
+            <bone
+             name="mPelvis"
+             scale="0 0.1 0" />
+
+            <bone
+             name="mHipLeft"
+             scale="0 0 0"
+             offset="0 .004 0" />
+
+            <bone
+             name="mHipRight"
+             scale="0 0 0"
+             offset="0 -.004 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="842"
+       group="0"
+       name="Hip Length"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="3.2"
+       label_min="Short hips"
+       label_max="Long Hips"
+       value_min="-1"
+       value_max="1"
+       camera_distance="1.8">
+         <param_skeleton>
+            <bone
+             name="mPelvis"
+             scale="0 0 0.3" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="38"
+       group="0"
+       name="Torso Length"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="11"
+       label_min="Short Torso"
+       label_max="Long Torso"
+       value_min="-1"
+       value_max="1"
+       camera_distance="1.8">
+         <param_skeleton>
+            <bone
+             name="mTorso"
+             scale="0 0 .3" />
+
+            <bone
+             name="mPelvis"
+             scale="0 0 .1" />
+
+            <bone
+             name="mHipLeft"
+             scale="0 0 -.1" />
+
+            <bone
+             name="mHipRight"
+             scale="0 0 -.1" />
+
+            <bone
+             name="mKneeRight"
+             scale="0 0 -.05" />
+
+            <bone
+             name="mKneeLeft"
+             scale="0 0 -.05" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="195"
+       group="1"
+       name="EyeBone_Spread"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Eyes Together"
+       label_max="Eyes Spread"
+       value_min="-1"
+       value_max="1">
+         <param_skeleton>
+            <bone
+             name="mEyeLeft"
+             scale="0 0 0"
+             offset="0 .009 0" />
+
+            <bone
+             name="mEyeRight"
+             scale="0 0 0"
+             offset="0 -.009 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="661"
+       group="1"
+       name="EyeBone_Head_Shear"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Eyes Shear Left Up"
+       label_max="Eyes Shear Right Up"
+       value_min="-2"
+       value_max="2">
+         <param_skeleton>
+            <bone
+             name="mEyeLeft"
+             scale="0 0 0"
+             offset="0 0 .004" />
+
+            <bone
+             name="mEyeRight"
+             scale="0 0 0"
+             offset="0 0 -.004" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="772"
+       group="1"
+       name="EyeBone_Head_Elongate"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Eyes Short Head"
+       label_max="Eyes Long Head"
+       value_min="-1"
+       value_max="1">
+         <param_skeleton>
+            <bone
+             name="mEyeLeft"
+             scale="0 0 0"
+             offset=".016 0 0" />
+
+            <bone
+             name="mEyeRight"
+             scale="0 0 0"
+             offset=".016 0 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="768"
+       group="1"
+       name="EyeBone_Bug"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Eyes Sunken"
+       label_max="Eyes Bugged"
+       value_min="-2"
+       value_max="2">
+         <param_skeleton>
+            <bone
+             name="mEyeLeft"
+             scale="0 0 0"
+             offset=".005 0 0" />
+
+            <bone
+             name="mEyeRight"
+             scale="0 0 0"
+             offset=".005 0 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="655"
+       group="1"
+       name="Head Size"
+	   label="Head Size"
+       wearable="shape"
+       edit_group="shape_head"
+       label_min="Small Head"
+       label_max="Big Head"
+       show_simple="true"
+       value_min="-.25"
+       value_max=".10">
+         <param_skeleton>
+            <bone
+             name="mSkull"
+             scale="1 1 1"
+             offset="0 0 0.1" />
+
+            <bone
+             name="mHead"
+             scale="1 1 1"
+             offset="0 0 0" />
+
+            <bone
+             name="mEyeLeft"
+             scale="1 1 1"
+             offset="0 0 0" />
+
+            <bone
+             name="mEyeRight"
+             scale="1 1 1"
+             offset="0 0 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="197"
+       group="1"
+       wearable="shoes"
+       name="Shoe_Heels"
+       edit_group="shoes"
+       label_min="No Heels"
+       label_max="High Heels"
+       value_min="0"
+       value_max="1">
+         <param_skeleton>
+            <bone
+             name="mFootRight"
+             scale="0 0 0"
+             offset="0 0 -.08" />
+
+            <bone
+             name="mFootLeft"
+             scale="0 0 0"
+             offset="0 0 -.08" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="502"
+       group="1"
+       wearable="shoes"
+       name="Shoe_Platform"
+       edit_group="shoes"
+       label_min="No Heels"
+       label_max="High Heels"
+       value_min="0"
+       value_max="1">
+         <param_skeleton>
+            <bone
+             name="mFootRight"
+             scale="0 0 0"
+             offset="0 0 -.07" />
+
+            <bone
+             name="mFootLeft"
+             scale="0 0 0"
+             offset="0 0 -.07" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="675"
+       group="0"
+       name="Hand Size"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="10"
+       label_min="Small Hands"
+       label_max="Large Hands"
+       value_min="-.3"
+       value_max=".3"
+       camera_elevation=".1"
+       camera_distance="1.4"
+       camera_angle="0">
+         <param_skeleton>
+            <bone
+             name="mWristRight"
+             scale="1 1 1"
+             offset="0 0 0" />
+
+            <bone
+             name="mWristLeft"
+             scale="1 1 1"
+             offset="0 0 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="683"
+       group="0"
+       name="Neck Thickness"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="2"
+       label_min="Skinny Neck"
+       label_max="Thick Neck"
+       value_min="-.4"
+       value_max=".2"
+       value_default="-.15"
+       camera_elevation=".3"
+       camera_distance=".8"
+       camera_angle="15">
+         <param_skeleton>
+            <bone
+             name="mNeck"
+             scale="1 1 0"
+             offset="0 0 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="689"
+       group="1"
+       wearable="shape"
+       name="EyeBone_Big_Eyes"
+       edit_group="shape_eyes"
+       label_min="Eyes Back"
+       label_max="Eyes Forward"
+       value_min="-1"
+       value_max="1">
+         <param_skeleton>
+            <bone
+             name="mEyeLeft"
+             scale="0 0 0"
+             offset="-.005 0 0" />
+
+            <bone
+             name="mEyeRight"
+             scale="0 0 0"
+             offset="-.005 0 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="692"
+       group="0"
+       name="Leg Length"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="2"
+       label_min="Short Legs"
+       label_max="Long Legs"
+       value_min="-1"
+       value_max="1"
+       camera_distance="2.5">
+         <param_skeleton>
+            <bone
+             name="mHipLeft"
+             scale="0 0 .2" />
+
+            <bone
+             name="mHipRight"
+             scale="0 0 .2" />
+
+            <bone
+             name="mKneeRight"
+             scale="0 0 .2" />
+
+            <bone
+             name="mKneeLeft"
+             scale="0 0 .2" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="693"
+       group="0"
+       name="Arm Length"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="9"
+       label_min="Short Arms"
+       label_max="Long arms"
+       value_min="-1"
+       value_max="1"
+       value_default=".6"
+       camera_distance="1.5">
+         <param_skeleton>
+            <bone
+             name="mShoulderLeft"
+             scale="0 .2 0" />
+
+            <bone
+             name="mShoulderRight"
+             scale="0 .2 0" />
+
+            <bone
+             name="mElbowRight"
+             scale="0 .3 0" />
+
+            <bone
+             name="mElbowLeft"
+             scale="0 .3 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="756"
+       group="0"
+       name="Neck Length"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="3"
+       label_min="Short Neck"
+       label_max="Long Neck"
+       value_min="-1"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".3"
+       camera_distance=".8"
+       camera_angle="15">
+         <param_skeleton>
+            <bone
+             name="mNeck"
+             scale="0 0 .5" />
+         </param_skeleton>
+      </param>
+   </skeleton>
+
+   <mesh
+    type="hairMesh"
+	lod="0"
+    file_name="avatar_hair.llm"
+    min_pixel_width="320">
+<!-- begin morph targets -->
+      <param
+       id="180"
+       group="1"
+       name="Hair_Volume"
+       label="Hair Volume"
+	   show_simple="true"
+       wearable="hair"
+       clothing_morph="true"
+       edit_group="hair_style"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1.3"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="761"
+       group="1"
+       name="Hair_Volume_Small"
+       label="Hair Volume"
+	   show_simple="true"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1.3"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="181"
+       group="0"
+       name="Hair_Big_Front"
+       label="Big Hair Front"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="5"
+       label_min="Less"
+       label_max="More"
+       value_min="-1"
+       value_max="1"
+       value_default="0.14"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_morph />
+      </param>
+
+      <param
+       id="182"
+       group="0"
+       name="Hair_Big_Top"
+       label="Big Hair Top"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="6"
+       label_min="Less"
+       label_max="More"
+       value_min="-1"
+       value_max="1"
+       value_default=".7"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_morph />
+      </param>
+
+      <param
+       id="183"
+       group="0"
+       name="Hair_Big_Back"
+       clothing_morph="true"
+       label="Big Hair Back"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="7"
+       label_min="Less"
+       label_max="More"
+       value_min="-1"
+       value_max="1"
+       value_default="0.05"
+       camera_elevation=".1"
+       camera_distance=".7"
+       camera_angle="90">
+         <param_morph />
+      </param>
+
+      <param
+       id="184"
+       group="0"
+       name="Hair_Spiked"
+       label="Spiked Hair"
+	   show_simple="true"
+       wearable="hair"
+       clothing_morph="true"
+       edit_group="hair_style"
+       edit_group_order="15"
+       label_min="No Spikes"
+       label_max="Big Spikes"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="140"
+       group="0"
+       name="Hair_Part_Middle"
+       label="Middle Part"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="17"
+       label_min="No Part"
+       label_max="Part"
+       value_min="0"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="141"
+       group="0"
+       name="Hair_Part_Right"
+       label="Right Part"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="18"
+       label_min="No Part"
+       label_max="Part"
+       value_min="0"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="142"
+       group="0"
+       name="Hair_Part_Left"
+       label="Left Part"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="19"
+       label_min="No Part"
+       label_max="Part"
+       value_min="0"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="143"
+       group="0"
+       name="Hair_Sides_Full"
+       label="Full Hair Sides"
+	   show_simple="true"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="11"
+       label_min="Mowhawk"
+       label_max="Full Sides"
+       value_min="-4"
+       value_max="1.5"
+       value_default="0.125"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="144"
+       group="1"
+       name="Bangs_Front_Up"
+       label="Front Bangs Up"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Bangs"
+       label_max="Bangs Up"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="145"
+       group="1"
+       clothing_morph="true"
+       name="Bangs_Front_Down"
+       label="Front Bangs Down"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Bangs"
+       label_max="Bangs Down"
+       value_min="0"
+       value_max="5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="146"
+       group="1"
+       name="Bangs_Sides_Up"
+       label="Side Bangs Up"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Side Bangs"
+       label_max="Side Bangs Up"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="147"
+       group="1"
+       clothing_morph="true"
+       name="Bangs_Sides_Down"
+       label="Side Bangs Down"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Side Bangs"
+       label_max="Side Bangs Down"
+       value_min="0"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="148"
+       group="1"
+       name="Bangs_Back_Up"
+       label="Back Bangs Up"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Back Bangs"
+       label_max="Back Bangs Up"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="150">
+         <param_morph />
+      </param>
+
+      <param
+       id="149"
+       group="1"
+       name="Bangs_Back_Down"
+       label="Back Bangs Down"
+       clothing_morph="true"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Back Bangs"
+       label_max="Back Bangs Down"
+       value_min="0"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="150">
+         <param_morph />
+      </param>
+
+      <param
+       id="171"
+       group="1"
+       name="Hair_Front_Down"
+       label="Front Hair Down"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Front Hair"
+       label_max="Front Hair Down"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="172"
+       group="1"
+       name="Hair_Front_Up"
+       label="Front Hair Up"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Front Hair"
+       label_max="Front Hair Up"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="173"
+       group="1"
+       name="Hair_Sides_Down"
+       label="Sides Hair Down"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Sides Hair"
+       label_max="Sides Hair Down"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="174"
+       group="1"
+       name="Hair_Sides_Up"
+       label="Sides Hair Up"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Sides Hair"
+       label_max="Sides Hair Up"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="175"
+       group="1"
+       name="Hair_Back_Down"
+       label="Back Hair Down"
+       clothing_morph="true"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Back Hair"
+       label_max="Back Hair Down"
+       value_min="0"
+       value_max="3"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="150">
+         <param_morph />
+      </param>
+
+      <param
+       id="176"
+       group="1"
+       name="Hair_Back_Up"
+       label="Back Hair Up"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Back Hair"
+       label_max="Back Hair Up"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="150">
+         <param_morph />
+      </param>
+
+      <param
+       id="177"
+       group="0"
+       name="Hair_Rumpled"
+       label="Rumpled Hair"
+	   show_simple="true"
+       wearable="hair"
+       clothing_morph="true"
+       edit_group="hair_style"
+       edit_group_order="14.5"
+       label_min="Smooth Hair"
+       label_max="Rumpled Hair"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="178"
+       group="1"
+       name="Hair_Swept_Back"
+       label="Swept Back Hair"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="NotHair"
+       label_max="Swept Back"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_morph />
+      </param>
+
+      <param
+       id="179"
+       group="1"
+       name="Hair_Swept_Forward"
+       label="Swept Forward Hair"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Hair"
+       label_max="Swept Forward"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_morph />
+      </param>
+
+      <param
+       id="190"
+       group="1"
+       name="Hair_Tilt_Right"
+       label="Hair Tilted Right"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Hair"
+       label_max="Tilt Right"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="191"
+       group="1"
+       name="Hair_Tilt_Left"
+       label="Hair Tilted Left"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Hair"
+       label_max="Tilt Left"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="192"
+       group="0"
+       name="Bangs_Part_Middle"
+       label="Part Bangs"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="20"
+       label_min="No Part"
+       label_max="Part Bangs"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="640"
+       group="1"
+       name="Hair_Egg_Head"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="-1.3"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="641"
+       group="1"
+       name="Hair_Squash_Stretch_Head"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="-.5"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="642"
+       group="1"
+       name="Hair_Square_Head"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="643"
+       group="1"
+       name="Hair_Round_Head"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="644"
+       group="1"
+       name="Hair_Forehead_Round"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="645"
+       group="1"
+       name="Hair_Forehead_Slant"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="774"
+       group="1"
+       name="Shear_Head_Hair"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="-2"
+       value_max="2">
+         <param_morph />
+      </param>
+
+      <param
+       id="771"
+       group="1"
+       name="Elongate_Head_Hair"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="-1"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="674"
+       group="0"
+       name="Hair_Shear_Back"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="12"
+       label="Shear Back"
+       label_min="Full Back"
+       label_max="Sheared Back"
+       value_min="-1"
+       value_max="2"
+       value_default="-0.3"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="100">
+         <param_morph />
+      </param>
+
+      <param
+       id="762"
+       group="0"
+       name="Hair_Shear_Front"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="11.8"
+       label="Shear Front"
+	   show_simple="true"
+       label_min="Full Front"
+       label_max="Sheared Front"
+       value_min="0"
+       value_max="3"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="30">
+         <param_morph />
+      </param>
+
+      <param
+       id="754"
+       group="0"
+       name="Hair_Taper_Back"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="14"
+       label="Taper Back"
+       label_min="Wide Back"
+       label_max="Narrow Back"
+       value_min="-1"
+       value_max="2"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="160">
+         <param_morph />
+      </param>
+
+      <param
+       id="755"
+       group="0"
+       name="Hair_Taper_Front"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="13"
+       label="Taper Front"
+       label_min="Wide Front"
+       label_max="Narrow Front"
+       value_min="-1.5"
+       value_max="1.5"
+       value_default="0.05"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="782"
+       group="1"
+       clothing_morph="true"
+       name="Hair_Pigtails_Short"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="783"
+       group="1"
+       clothing_morph="true"
+       name="Hair_Pigtails_Med"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="790"
+       group="1"
+       clothing_morph="true"
+       name="Hair_Pigtails_Medlong"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="784"
+       group="1"
+       clothing_morph="true"
+       name="Hair_Pigtails_Long"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="786"
+       group="1"
+       name="Hair_Ponytail_Short"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="787"
+       group="1"
+       name="Hair_Ponytail_Med"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="788"
+       group="1"
+       name="Hair_Ponytail_Long"
+       clothing_morph="true"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!-- #end morph targets -->
+   </mesh>
+
+   <mesh
+    type="hairMesh"
+	lod="1"
+    file_name="avatar_hair_1.llm"
+    min_pixel_width="160"
+    reference="avatar_hair.llm">
+   </mesh>
+
+   <mesh
+    type="hairMesh"
+	lod="2"
+    file_name="avatar_hair_2.llm"
+    min_pixel_width="80"
+    reference="avatar_hair.llm">
+   </mesh>
+
+   <mesh
+    type="hairMesh"
+	lod="3"
+    file_name="avatar_hair_3.llm"
+    min_pixel_width="40"
+    reference="avatar_hair.llm">
+   </mesh>
+
+   <mesh
+    type="hairMesh"
+	lod="4"
+    file_name="avatar_hair_4.llm"
+	min_pixel_width="20"
+    reference="avatar_hair.llm">
+   </mesh>
+
+   <mesh
+    type="hairMesh"
+	lod="5"
+    file_name="avatar_hair_5.llm"
+	min_pixel_width="0"
+    reference="avatar_hair.llm">
+   </mesh>
+
+   <mesh
+    type="headMesh"
+	lod="0"
+    file_name="avatar_head.llm"
+    min_pixel_width="320">
+<!-- 
+            begin morph targets
+            #############
+            tweakable morphs
+            ############# 
+  -->
+      <param
+       id="1"
+       group="0"
+       name="Big_Brow"
+       label="Brow Size"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="7"
+       label_min="Small"
+       label_max="Large"
+       value_min="-.3"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".4"
+       camera_angle="45">
+         <param_morph />
+      </param>
+
+      <param
+       id="2"
+       group="0"
+       name="Nose_Big_Out"
+       label="Nose Size"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="1"
+       label_min="Small"
+       label_max="Large"
+       show_simple="true"
+       value_min="-0.8"
+       value_max="2.5"
+       camera_elevation=".1"
+       camera_distance=".35"
+       camera_angle="50">
+         <param_morph />
+      </param>
+
+      <param
+       id="4"
+       group="0"
+       name="Broad_Nostrils"
+       label="Nostril Width"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="3"
+       label_min="Narrow"
+       label_max="Broad"
+       value_min="-.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="759"
+       group="0"
+       name="Low_Septum_Nose"
+       label="Nostril Division"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="3.5"
+       label_min="High"
+       label_max="Low"
+       value_min="-1"
+       value_max="1.5"
+       value_default="0.5"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="517"
+       group="0"
+       name="Wide_Nose"
+       label="Nose Width"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="2"
+       label_min="Narrow"
+       label_max="Wide"
+       show_simple="true"
+       value_min="-.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="5"
+       group="0"
+       name="Cleft_Chin"
+       label="Chin Cleft"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="6"
+       label_min="Round"
+       label_max="Cleft"
+       value_min="-.1"
+       value_max="1"
+       camera_elevation="0"
+       camera_distance=".28"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="6"
+       group="0"
+       name="Bulbous_Nose_Tip"
+       label="Nose Tip Shape"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="8"
+       label_min="Pointy"
+       label_max="Bulbous"
+       value_min="-.3"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".35"
+       camera_angle="15">
+         <param_morph />
+      </param>
+
+      <param
+       id="7"
+       group="0"
+       name="Weak_Chin"
+       label="Chin Angle"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="1"
+       label_min="Chin Out"
+       label_max="Chin In"
+       value_min="-.5"
+       value_max=".5"
+       camera_elevation=".1"
+       camera_distance=".4"
+       camera_angle="45">
+         <param_morph />
+      </param>
+
+      <param
+       id="8"
+       group="0"
+       name="Double_Chin"
+       label="Chin-Neck"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="8"
+       label_min="Tight Chin"
+       label_max="Double Chin"
+       value_min="-.5"
+       value_max="1.5"
+       camera_elevation="-.1"
+       camera_distance=".3"
+       camera_angle="60">
+         <param_morph />
+      </param>
+
+      <param
+       id="10"
+       group="0"
+       name="Sunken_Cheeks"
+       label="Lower Cheeks"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="9"
+       label_min="Well-Fed"
+       label_max="Sunken"
+       show_simple="true"
+       value_min="-1.5"
+       value_max="3"
+       camera_elevation=".1"
+       camera_distance=".4"
+       camera_angle="5">
+         <param_morph />
+      </param>
+
+      <param
+       id="11"
+       group="0"
+       name="Noble_Nose_Bridge"
+       label="Upper Bridge"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="5"
+       label_min="Low"
+       label_max="High"
+       value_min="-.5"
+       value_max="1.5"
+       camera_elevation=".1"
+       camera_distance=".35"
+       camera_angle="70">
+         <param_morph />
+      </param>
+
+      <param
+       id="758"
+       group="0"
+       name="Lower_Bridge_Nose"
+       label="Lower Bridge"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="5.5"
+       label_min="Low"
+       label_max="High"
+       value_min="-1.5"
+       value_max="1.5"
+       camera_elevation=".1"
+       camera_distance=".35"
+       camera_angle="70">
+         <param_morph />
+      </param>
+
+      <param
+       id="12"
+       group="0"
+       name="Jowls"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="5"
+       label_min="Less"
+       label_max="More"
+       value_min="-.5"
+       value_max="2.5"
+       camera_elevation=".1"
+       camera_distance=".4"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="13"
+       group="0"
+       name="Cleft_Chin_Upper"
+       label="Upper Chin Cleft"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="7"
+       label_min="Round"
+       label_max="Cleft"
+       value_min="0"
+       value_max="1.5"
+       camera_elevation="0"
+       camera_distance=".28"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="14"
+       group="0"
+       name="High_Cheek_Bones"
+       label="Cheek Bones"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="10"
+       label_min="Low"
+       label_max="High"
+       value_min="-.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="15"
+       group="0"
+       name="Ears_Out"
+       label="Ear Angle"
+       wearable="shape"
+       edit_group="shape_ears"
+       edit_group_order="2"
+       label_min="In"
+       label_max="Out"
+       value_min="-.5"
+       value_max="1.5"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+<!--Pointy eyebrows became a driver/driven param with new max value for backwards compatibility between 1.0 and 1.1-->
+      <param
+       id="870"
+       group="1"
+       name="Pointy_Eyebrows"
+       label="Eyebrow Points"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="4"
+       label_min="Smooth"
+       label_max="Pointy"
+       value_min="-.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_morph />
+      </param>
+
+      <param
+       id="17"
+       group="0"
+       name="Square_Jaw"
+       label="Jaw Shape"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="2"
+       label_min="Pointy"
+       label_max="Square"
+       value_min="-.5"
+       value_max="1"
+       camera_distance=".3"
+       camera_elevation=".04"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="18"
+       group="0"
+       name="Puffy_Upper_Cheeks"
+       label="Upper Cheeks"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="8"
+       label_min="Thin"
+       label_max="Puffy"
+       value_min="-1.5"
+       value_max="2.5"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="19"
+       group="0"
+       name="Upturned_Nose_Tip"
+       label="Nose Tip Angle"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="7"
+       label_min="Downturned"
+       label_max="Upturned"
+       value_min="-1.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".35"
+       camera_angle="15">
+         <param_morph />
+      </param>
+
+      <param
+       id="20"
+       group="0"
+       name="Bulbous_Nose"
+       label="Nose Thickness"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="4"
+       label_min="Thin Nose"
+       label_max="Bulbous Nose"
+       show_simple="true"
+       value_min="-.5"
+       value_max="1.5"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_morph />
+      </param>
+
+      <param
+       id="21"
+       group="0"
+       name="Upper_Eyelid_Fold"
+       label="Upper Eyelid Fold"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="5"
+       label_min="Uncreased"
+       label_max="Creased"
+       value_min="-0.2"
+       value_max="1.3"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_morph />
+      </param>
+
+      <param
+       id="22"
+       group="0"
+       name="Attached_Earlobes"
+       label="Attached Earlobes"
+       wearable="shape"
+       edit_group="shape_ears"
+       edit_group_order="3"
+       label_min="Unattached"
+       label_max="Attached"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="45">
+         <param_morph />
+      </param>
+
+      <param
+       id="23"
+       group="0"
+       name="Baggy_Eyes"
+       label="Eye Bags"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="6"
+       label_min="Smooth"
+       label_max="Baggy"
+       value_min="-.5"
+       value_max="1.5"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_morph />
+      </param>
+
+      <param
+       id="765"
+       group="0"
+       name="Puffy_Lower_Lids"
+       label="Puffy Eyelids"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="6.1"
+       label_min="Flat"
+       label_max="Puffy"
+       value_min="-.3"
+       value_max="2.5"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_morph />
+      </param>
+
+      <param
+       id="24"
+       group="0"
+       name="Wide_Eyes"
+       label="Eye Opening"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="1.1"
+       label_min="Narrow"
+       label_max="Wide"
+       value_min="-1.5"
+       value_max="2"
+	   show_simple="true"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_morph />
+      </param>
+
+      <param
+       id="25"
+       group="0"
+       name="Wide_Lip_Cleft"
+       label="Lip Cleft"
+       wearable="shape"
+       edit_group="shape_mouth"
+       edit_group_order="6"
+       label_min="Narrow"
+       label_max="Wide"
+       value_min="-.8"
+       value_max="1.5"
+       camera_elevation="0"
+       camera_distance=".28">
+         <param_morph />
+      </param>
+
+      <param
+       id="764"
+       group="0"
+       name="Lip_Cleft_Deep"
+       label="Lip Cleft Depth"
+       wearable="shape"
+       edit_group="shape_mouth"
+       edit_group_order="5.8"
+       label_min="Shallow"
+       label_max="Deep"
+       value_min="-.5"
+       value_max="1.2"
+       camera_elevation="0"
+       camera_distance=".28">
+         <param_morph />
+      </param>
+
+      <param
+       id="26"
+       group="1"
+       wearable="shape"
+       name="Lips_Thin"
+       edit_group="driven"
+       value_min="0"
+       value_max=".7">
+         <param_morph />
+      </param>
+
+      <param
+       id="27"
+       group="0"
+       name="Wide_Nose_Bridge"
+       label="Bridge Width"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="6"
+       label_min="Narrow"
+       label_max="Wide"
+       value_min="-1.3"
+       value_max="1.2"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="28"
+       group="1"
+       name="Lips_Fat"
+       wearable="shape"
+       edit_group="driven"
+       value_min="0"
+       value_max="2">
+         <param_morph />
+      </param>
+
+      <param
+       id="29"
+       group="1"
+       name="Wide_Upper_Lip"
+       wearable="shape"
+       edit_group="driven"
+       value_min="-.7"
+       value_max="1.3">
+         <param_morph />
+      </param>
+
+      <param
+       id="30"
+       group="1"
+       name="Wide_Lower_Lip"
+       wearable="shape"
+       edit_group="driven"
+       value_min="-.7"
+       value_max="1.3">
+         <param_morph />
+      </param>
+
+<!--Arced eyebrows became a driver/driven param with new max value for backwards compatibility between 1.0 and 1.1-->
+      <param
+       id="872"
+       group="1"
+       name="Arced_Eyebrows"
+       label="Eyebrow Arc"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="3"
+       label_min="Flat"
+       label_max="Arced"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--Lower eyebrows became a driver/driven param with new min value for backwards compatibility between 1.0 and 1.1-->
+      <param
+       id="871"
+       group="1"
+       name="Lower_Eyebrows"
+       label="Eyebrow Height"
+	   show_simple="true"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="2.5"
+       label_min="Higher"
+       label_max="Lower"
+       value_min="-2"
+       value_max="2">
+         <param_morph />
+      </param>
+
+      <param
+       id="35"
+       group="0"
+       name="Big_Ears"
+       label="Ear Size"
+       wearable="shape"
+       edit_group="shape_ears"
+       edit_group_order="1"
+       label_min="Small"
+       label_max="Large"
+       value_min="-1"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="45">
+         <param_morph />
+      </param>
+
+      <param
+       id="796"
+       group="0"
+       name="Pointy_Ears"
+       label="Ear Tips"
+       wearable="shape"
+       edit_group="shape_ears"
+       edit_group_order="4"
+       label_min="Flat"
+       label_max="Pointy"
+       value_min="-.4"
+       value_max="3"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="45">
+         <param_morph />
+      </param>
+
+      <param
+       id="185"
+       group="0"
+       name="Deep_Chin"
+       label="Chin Depth"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="3"
+       label_min="Shallow"
+       label_max="Deep"
+       value_min="-1"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".4"
+       camera_angle="30">
+         <param_morph />
+      </param>
+
+      <param
+       id="186"
+       group="1"
+       name="Egg_Head"
+       label="Egg Head"
+       wearable="shape"
+       edit_group="shape_head"
+       label_min="Chin Heavy"
+       label_max="Forehead Heavy"
+       value_min="-1.3"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="187"
+       group="1"
+       name="Squash_Stretch_Head"
+       label="Squash/Stretch Head"
+       wearable="shape"
+       edit_group="shape_head"
+       label_min="Squash Head"
+       label_max="Stretch Head"
+       value_min="-.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph>
+			<volume_morph
+				name="HEAD"
+				scale="-0.008 -0.006 0.015"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="188"
+       group="1"
+       name="Square_Head"
+       wearable="shape"
+       label_min="Less Square"
+       label_max="More Square"
+       value_min="0"
+       value_max=".7"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="189"
+       group="1"
+       wearable="shape"
+       name="Round_Head"
+       label_min="Less Round"
+       label_max="More Round"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="194"
+       group="1"
+       name="Eye_Spread"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Eyes Together"
+       label_max="Eyes Spread"
+       value_min="-2"
+       value_max="2">
+         <param_morph />
+      </param>
+
+      <param
+       id="400"
+       sex="male"
+       group="1"
+       name="Displace_Hair_Facial"
+       label="Hair Thickess"
+       wearable="hair"
+       edit_group="hair_facial"
+       label_min="Cropped Hair"
+       label_max="Bushy Hair"
+       value_min="0"
+       value_max="2">
+         <param_morph />
+      </param>
+
+      <param
+       id="506"
+       group="0"
+       name="Mouth_Height"
+       wearable="shape"
+       label="Mouth Position"
+	   show_simple="true"
+       edit_group="shape_mouth"
+       edit_group_order="4"
+       label_min="High"
+       label_max="Low"
+       value_min="-2"
+       value_max="2"
+       camera_distance=".3"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="633"
+       group="1"
+       name="Fat_Head"
+       label="Fat Head"
+       wearable="shape"
+       edit_group="shape_body"
+       label_min="Skinny"
+       label_max="Fat"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".3">
+         <param_morph/>
+      </param>
+
+      <param
+       id="630"
+       group="1"
+       name="Forehead_Round"
+       label="Round Forehead"
+       wearable="shape"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="631"
+       group="1"
+       name="Forehead_Slant"
+       label="Slanted Forehead"
+       wearable="shape"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="650"
+       group="0"
+       name="Eyelid_Corner_Up"
+       label="Outer Eye Corner"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="4"
+       label_min="Corner Down"
+       label_max="Corner Up"
+       value_min="-1.3"
+       value_max="1.2"
+       camera_elevation=".1"
+       camera_distance=".30">
+         <param_morph />
+      </param>
+
+	  <param
+       id="880"
+       group="0"
+       name="Eyelid_Inner_Corner_Up"
+       label="Inner Eye Corner"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="4.2"
+       label_min="Corner Down"
+       label_max="Corner Up"
+       value_min="-1.3"
+       value_max="1.2"
+       camera_elevation=".1"
+       camera_distance=".30">
+         <param_morph />
+      </param>
+ 
+      <param
+       id="653"
+       group="0"
+       name="Tall_Lips"
+       wearable="shape"
+       label="Lip Fullness"
+	   show_simple="true"
+       edit_group="shape_mouth"
+       edit_group_order="2"
+       label_min="Less Full"
+       label_max="More Full"
+       value_min="-1"
+       value_max="2"
+       camera_distance=".3"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="656"
+       group="0"
+       name="Crooked_Nose"
+       wearable="shape"
+       label="Crooked Nose"
+       edit_group="shape_nose"
+       edit_group_order="9"
+       label_min="Nose Left"
+       label_max="Nose Right"
+       value_min="-2"
+       value_max="2"
+       camera_distance=".3"
+       camera_elevation=".04"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="657"
+       group="1"
+       name="Smile_Mouth"
+       wearable="shape"
+       label="Mouth Corner"
+       edit_group="shape_mouth"
+       label_min="Corner Normal"
+       label_max="Corner Up"
+       value_min="0"
+       value_max="1.4"
+       camera_distance=".3"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="658"
+       group="1"
+       name="Frown_Mouth"
+       wearable="shape"
+       label="Mouth Corner"
+       edit_group="shape_mouth"
+       label_min="Corner Normal"
+       label_max="Corner Down"
+       value_min="0"
+       value_max="1.2"
+       camera_distance=".3"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="797"
+       group="1"
+       name="Fat_Upper_Lip"
+       wearable="shape"
+       label="Fat Upper Lip"
+       edit_group="shape_mouth"
+       label_min="Normal Upper"
+       label_max="Fat Upper"
+       value_min="0"
+       value_max="1.5"
+       camera_distance=".3"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="798"
+       group="1"
+       name="Fat_Lower_Lip"
+       wearable="shape"
+       label="Fat Lower Lip"
+       edit_group="shape_mouth"
+       label_min="Normal Lower"
+       label_max="Fat Lower"
+       value_min="0"
+       value_max="1.5"
+       camera_distance=".3"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="660"
+       group="1"
+       name="Shear_Head"
+       wearable="shape"
+       label="Shear Face"
+       edit_group="shape_head"
+       label_min="Shear Left"
+       label_max="Shear Right"
+       value_min="-2"
+       value_max="2"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="770"
+       group="1"
+       name="Elongate_Head"
+       wearable="shape"
+       label="Shear Face"
+       edit_group="shape_head"
+       label_min="Flat Head"
+       label_max="Long Head"
+       value_min="-1"
+       value_max="1"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04">
+         <param_morph>
+			<volume_morph
+				name="HEAD"
+				scale="0.02 0.0 0.0"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="663"
+       group="0"
+       name="Shift_Mouth"
+       wearable="shape"
+       label="Shift Mouth"
+       edit_group="shape_mouth"
+       edit_group_order="7"
+       label_min="Shift Left"
+       label_max="Shift Right"
+       value_min="-2"
+       value_max="2"
+       value_default="0"
+       camera_distance=".35"
+       camera_elevation=".04"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="664"
+       group="0"
+       name="Pop_Eye"
+       wearable="shape"
+       label="Eye Pop"
+       edit_group="shape_eyes"
+       edit_group_order="8"
+       label_min="Pop Right Eye"
+       label_max="Pop Left Eye"
+       value_min="-1.3"
+       value_max="1.3"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_morph />
+      </param>
+
+      <param
+       id="760"
+       group="0"
+       name="Jaw_Angle"
+       wearable="shape"
+       label="Jaw Angle"
+       edit_group="shape_chin"
+       edit_group_order="3.5"
+       label_min="Low Jaw"
+       label_max="High Jaw"
+       value_min="-1.2"
+       value_max="2"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04"
+       camera_angle="70">
+         <param_morph />
+      </param>
+
+      <param
+       id="665"
+       group="0"
+       name="Jaw_Jut"
+       wearable="shape"
+       label="Jaw Jut"
+       edit_group="shape_chin"
+       edit_group_order="4"
+       label_min="Overbite"
+       label_max="Underbite"
+       value_min="-2"
+       value_max="2"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04"
+       camera_angle="70">
+         <param_morph />
+      </param>
+
+      <param
+       id="686"
+       group="1"
+       name="Head_Eyes_Big"
+       wearable="shape"
+       label="Eye Size"
+       edit_group="shape_eyes"
+       label_min="Beady Eyes"
+       label_max="Anime Eyes"
+       show_simple="true"
+       value_min="-2"
+       value_max="2"
+       value_default="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="767"
+       group="1"
+       name="Bug_Eyed_Head"
+       wearable="shape"
+       label="Eye Depth"
+       edit_group="shape_eyes"
+       edit_group_order="4.5"
+       label_min="Sunken Eyes"
+       label_max="Bug Eyes"
+       value_min="-2"
+       value_max="2"
+       value_default="0">
+         <param_morph />
+      </param>
+
+<!--
+         #Fat_Lips = Fat_Lips 34 1 0 1
+         #Wide_Lips = Wide_Lips 35 1 0 1
+         #Wide_Nose = Wide_Nose 36 1 0 1
+   -->
+<!--
+        ##############
+        # Facial Expression morphs 
+        ##############
+        -->
+      <param
+       id="300"
+       group="1"
+       name="Express_Closed_Mouth"
+       value_default="1"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="301"
+       group="1"
+       name="Express_Tongue_Out"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="302"
+       group="1"
+       name="Express_Surprise_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="303"
+       group="1"
+       name="Express_Wink_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="304"
+       group="1"
+       name="Express_Embarrassed_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="305"
+       group="1"
+       name="Express_Shrug_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="306"
+       group="1"
+       name="Express_Kiss"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="307"
+       group="1"
+       name="Express_Bored_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="308"
+       group="1"
+       name="Express_Repulsed_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="309"
+       group="1"
+       name="Express_Disdain"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="310"
+       group="1"
+       name="Express_Afraid_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="311"
+       group="1"
+       name="Express_Worry_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="312"
+       group="1"
+       name="Express_Cry_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="313"
+       group="1"
+       name="Express_Sad_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="314"
+       group="1"
+       name="Express_Anger_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="315"
+       group="1"
+       name="Express_Frown"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="316"
+       group="1"
+       name="Express_Laugh_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="317"
+       group="1"
+       name="Express_Toothsmile"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="318"
+       group="1"
+       name="Express_Smile"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="632"
+       group="1"
+       name="Express_Open_Mouth"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        ##############
+        # Lipsync morphs
+        ##############
+        -->
+
+      <param
+       id="70"
+       group="1"
+       name="Lipsync_Aah"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="71"
+       group="1"
+       name="Lipsync_Ooh"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        ##############
+        # other morphs (not user controlled)
+        ##############
+        -->
+      <param
+       id="40"
+       group="1"
+       name="Male_Head"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="41"
+       group="1"
+       name="Old"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        ##############
+        # animatable morphs
+        ##############
+         -->
+      <param
+       id="51"
+       group="1"
+       name="Furrowed_Eyebrows"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="53"
+       group="1"
+       name="Surprised_Eyebrows"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="54"
+       group="1"
+       name="Worried_Eyebrows"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="55"
+       group="1"
+       name="Frown_Mouth"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="57"
+       group="1"
+       name="Smile_Mouth"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="58"
+       group="1"
+       name="Blink_Left"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="59"
+       group="1"
+       name="Blink_Right"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        #end morph targets
+         -->
+   </mesh>
+
+   <mesh
+    type="headMesh"
+	lod="1"
+    file_name="avatar_head_1.llm"
+    min_pixel_width="160"
+    reference="avatar_head.llm">
+   </mesh>
+
+   <mesh
+    type="headMesh"
+	lod="2"
+    file_name="avatar_head_2.llm"
+    min_pixel_width="80"
+    reference="avatar_head.llm">
+   </mesh>
+
+   <mesh
+    type="headMesh"
+	lod="3"
+    file_name="avatar_head_3.llm"
+    min_pixel_width="40"
+    reference="avatar_head.llm">
+   </mesh>
+
+   <mesh
+    type="headMesh"
+	lod="4"
+    file_name="avatar_head_4.llm"
+	min_pixel_width="0"
+    reference="avatar_head.llm">
+   </mesh>
+
+   <mesh
+    type="eyelashMesh"
+	lod="0"
+    file_name="avatar_eyelashes.llm"
+    min_pixel_width="320">
+      <param
+       shared="1"
+       id="660"
+       group="1"
+       name="Shear_Head"
+       wearable="shape"
+       label="Shear Face"
+       edit_group="shape_head"
+       label_min="Shear Left"
+       label_max="Shear Right"
+       value_min="-2"
+       value_max="2"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="770"
+       group="1"
+       name="Elongate_Head"
+       wearable="shape"
+       label="Shear Face"
+       edit_group="shape_head"
+       label_min="Flat Head"
+       label_max="Long Head"
+       value_min="-1"
+       value_max="1"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="664"
+       group="0"
+       name="Pop_Eye"
+       wearable="shape"
+       label="Eye Pop"
+       edit_group="shape_eyes"
+       edit_group_order="8"
+       label_min="Pop Right Eye"
+       label_max="Pop Left Eye"
+       value_min="-2"
+       value_max="2"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="21"
+       group="0"
+       name="Upper_Eyelid_Fold"
+       label="Upper Eyelid Fold"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Uncreased"
+       label_max="Creased"
+       value_min="-0.2"
+       value_max="1.3"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="24"
+       group="0"
+       name="Wide_Eyes"
+       label="Eye Opening"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Narrow"
+       label_max="Wide"
+       show_simple="true"
+       value_min="-1.5"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="186"
+       group="1"
+       name="Egg_Head"
+       label="Egg Head"
+       wearable="shape"
+       edit_group="shape_head"
+       label_min="Chin Heavy"
+       label_max="Forehead Heavy"
+       value_min="-1.3"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="187"
+       group="1"
+       name="Squash_Stretch_Head"
+       label="Squash/Stretch Head"
+       wearable="shape"
+       edit_group="shape_head"
+       label_min="Squash Head"
+       label_max="Stretch Head"
+       value_min="-.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="194"
+       group="1"
+       name="Eye_Spread"
+       edit_group="shape_eyes"
+       label_min="Eyes Together"
+       label_max="Eyes Spread"
+       value_min="-2"
+       value_max="2">
+         <param_morph />
+      </param>
+
+      <param
+       id="518"
+       group="0"
+       name="Eyelashes_Long"
+       wearable="shape"
+       label="Eyelash Length"
+       edit_group="shape_eyes"
+       edit_group_order="7"
+       label_min="Short"
+       label_max="Long"
+       value_min="-.3"
+       value_max="1.5"
+       camera_elevation=".1"
+       camera_distance=".30"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="650"
+       group="0"
+       name="Eyelid_Corner_Up"
+       label="Outer Eye Corner"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Corner Down"
+       label_max="Corner Up"
+       value_min="-1.3"
+       value_max="1.2"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_morph />
+      </param>
+      
+      <param
+       shared="1"
+       id="880"
+       group="0"
+       name="Eyelid_Inner_Corner_Up"
+       label="Inner Eye Corner"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Corner Down"
+       label_max="Corner Up"
+       value_min="-1.3"
+       value_max="1.2"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="686"
+       group="1"
+       name="Head_Eyes_Big"
+       wearable="shape"
+       label="Eye Size"
+       edit_group="shape_eyes"
+       label_min="Beady Eyes"
+       label_max="Anime Eyes"
+       value_min="-2"
+       value_max="2"
+	   show_simple="true"
+       value_default="0">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="767"
+       group="1"
+       name="Bug_Eyed_Head"
+       wearable="shape"
+       label="Eye Depth"
+       edit_group="shape_eyes"
+       edit_group_order="4.5"
+       label_min="Sunken Eyes"
+       label_max="Bug Eyes"
+       value_min="-2"
+       value_max="2"
+       value_default="0">
+         <param_morph />
+      </param>
+
+<!--
+        ##############
+        # Facial Expression morphs 
+        ##############
+        -->
+      <param
+       shared="1"
+       id="301"
+       group="1"
+       name="Express_Tongue_Out"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="302"
+       group="1"
+       name="Express_Surprise_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="303"
+       group="1"
+       name="Express_Wink_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="304"
+       group="1"
+       name="Express_Embarrassed_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="305"
+       group="1"
+       name="Express_Shrug_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="306"
+       group="1"
+       name="Express_Kiss"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="307"
+       group="1"
+       name="Express_Bored_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="308"
+       group="1"
+       name="Express_Repulsed_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="309"
+       group="1"
+       name="Express_Disdain"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="310"
+       group="1"
+       name="Express_Afraid_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="312"
+       group="1"
+       name="Express_Cry_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="313"
+       group="1"
+       name="Express_Sad_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="314"
+       group="1"
+       name="Express_Anger_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="315"
+       group="1"
+       name="Express_Frown"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="316"
+       group="1"
+       name="Express_Laugh_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="317"
+       group="1"
+       name="Express_Toothsmile"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="318"
+       group="1"
+       name="Express_Smile"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        ##############
+        # other morphs (not user controlled)
+        ##############
+        -->
+      <param
+       shared="1"
+       id="41"
+       group="1"
+       name="Old"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        ##############
+        # animatable morphs
+        ##############
+         -->
+      <param
+       shared="1"
+       id="58"
+       group="1"
+       name="Blink_Left"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="59"
+       group="1"
+       name="Blink_Right"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+   </mesh>
+
+<!--
+    #headMesh2 =
+    #headMesh3 =
+    -->
+   <mesh
+    type="upperBodyMesh"
+	lod="0"
+    file_name="avatar_upper_body.llm"
+    min_pixel_width="320">
+<!--
+        #begin morph targets
+        #############
+        # tweakable morphs
+        #############
+        -->
+      <param
+       id="104"
+       group="1"
+       name="Big_Belly_Torso"
+       value_min="0"
+       value_max="1">
+         <param_morph>
+		 	<volume_morph
+				name="BELLY"
+				scale="0.075 0.04 0.03"
+				pos="0.07 0 -0.07"/>
+		</param_morph>
+      </param>
+
+      <param
+       id="626"
+       sex="female"
+       group="1"
+       name="Big_Chest"
+       label="Chest Size"
+       wearable="shape"
+       edit_group="shape_torso"
+       label_min="Small"
+       label_max="Large"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance="1"
+       camera_angle="15">
+         <param_morph />
+      </param>
+
+      <param
+       id="627"
+       sex="female"
+       group="1"
+       name="Small_Chest"
+       label="Chest Size"
+       wearable="shape"
+       edit_group="shape_torso"
+       label_min="Large"
+       label_max="Small"
+       value_min="0"
+       value_max="1"
+       camera_elevation="0"
+       camera_distance=".28">
+         <param_morph />
+      </param>
+
+      <param
+       id="843"
+       sex="female"
+       group="1"
+       name="No_Chest"
+       label="Chest Size"
+       wearable="shape"
+       edit_group="shape_torso"
+       label_min="Some"
+       label_max="None"
+       value_min="0"
+       value_max="1"
+       camera_elevation="0"
+       camera_distance=".28">
+         <param_morph />
+      </param>
+
+      <param
+       id="106"
+       group="1"
+       name="Muscular_Torso"
+       label="Torso Muscles"
+	   show_simple="true"
+       wearable="shape"
+       edit_group="shape_torso"
+       label_min="Regular"
+       label_max="Muscular"
+       value_min="0"
+       value_max="1.4"
+       camera_elevation=".3"
+       camera_distance="1.2">
+         <param_morph>
+		 	<volume_morph
+				name="L_CLAVICLE"
+				scale="0.02 0.0 0.005"
+				pos="0.0 0 0.005"/>
+		 	<volume_morph
+				name="L_UPPER_ARM"
+				scale="0.015 0.0 0.005"
+				pos="0.015 0 0"/>
+		 	<volume_morph
+				name="L_LOWER_ARM"
+				scale="0.005 0.0 0.005"
+				pos="0.005 0 0"/>
+		 	<volume_morph
+				name="R_CLAVICLE"
+				scale="0.02 0.0 0.005"
+				pos="0.0 0 0.005"/>
+		 	<volume_morph
+				name="R_UPPER_ARM"
+				scale="0.015 0.0 0.005"
+				pos="0.015 0 0"/>
+		 	<volume_morph
+				name="R_LOWER_ARM"
+				scale="0.005 0.0 0.005"
+				pos="0.005 0 0"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="648"
+       group="1"
+       sex="female"
+       name="Scrawny_Torso"
+       label="Torso Muscles"
+	   show_simple="true"
+       wearable="shape"
+       edit_group="shape_torso"
+       label_min="Regular"
+       label_max="Scrawny"
+       value_min="0"
+       value_max="1.3"
+       camera_elevation=".3"
+       camera_distance="1.2">
+		<param_morph>
+		 	<volume_morph
+				name="BELLY"
+				scale="0.0 -0.01 0.0"
+				pos="0.0 0.0 0"/>
+		 	<volume_morph
+				name="CHEST"
+				scale="-0.01 -0.01 0.0"
+				pos="0.01 0.0 0"/>
+		 	<volume_morph
+				name="L_CLAVICLE"
+				scale="0.0 -0.03 -0.005"
+				pos="0.0 0 -0.005"/>
+		 	<volume_morph
+				name="L_UPPER_ARM"
+				scale="-0.01 -0.01 -0.02"
+				pos="0 0 0"/>
+		 	<volume_morph
+				name="L_LOWER_ARM"
+				scale="-0.005 0.0 -0.01"
+				pos="-0.005 0 0"/>
+		 	<volume_morph
+				name="R_CLAVICLE"
+				scale="0.0 -0.03 -0.005"
+				pos="0.0 0 -0.005"/>
+		 	<volume_morph
+				name="R_UPPER_ARM"
+				scale="-0.01 -0.01 -0.02"
+				pos="0 0 0"/>
+		 	<volume_morph
+				name="R_LOWER_ARM"
+				scale="-0.005 0.0 -0.01"
+				pos="-0.005 0 0"/>
+		</param_morph>
+	  </param>
+
+      <param
+       id="677"
+       group="1"
+       sex="male"
+       name="Scrawny_Torso_Male"
+       label="Torso Scrawny"
+       wearable="shape"
+       edit_group="shape_torso"
+       label_min="Regular"
+       label_max="Scrawny"
+       value_min="0"
+       value_max="1.3"
+       camera_elevation=".3"
+       camera_distance="1.2">
+		<param_morph>
+		 	<volume_morph
+				name="BELLY"
+				scale="-0.01 -0.01 0.0"
+				pos="0.01 0.0 0"/>
+		 	<volume_morph
+				name="CHEST"
+				scale="-0.02 -0.02 0.0"
+				pos="0.01 0.0 0"/>
+		 	<volume_morph
+				name="L_CLAVICLE"
+				scale="0.0 -0.03 -0.005"
+				pos="0.0 0 -0.005"/>
+		 	<volume_morph
+				name="L_UPPER_ARM"
+				scale="-0.01 -0.01 -0.02"
+				pos="0 0 0"/>
+		 	<volume_morph
+				name="L_LOWER_ARM"
+				scale="-0.005 0.0 -0.01"
+				pos="-0.005 0 0"/>
+		 	<volume_morph
+				name="R_CLAVICLE"
+				scale="0.0 -0.03 -0.005"
+				pos="0.0 0 -0.005"/>
+		 	<volume_morph
+				name="R_UPPER_ARM"
+				scale="-0.01 -0.01 -0.02"
+				pos="0 0 0"/>
+		 	<volume_morph
+				name="R_LOWER_ARM"
+				scale="-0.005 0.0 -0.01"
+				pos="-0.005 0 0"/>
+		</param_morph>
+	  </param>
+
+      <param
+       id="634"
+       group="1"
+       name="Fat_Torso"
+       label="Fat Torso"
+       wearable="shape"
+       edit_group="shape_body"
+       label_min="skinny"
+       label_max="fat"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".3">
+         <param_morph>
+			<volume_morph
+				name="CHEST"
+				scale="0.02 0.03 0.03"
+				pos="0 0 -0.03"/>
+			<volume_morph
+				name="BELLY"
+				scale="0.09 0.08 0.07"
+				pos="0 0 -0.05"/>
+			<volume_morph
+				name="L_CLAVICLE"
+				scale="0.0 0.0 0.015"/>
+			<volume_morph
+				name="L_UPPER_ARM"
+				scale="0.02 0.0 0.02"
+				pos="0.0 0.0 -0.02"/>
+			<volume_morph
+				name="L_LOWER_ARM"
+				scale="0.01 0.0 0.01"
+				pos="0.0 0.0 -0.01"/>
+			<volume_morph
+				name="R_CLAVICLE"
+				scale="0.0 0.0 0.015"/>
+			<volume_morph
+				name="R_UPPER_ARM"
+				scale="0.02 0.0 0.02"
+				pos="0.0 0.0 -0.02"/>
+			<volume_morph
+				name="R_LOWER_ARM"
+				scale="0.01 0.0 0.01"
+				pos="0.0 0.0 -0.01"/>
+			<volume_morph
+				name="NECK"
+				scale="0.015 0.01 0.0"/>
+			<volume_morph
+				name="HEAD"
+				scale="0.0 0.0 0.01"
+				pos="0 0 -0.01"/>
+		 </param_morph>
+
+      </param>
+
+      <param
+       id="507"
+       group="0"
+       sex="female"
+       name="Breast_Gravity"
+       label="Breast Buoyancy"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="7"
+       label_min="Less Gravity"
+       label_max="More Gravity"
+       value_default="0"
+       value_min="-1.5"
+       value_max="2"
+       camera_elevation=".3"
+       camera_distance=".8">
+         <param_morph />
+      </param>
+
+      <param
+       id="628"
+       group="1"
+       name="Displace_Loose_Upperbody"
+       label="Shirt Fit"
+       wearable="shirt"
+       edit_group="driven"
+       clothing_morph="true"
+       value_min="0"
+       value_max="1"
+       value_default="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="840"
+       group="0"
+       name="Shirtsleeve_flair"
+       label="Sleeve Looseness"
+	   show_simple="true"
+       wearable="shirt"
+       edit_group="shirt"
+       edit_group_order="6"
+       clothing_morph="true"
+       label_min="Tight Sleeves"
+       label_max="Loose Sleeves"
+       value_min="0"
+       value_max="1.5"
+       camera_distance="1.8"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_morph />
+      </param>
+
+      <param
+       id="855"
+       group="1"
+       name="Love_Handles"
+       value_default="0"
+       value_min="-1"
+       value_max="2">
+         <param_morph>
+		 	<volume_morph
+				name="BELLY"
+				scale="0.0 0.02 0.0"/>
+		</param_morph>
+      </param>
+
+      <param
+       id="684"
+       group="0"
+       sex="female"
+       name="Breast_Female_Cleavage"
+       label="Breast Cleavage"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="8"
+       label_min="Separate"
+       label_max="Join"
+       value_default="0"
+       value_min="-.3"
+       value_max="1.3"
+       camera_elevation=".3"
+       camera_distance=".8">
+         <param_morph />
+      </param>
+
+      <param
+       id="685"
+       group="0"
+       sex="male"
+       name="Chest_Male_No_Pecs"
+       label="Pectorals"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="5"
+       label_min="Big Pectorals"
+       label_max="Sunken Chest"
+       value_default="0"
+       value_min="-.5"
+       value_max="1.1"
+       camera_elevation=".3"
+       camera_distance="1.2">
+         <param_morph />
+      </param>
+
+<!-- ############# # 
+  other morphs (not user controlled) 
+  ############# -->
+      <param
+       id="100"
+       group="1"
+       name="Male_Torso"
+       label_min="Male_Torso"
+       value_min="0"
+       value_max="1">
+        <param_morph>
+			<volume_morph
+				name="CHEST"
+				scale="0.03 0.04 0.02"
+				pos="-0.03 0 -0.01"/>
+			<volume_morph
+				name="BELLY"
+				scale="0.03 0.03 0.0"
+				pos="-0.03 0 0.02"/>
+			<volume_morph
+				name="L_CLAVICLE"
+				scale="0.02 0.0 0.01"
+				pos="-0.02 0 0"/>
+			<volume_morph
+				name="L_UPPER_ARM"
+				scale="0.01 0.0 0.01"
+				pos="0.0 0.0 -0.01"/>
+			<volume_morph
+				name="L_LOWER_ARM"
+				scale="0.005 0.0 0.005"
+				pos="0.0 0.0 -0.005"/>
+			<volume_morph
+				name="R_CLAVICLE"
+				scale="0.02 0.0 0.01"
+				pos="-0.02 0 0"/>
+			<volume_morph
+				name="R_UPPER_ARM"
+				scale="0.01 0.0 0.01"
+				pos="0.0 0.0 -0.01"/>
+			<volume_morph
+				name="R_LOWER_ARM"
+				scale="0.005 0.0 0.005"
+				pos="0.0 0.0 -0.005"/>
+			<volume_morph
+				name="NECK"
+				scale="0.015 0.01 0.0"/>
+			<volume_morph
+				name="HEAD"
+				scale="0.0 0.0 0.01"
+				pos="0 0 -0.01"/>
+		 </param_morph>
+	</param>
+
+<!--
+        ##############
+        # animatable morphs
+        ##############
+        -->
+      <param
+       id="101"
+       group="1"
+       name="Hands_Relaxed"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="102"
+       group="1"
+       name="Hands_Point"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="103"
+       group="1"
+       name="Hands_Fist"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="666"
+       group="1"
+       name="Hands_Relaxed_L"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="667"
+       group="1"
+       name="Hands_Point_L"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="668"
+       group="1"
+       name="Hands_Fist_L"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="669"
+       group="1"
+       name="Hands_Relaxed_R"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="670"
+       group="1"
+       name="Hands_Point_R"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="671"
+       group="1"
+       name="Hands_Fist_R"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="672"
+       group="1"
+       name="Hands_Typing"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="766"
+       group="1"
+       name="Hands_Salute_R"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="791"
+       group="1"
+       name="Hands_Peace_R"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="792"
+       group="1"
+       name="Hands_Spread_R"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+     #end morph targets
+      -->
+   </mesh>
+
+   <mesh
+    type="upperBodyMesh"
+	lod="1"
+    file_name="avatar_upper_body_1.llm"
+    min_pixel_width="160"
+    reference="avatar_upper_body.llm">
+   </mesh>
+
+   <mesh
+    type="upperBodyMesh"
+	lod="2"
+    file_name="avatar_upper_body_2.llm"
+    min_pixel_width="80"
+    reference="avatar_upper_body.llm">
+   </mesh>
+
+   <mesh
+    type="upperBodyMesh"
+	lod="3"
+    file_name="avatar_upper_body_3.llm"
+    min_pixel_width="40"
+    reference="avatar_upper_body.llm">
+   </mesh>
+
+   <mesh
+    type="upperBodyMesh"
+	lod="4"
+    file_name="avatar_upper_body_4.llm"
+	min_pixel_width="0"
+    reference="avatar_upper_body.llm">
+   </mesh>
+
+<!--
+    #upperBodyMesh2 =
+    #upperBodyMesh3 =
+    -->
+   <mesh
+    type="lowerBodyMesh"
+	lod="0"
+    file_name="avatar_lower_body.llm"
+    min_pixel_width="320">
+<!--
+        #begin morph targets
+        #############
+        # tweakable morphs
+        #############
+        -->
+      <param
+       id="156"
+       group="1"
+       name="Big_Belly_Legs"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="151"
+       group="1"
+       name="Big_Butt_Legs"
+       label="Butt Size"
+       wearable="shape"
+       edit_group="shape_legs"
+       label_min="Regular"
+       label_max="Large"
+       value_min="0"
+       value_max="1">
+         <param_morph>
+		 	<volume_morph
+				name="PELVIS"
+				scale="0.03 0.0 0.02"
+				pos="-0.03 0 -0.025"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="794"
+       group="1"
+       name="Small_Butt"
+       label="Butt Size"
+       wearable="shape"
+       edit_group="shape_legs"
+       label_min="Regular"
+       label_max="Small"
+       value_min="0"
+       value_max="1">
+         <param_morph>
+ 		 	<volume_morph
+				name="PELVIS"
+				scale="-0.01 0.0 0.0"
+				pos="0.01 0 0.0"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="152"
+       group="1"
+       name="Muscular_Legs"
+       label="Leg Muscles"
+	   show_simple="true"
+       wearable="shape"
+       edit_group="shape_legs"
+       label_min="Regular Muscles"
+       label_max="More Muscles"
+       value_min="0"
+       value_max="1.5"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_morph>
+		 	<volume_morph
+				name="L_UPPER_LEG"
+				scale="0.015 0.015 0.0"
+				pos="0.0 0 0.0"/>
+		 	<volume_morph
+				name="L_LOWER_LEG"
+				scale="0.01 0.01 0.0"
+				pos="0.0 0 0.0"/>
+		 	<volume_morph
+				name="R_UPPER_LEG"
+				scale="0.015 0.015 0.0"
+				pos="0.0 0 0.0"/>
+		 	<volume_morph
+				name="R_LOWER_LEG"
+				scale="0.01 0.01 0.0"
+				pos="0.0 0 0.0"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="651"
+       group="1"
+       name="Scrawny_Legs"
+       label="Scrawny Leg"
+       wearable="shape"
+       edit_group="shape_legs"
+       label_min="Regular Muscles"
+       label_max="Less Muscles"
+       value_min="0"
+       value_max="1.5"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_morph>
+		 	<volume_morph
+				name="L_UPPER_LEG"
+				scale="-0.03 -0.03 0.0"
+				pos="0.0 0 0.0"/>
+		 	<volume_morph
+				name="L_LOWER_LEG"
+				scale="-0.015 -0.015 0.0"
+				pos="0.0 0 0.0"/>
+		 	<volume_morph
+				name="R_UPPER_LEG"
+				scale="-0.03 -0.03 0.0"
+				pos="0.0 0 0.0"/>
+		 	<volume_morph
+				name="R_LOWER_LEG"
+				scale="-0.015 -0.015 0.0"
+				pos="0.0 0 0.0"/>
+		 </param_morph>
+		</param>
+
+      <param
+       id="853"
+       group="1"
+       name="Bowed_Legs"
+       label="Knee Angle"
+       wearable="shape"
+       value_min="-1"
+       value_max="1">
+         <param_morph>
+		 	<volume_morph
+				name="L_UPPER_LEG"
+				pos="0.0 0.03 0.0"/>
+		 	<volume_morph
+				name="L_LOWER_LEG"
+				pos="0.0 0.03 0.0"/>
+		 	<volume_morph
+				name="R_UPPER_LEG"
+				pos="0.0 -0.03 0.0"/>
+		 	<volume_morph
+				name="R_LOWER_LEG"
+				pos="0.0 -0.03 0.0"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="500"
+       group="1"
+       name="Shoe_Heel_Height"
+       label="Heel Height"
+       wearable="shoes"
+       edit_group="shoes"
+       label_min="Low Heels"
+       label_max="High Heels"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.5"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="501"
+       group="1"
+       name="Shoe_Platform_Height"
+       label="Platform Height"
+       wearable="shoes"
+       edit_group="shoes"
+       label_min="Low Platforms"
+       label_max="High Platforms"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.5"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="508"
+       group="0"
+       name="Shoe_Platform_Width"
+       label="Platform Width"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="7"
+       label_min="Narrow"
+       label_max="Wide"
+       value_min="-1"
+       value_max="2"
+       camera_angle="15"
+       camera_distance="1.5"
+       camera_elevation="-1">
+         <param_morph />
+      </param>
+
+      <param
+       id="509"
+       group="1"
+       name="Shoe_Heel_Point"
+       label="Heel Shape"
+       wearable="shoes"
+       edit_group="shoes"
+       label_min="Default Heels"
+       label_max="Pointy Heels"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="510"
+       group="1"
+       name="Shoe_Heel_Thick"
+       label="Heel Shape"
+       wearable="shoes"
+       edit_group="shoes"
+       label_min="default Heels"
+       label_max="Thick Heels"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="511"
+       group="1"
+       name="Shoe_Toe_Point"
+       label="Toe Shape"
+       wearable="shoes"
+       edit_group="shoes"
+       label_min="Default Toe"
+       label_max="Pointy Toe"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="512"
+       group="1"
+       name="Shoe_Toe_Square"
+       label="Toe Shape"
+       wearable="shoes"
+       edit_group="shoes"
+       label_min="Default Toe"
+       label_max="Square Toe"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.5"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="654"
+       group="0"
+       name="Shoe_Toe_Thick"
+       label="Toe Thickness"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="5"
+       label_min="Flat Toe"
+       label_max="Thick Toe"
+       value_min="0"
+       value_max="2"
+       camera_angle="15"
+       camera_distance="1.5"
+       camera_elevation="-1">
+         <param_morph />
+      </param>
+
+      <param
+       id="515"
+       group="0"
+       name="Foot_Size"
+       label="Foot Size"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="6"
+       label_min="Small"
+       label_max="Big"
+       value_min="-1"
+       value_max="3"
+       camera_angle="45"
+       camera_distance="1.1"
+       camera_elevation="-1">
+         <param_morph>
+		 	<volume_morph
+				name="L_FOOT"
+				scale="0.02 0.01 0.0"
+				pos="0.01 0 0"/>
+		 	<volume_morph
+				name="R_FOOT"
+				scale="0.02 0.01 0.0"
+				pos="0.01 0 0"/>
+		</param_morph>
+	  </param>
+
+      <param
+       id="516"
+       group="1"
+       name="Displace_Loose_Lowerbody"
+       label="Pants Fit"
+       wearable="pants"
+       edit_group="driven"
+       clothing_morph="true"
+       value_min="0"
+       value_max="1"
+       value_default="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="625"
+       group="0"
+       name="Leg_Pantflair"
+       label="Cuff Flare"
+	   show_simple="true"
+       wearable="pants"
+       edit_group="pants"
+       edit_group_order="3"
+       clothing_morph="true"
+       label_min="Tight Cuffs"
+       label_max="Flared Cuffs"
+       value_min="0"
+       value_max="1.5"
+       camera_distance="1.8"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_morph />
+      </param>
+
+      <param
+       id="793"
+       group="1"
+       name="Leg_Longcuffs"
+       label="Longcuffs"
+       wearable="pants"
+       edit_group="driven"
+       clothing_morph="true"
+       value_min="0"
+       value_max="3"
+       value_default="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="638"
+       group="0"
+       name="Low_Crotch"
+       label="Pants Crotch"
+       wearable="pants"
+       clothing_morph="true"
+       edit_group="pants"
+       edit_group_order="4"
+       label_min="High and Tight"
+       label_max="Low and Loose"
+       value_min="0"
+       value_max="1.3"
+       camera_distance="1.2"
+       camera_angle="-20"
+       camera_elevation="-.3">
+         <param_morph />
+      </param>
+
+      <param
+       id="635"
+       group="1"
+       name="Fat_Legs"
+       label="Fat Torso"
+       wearable="shape"
+       edit_group="shape_body"
+       label_min="skinny"
+       label_max="fat"
+       value_min="0"
+       value_max="1">
+         <param_morph>
+			<volume_morph
+				name="PELVIS"
+				scale="0.03 0.06 0.0"/>
+		 	<volume_morph
+				name="R_UPPER_LEG"
+				scale="0.02 0.02 0.0"
+				pos="0.0 -0.02 0.0"/>
+			<volume_morph
+				name="R_LOWER_LEG"
+				scale="0.01 0.01 0.0"/>
+		 	<volume_morph
+				name="L_UPPER_LEG"
+				scale="0.02 0.02 0.0"
+				pos="0.0 0.02 0.0"/>
+			<volume_morph
+				name="L_LOWER_LEG"
+				scale="0.01 0.01 0.0"/>
+		</param_morph>
+      </param>
+
+      <param
+       id="854"
+       group="1"
+       name="Saddlebags"
+       value_min="-.5"
+       value_max="3">
+        <param_morph>
+		 	<volume_morph
+				name="PELVIS"
+				scale="0.0 0.025 0.0"/>
+		</param_morph>
+
+      </param>
+
+      <param
+       id="879"
+       group="0"
+       sex="male"
+       name="Male_Package"
+       label="Package"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="4.6"
+       label_min="Coin Purse"
+       label_max="Duffle Bag"
+       value_default="0"
+       value_min="-.5"
+       value_max="2"
+       camera_angle="60"
+       camera_distance=".6">
+         <param_morph />
+      </param>
+
+<!--
+        #############
+        # other morphs (not user controlled)
+        #############
+        -->
+      <param
+       id="153"
+       group="1"
+       name="Male_Legs"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        #end morph targets
+        -->
+   </mesh>
+
+   <mesh
+    type="lowerBodyMesh"
+	lod="1"
+    file_name="avatar_lower_body_1.llm"
+    min_pixel_width="160"
+    reference="avatar_lower_body.llm">
+   </mesh>
+
+   <mesh
+    type="lowerBodyMesh"
+	lod="2"
+    file_name="avatar_lower_body_2.llm"
+    min_pixel_width="80"
+    reference="avatar_lower_body.llm">
+   </mesh>
+
+   <mesh
+    type="lowerBodyMesh"
+	lod="3"
+    file_name="avatar_lower_body_3.llm"
+    min_pixel_width="40"
+    reference="avatar_lower_body.llm">
+   </mesh>
+
+   <mesh
+    type="lowerBodyMesh"
+	lod="4"
+    file_name="avatar_lower_body_4.llm"
+	min_pixel_width="0"
+    reference="avatar_lower_body.llm">
+   </mesh>
+
+<!--
+    #lowerBodyMesh2 =
+    #lowerBodyMesh3 =
+    -->
+<!--
+    #eyeLidLeftMesh =
+    -->
+   <mesh
+    type="eyeBallLeftMesh"
+	lod="0"
+    file_name="avatar_eye.llm"
+    min_pixel_width="320">
+<!-- begin morph_params -->
+      <param
+       id="679"
+       group="1"
+       name="Eyeball_Size"
+       label="Eyeball Size"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".10">
+         <param_morph />
+      </param>
+
+      <param
+       id="687"
+       group="1"
+       name="Eyeball_Size"
+       label="Big Eyeball"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".25">
+         <param_morph />
+      </param>
+   </mesh>
+
+   <mesh
+    type="eyeBallLeftMesh"
+	lod="1"
+    file_name="avatar_eye_1.llm"
+    min_pixel_width="80">
+<!-- begin morph_params -->
+      <param
+       id="694"
+       group="1"
+       name="Eyeball_Size"
+       label="Eyeball Size"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".10">
+         <param_morph />
+      </param>
+
+      <param
+       id="695"
+       group="1"
+       name="Eyeball_Size"
+       label="Big Eyeball"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".25">
+         <param_morph />
+      </param>
+   </mesh>
+
+<!--
+    #eyeLidRightMesh =
+    -->
+   <mesh
+    type="eyeBallRightMesh"
+	lod="0"
+    file_name="avatar_eye.llm"
+    min_pixel_width="320">
+<!-- begin morph_params -->
+      <param
+       id="680"
+       group="1"
+       name="Eyeball_Size"
+       label="Eyeball Size"
+       wearable="shape"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".10">
+         <param_morph />
+      </param>
+
+      <param
+       id="688"
+       group="1"
+       name="Eyeball_Size"
+       label="Big Eyeball"
+       wearable="shape"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".25">
+         <param_morph />
+      </param>
+   </mesh>
+
+   <mesh
+    type="eyeBallRightMesh"
+	lod="1"
+    file_name="avatar_eye_1.llm"
+    min_pixel_width="80">
+<!-- begin morph_params -->
+      <param
+       id="681"
+       group="1"
+       name="Eyeball_Size"
+       label="Eyeball Size"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".10">
+         <param_morph />
+      </param>
+
+      <param
+       id="691"
+       group="1"
+       name="Eyeball_Size"
+       label="Big Eyeball"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".25">
+         <param_morph />
+      </param>
+   </mesh>
+
+   <mesh
+    type="skirtMesh"
+	lod="0"
+    file_name="avatar_skirt.llm"
+    min_pixel_width="320">
+      <param
+       id="845"
+       group="1"
+       name="skirt_poofy"
+       label="poofy skirt"
+       clothing_morph="true"
+       wearable="skirt"
+       edit_group="skirt"
+       label_min="less poofy"
+       label_max="more poofy"
+       value_min="0"
+       value_max="1.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="846"
+       group="1"
+       name="skirt_loose"
+       label="loose skirt"
+       clothing_morph="true"
+       wearable="skirt"
+       edit_group="skirt"
+       label_min="form fitting"
+       label_max="loose"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="866"
+       group="1"
+       name="skirt_tight"
+       label="tight skirt"
+       clothing_morph="true"
+       wearable="skirt"
+       edit_group="skirt"
+       label_min="form fitting"
+       label_max="loose"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="867"
+       group="1"
+       name="skirt_smallbutt"
+       label="tight skirt"
+       clothing_morph="false"
+       wearable="skirt"
+       edit_group="skirt"
+       label_min="form fitting"
+       label_max="loose"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="848"
+       group="0"
+       name="skirt_bustle"
+       label="bustle skirt"
+       clothing_morph="true"
+       wearable="skirt"
+       edit_group_order="3"
+       edit_group="skirt"
+       label_min="no bustle"
+       label_max="more bustle"
+       value_min="0"
+       value_max="2"
+       value_default=".2"
+       camera_angle="100"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="847"
+       group="1"
+       name="skirt_bowlegs"
+       label="legs skirt"
+       wearable="skirt"
+       value_min="-1"
+       value_max="1"
+       value_default="0">
+	     <param_morph />
+	  </param>
+
+      <param
+       id="852"
+       group="1"
+       name="skirt_bigbutt"
+       label="bigbutt skirt"
+       label_min="less"
+       label_max="more"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="849"
+       group="1"
+       name="skirt_belly"
+       label="big belly skirt"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="850"
+       group="1"
+       name="skirt_saddlebags"
+       value_min="-.5"
+       value_max="3">
+         <param_morph />
+      </param>
+
+      <param
+       id="851"
+       group="1"
+       name="skirt_chubby"
+       label_min="less"
+       label_max="more"
+       value_min="0"
+       value_max="1"
+       value_default="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="856"
+       group="1"
+       name="skirt_lovehandles"
+       label_min="less"
+       label_max="more"
+       value_min="-1"
+       value_max="2"
+       value_default="0">
+         <param_morph />
+      </param>
+
+<!--
+        #############
+        # other morphs (not user controlled)
+        #############
+        -->
+      <param
+       id="857"
+       group="1"
+       name="skirt_male"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+   </mesh>
+
+   <mesh
+    type="skirtMesh"
+	lod="1"
+    file_name="avatar_skirt_1.llm"
+    min_pixel_width="160"
+    reference="avatar_skirt.llm">
+   </mesh>
+
+   <mesh
+    type="skirtMesh"
+	lod="2"
+    file_name="avatar_skirt_2.llm"
+    min_pixel_width="80"
+    reference="avatar_skirt.llm">
+   </mesh>
+
+   <mesh
+    type="skirtMesh"
+	lod="3"
+    file_name="avatar_skirt_3.llm"
+    min_pixel_width="40"
+    reference="avatar_skirt.llm">
+   </mesh>
+
+   <mesh
+    type="skirtMesh"
+	lod="4"
+    file_name="avatar_skirt_4.llm"
+	min_pixel_width="0"
+    reference="avatar_skirt.llm">
+   </mesh>
+
+<!-- =========================================================== -->
+   <global_color
+    name="skin_color">
+      <param
+       id="111"
+       group="0"
+       wearable="skin"
+       edit_group="skin_color"
+       edit_group_order="1"
+       name="Pigment"
+	   show_simple="true"
+       label_min="Light"
+       label_max="Dark"
+       value_min="0"
+       value_max="1"
+       value_default=".5">
+         <param_color>
+            <value
+             color="252, 215, 200, 255" />
+
+            <value
+             color="240, 177, 112, 255" />
+
+            <value
+             color="90, 40, 16, 255" />
+
+            <value
+             color="29, 9, 6, 255" />
+         </param_color>
+      </param>
+
+      <param
+       id="110"
+       group="0"
+       wearable="skin"
+       edit_group="skin_color"
+       edit_group_order="2"
+       name="Red Skin"
+       label="Ruddiness"
+       label_min="Pale"
+       label_max="Ruddy"
+       value_min="0"
+       value_max="0.1">
+         <param_color
+          operation="blend">
+            <value
+             color="218, 41, 37, 255" />
+         </param_color>
+      </param>
+
+      <param
+       id="108"
+       group="0"
+       wearable="skin"
+       edit_group="skin_color"
+       edit_group_order="3"
+       name="Rainbow Color"
+	   show_simple="true"
+       label_min="None"
+       label_max="Wild"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_color>
+            <value
+             color=" 0, 0, 0, 255" />
+
+            <value
+             color="255, 0, 255, 255" />
+
+            <value
+             color="255, 0, 0, 255" />
+
+            <value
+             color="255, 255, 0, 255" />
+
+            <value
+             color=" 0, 255, 0, 255" />
+
+            <value
+             color=" 0, 255, 255, 255" />
+
+            <value
+             color=" 0, 0, 255, 255" />
+
+            <value
+             color="255, 0, 255, 255" />
+         </param_color>
+      </param>
+   </global_color>
+
+<!-- =========================================================== -->
+   <global_color
+    name="hair_color">
+      <param
+       id="114"
+       group="0"
+       wearable="hair"
+       edit_group="hair_color"
+       edit_group_order="3"
+       name="Blonde Hair"
+	   show_simple="true"
+       label_min="Black"
+       label_max="Blonde"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_color>
+            <value
+             color="0, 0, 0, 255" />
+
+            <value
+             color="22, 6, 6, 255" />
+
+            <value
+             color="29, 9, 6, 255" />
+
+            <value
+             color="45, 21, 11, 255" />
+
+            <value
+             color="78, 39, 11, 255" />
+
+            <value
+             color="90, 53, 16, 255" />
+
+            <value
+             color="136, 92, 21, 255" />
+
+            <value
+             color="150, 106, 33, 255" />
+
+            <value
+             color="198, 156, 74, 255" />
+
+            <value
+             color="233, 192, 103, 255" />
+
+            <value
+             color="238, 205, 136, 255" />
+         </param_color>
+      </param>
+
+      <param
+       id="113"
+       group="0"
+       wearable="hair"
+       edit_group="hair_color"
+       edit_group_order="4"
+       name="Red Hair"
+	   show_simple="true"
+       label_min="No Red"
+       label_max="Very Red"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_color>
+            <value
+             color="0, 0, 0, 255" />
+
+            <value
+             color="118, 47, 19, 255" />
+         </param_color>
+      </param>
+
+      <param
+       id="115"
+       group="0"
+       wearable="hair"
+       edit_group="hair_color"
+       edit_group_order="1"
+       name="White Hair"
+	   show_simple="true"
+       label_min="No White"
+       label_max="All White"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_color>
+            <value
+             color="0, 0, 0, 255" />
+
+            <value
+             color="255, 255, 255, 255" />
+         </param_color>
+      </param>
+
+      <param
+       id="112"
+       group="0"
+       wearable="hair"
+       edit_group="hair_color"
+       edit_group_order="2"
+       name="Rainbow Color"
+	   show_simple="true"
+       label_min="None"
+       label_max="Wild"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_color>
+            <value
+             color=" 0, 0, 0, 255" />
+
+            <value
+             color="255, 0, 255, 255" />
+
+            <value
+             color="255, 0, 0, 255" />
+
+            <value
+             color="255, 255, 0, 255" />
+
+            <value
+             color=" 0, 255, 0, 255" />
+
+            <value
+             color=" 0, 255, 255, 255" />
+
+            <value
+             color=" 0, 0, 255, 255" />
+
+            <value
+             color="255, 0, 255, 255" />
+         </param_color>
+      </param>
+   </global_color>
+
+<!-- =========================================================== -->
+   <global_color
+    name="eye_color">
+      <param
+       id="99"
+       group="0"
+       wearable="eyes"
+       edit_group="eyes"
+       edit_group_order="1"
+       name="Eye Color"
+	   show_simple="true"
+       label_min="Natural"
+       label_max="Unnatural"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".3">
+<!-- default to natural brown eyes-->
+         <param_color>
+            <value
+             color="50, 25, 5, 255" />
+
+<!-- natural dark brown eyes-->
+            <value
+             color="109, 55, 15, 255" />
+
+<!-- natural brown eyes-->
+            <value
+             color="150, 93, 49, 255" />
+
+<!-- natural light brown eyes-->
+            <value
+             color="152, 118, 25, 255" />
+
+<!--natural hazel eyes-->
+            <value
+             color="95, 179, 107, 255" />
+
+<!--natural green eyes-->
+            <value
+             color="87, 192, 191, 255" />
+
+<!--natural aqua eyes-->
+            <value
+             color="95, 172, 179, 255" />
+
+<!--natural blue eyes-->
+            <value
+             color="128, 128, 128, 255" />
+
+<!--natural grey eyes-->
+            <value
+             color="0, 0, 0, 255" />
+
+<!--black eyes-->
+            <value
+             color="255, 255, 0, 255" />
+
+<!--bright yellow eyes-->
+            <value
+             color=" 0, 255, 0, 255" />
+
+<!-- bright green eyes-->
+            <value
+             color=" 0, 255, 255, 255" />
+
+<!-- bright cyan eyes-->
+            <value
+             color=" 0, 0, 255, 255" />
+
+<!--bright blue eyes-->
+            <value
+             color="255, 0, 255, 255" />
+
+<!-- bright violet eyes-->
+            <value
+             color="255, 0, 0, 255" />
+
+<!--bright red eyes-->
+         </param_color>
+      </param>
+
+      <param
+       id="98"
+       group="0"
+       wearable="eyes"
+       edit_group="eyes"
+       edit_group_order="2"
+       name="Eye Lightness"
+	   show_simple="true"
+       label_min="Darker"
+       label_max="Lighter"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_color>
+            <value
+             color="0, 0, 0, 0" />
+
+            <value
+             color="255, 255, 255, 255" />
+         </param_color>
+      </param>
+   </global_color>
+
+<!-- =========================================================== -->
+  <layer_set
+    body_region="hair"
+    width="512"
+    height="512"
+    clear_alpha="false">
+    <layer
+      name="base"
+      global_color="hair_color"
+      write_all_channels="true">
+      <texture
+       local_texture="hair_grain" />
+    </layer>
+  </layer_set>
+  <!-- =========================================================== -->
+
+  <layer_set
+    body_region="head"
+    width="512"
+    height="512"
+	clear_alpha="false"
+    alpha_tga_file="head_alpha.tga">
+		<layer
+		   name="head bump base"
+		   fixed_color = "128,128,128,255"
+		   render_pass="bump">
+		</layer>
+
+      <layer
+       name="head bump definition"
+       render_pass="bump">
+         
+		 <texture
+          tga_file="bump_head_base.tga" 
+		  file_is_mask="FALSE"/>
+
+         <param
+          id="873"
+          group="1"
+          wearable="skin"
+          edit_group="driven"
+          edit_group_order="12"
+          name="Bump base"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             domain="0" />
+         </param>
+      </layer>
+
+      <layer
+       name="base"
+       global_color="skin_color">
+         <texture
+          tga_file="head_skingrain.tga" />
+      </layer>
+
+      <layer
+       name="headcolor">
+         <texture
+          tga_file="head_color.tga" />
+      </layer>
+
+      <layer
+       name="shadow">
+         <texture
+          tga_file="head_shading_alpha.tga"
+          file_is_mask="TRUE" />
+
+         <param
+          id="158"
+          group="1"
+          wearable="skin"
+          name="Shading"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 0" />
+
+               <value
+                color="0, 0, 0, 128" />
+            </param_color>
+         </param>
+      </layer>
+
+	  <layer
+       name="head_bodypaint">
+         <texture
+          local_texture="head_bodypaint" />
+      </layer>
+
+	  <layer
+       name="rosyface">
+         <texture
+          tga_file="rosyface_alpha.tga"
+          file_is_mask="true" />
+
+         <param
+          id="116"
+          group="0"
+          wearable="skin"
+          edit_group="skin_facedetail"
+          edit_group_order="4"
+          name="Rosy Complexion"
+          label_min="Less Rosy"
+          label_max="More Rosy"
+          value_min="0"
+          value_max="1"
+          camera_distance=".3"
+          camera_elevation=".07">
+            <param_color>
+               <value
+                color="198, 71, 71, 0" />
+
+               <value
+                color="198, 71, 71, 255" />
+            </param_color>
+         </param>
+      </layer>
+
+	  <layer
+       name="freckles"
+       fixed_color="120,47,20,128">
+         <param
+          id="165"
+          group="0"
+          wearable="skin"
+          edit_group="skin_facedetail"
+          edit_group_order="2"
+          name="Freckles"
+          label_min="Less"
+          label_max="More"
+          value_min="0"
+          value_max="1"
+          camera_distance=".3"
+          camera_elevation=".07">
+            <param_alpha
+             tga_file="freckles_alpha.tga"
+             skip_if_zero="true"
+             domain="0.5" />
+         </param>
+      </layer>
+
+      <layer
+       name="highlight">
+         <texture
+          tga_file="head_highlights_alpha.tga"
+          file_is_mask="TRUE" />
+
+         <param
+          id="159"
+          group="1"
+          name="Shading"
+          wearable="skin"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 64" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="lips">
+         <texture
+          tga_file="lips_mask.tga"
+          file_is_mask="true" />
+
+         <param
+          id="117"
+          group="0"
+          wearable="skin"
+          edit_group="skin_facedetail"
+          edit_group_order="5"
+          name="Lip Pinkness"
+          label_min="Darker"
+          label_max="Pinker"
+          value_min="0"
+          value_max="1"
+          camera_distance=".25">
+            <param_color>
+               <value
+                color="220, 115, 115, 0" />
+
+               <value
+                color="220, 115, 115, 128" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="wrinkles_shading"
+       render_pass="bump"
+       fixed_color="0,0,0,100">
+         <param
+          id="118"
+          group="1"
+          wearable="skin"
+          name="Wrinkles"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="bump_face_wrinkles.tga"
+             skip_if_zero="true"
+             domain="0.3" />
+         </param>
+      </layer>
+
+<!--<layer
+       name="wrinkles_highlights"
+       fixed_color="255,255,255,64">
+         <param
+          id="128"
+          group="1"
+          name="Wrinkles"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="head_wrinkles_highlights_alpha.tga"
+             skip_if_zero="true"
+             domain="0.3" />
+         </param>
+      </layer>-->
+
+      <layer
+       name="eyebrowsbump"
+       render_pass="bump">
+         <texture
+          tga_file="head_hair.tga"
+          file_is_mask="false" />
+
+         <param
+          id="1000"
+          group="1"
+          wearable="hair"
+          edit_group="driven"
+          name="Eyebrow Size Bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="eyebrows_alpha.tga"
+             domain="0.1" />
+         </param>
+
+         <param
+          id="1002"
+          group="1"
+          wearable="hair"
+          edit_group="driven"
+          name="Eyebrow Density Bump"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="255,255,255,0" />
+
+               <value
+                color="255,255,255,255" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="eyebrows"
+       global_color="hair_color">
+         <texture
+          tga_file="head_hair.tga"
+          file_is_mask="false" />
+
+         <param
+          id="1001"
+          group="1"
+          wearable="hair"
+          edit_group="hair_eyebrows"
+          name="Eyebrow Size"
+		  show_simple="true"
+          value_min="0"
+          value_max="1"
+          value_default="0.5">
+            <param_alpha
+             tga_file="eyebrows_alpha.tga"
+             domain="0.1" />
+         </param>
+
+         <param
+          id="1003"
+          group="1"
+          edit_group="driven"
+          name="Eyebrow Density"
+          value_min="0"
+          value_max="1">
+            <param_color
+             operation="multiply">
+               <value
+                color="255,255,255,0" />
+
+               <value
+                color="255,255,255,255" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="lipstick">
+         <param
+          id="700"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="2"
+          name="Lipstick Color"
+          label_min="Pink"
+          label_max="Black"
+          value_min="0"
+          value_max="1"
+          value_default=".25"
+          camera_distance=".25">
+            <param_color>
+               <value
+                color="245,161,177,200" />
+
+               <value
+                color="216,37,67,200" />
+
+               <value
+                color="178,48,76,200" />
+
+               <value
+                color="68,0,11,200" />
+
+               <value
+                color="252,207,184,200" />
+
+               <value
+                color="241,136,106,200" />
+
+               <value
+                color="208,110,85,200" />
+
+               <value
+                color="106,28,18,200" />
+
+               <value
+                color="58,26,49,200" />
+
+               <value
+                color="14,14,14,200" />
+            </param_color>
+         </param>
+
+         <param
+          id="701"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="1"
+          name="Lipstick"
+          label_min="No Lipstick"
+          label_max="More Lipstick"
+          value_min="0"
+          value_max=".9"
+          value_default="0.0"
+          camera_distance=".25">
+            <param_alpha
+             tga_file="lipstick_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="lipgloss"
+       fixed_color="255,255,255,190">
+         <param
+          id="702"
+          name="Lipgloss"
+          label_min="No Lipgloss"
+          label_max="Glossy"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="3"
+          group="0"
+          value_min="0"
+          value_max="1"
+          camera_distance=".25">
+            <param_alpha
+             tga_file="lipgloss_alpha.tga"
+             skip_if_zero="true"
+             domain="0.2" />
+         </param>
+      </layer>
+
+      <layer
+       name="blush">
+         <param
+          id="704"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="4"
+          name="Blush"
+          label_min="No Blush"
+          label_max="More Blush"
+          value_min="0"
+          value_max=".9"
+          value_default="0"
+          camera_distance=".3"
+          camera_elevation=".07"
+          camera_angle="20">
+            <param_alpha
+             tga_file="blush_alpha.tga"
+             skip_if_zero="true"
+             domain="0.3" />
+         </param>
+
+         <param
+          id="705"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="5"
+          name="Blush Color"
+          label_min="Pink"
+          label_max="Orange"
+          value_min="0"
+          value_max="1"
+          value_default=".5"
+          camera_distance=".3"
+          camera_elevation=".07"
+          camera_angle="20">
+            <param_color>
+               <value
+                color="253,162,193,200" />
+
+               <value
+                color="247,131,152,200" />
+
+               <value
+                color="213,122,140,200" />
+
+               <value
+                color="253,152,144,200" />
+
+               <value
+                color="236,138,103,200" />
+
+               <value
+                color="195,128,122,200" />
+
+               <value
+                color="148,103,100,200" />
+
+               <value
+                color="168,95,62,200" />
+            </param_color>
+         </param>
+
+         <param
+          id="711"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="6"
+          name="Blush Opacity"
+          label_min="Clear"
+          label_max="Opaque"
+          value_min="0"
+          value_max="1"
+          value_default=".5"
+          camera_distance=".3"
+          camera_elevation=".07"
+          camera_angle="20">
+            <param_color
+             operation="multiply">
+               <value
+                color="255,255,255,0" />
+
+               <value
+                color="255,255,255,255" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="Outer Eye Shadow">
+         <param
+          id="708"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="11"
+          name="Out Shdw Color"
+          label_min="Light"
+          label_max="Dark"
+          value_min="0"
+          value_max="1"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_color>
+               <value
+                color="252,247,246,255" />
+
+               <value
+                color="255,206,206,255" />
+
+               <value
+                color="233,135,149,255" />
+
+               <value
+                color="220,168,192,255" />
+
+               <value
+                color="228,203,232,255" />
+
+               <value
+                color="255,234,195,255" />
+
+               <value
+                color="230,157,101,255" />
+
+               <value
+                color="255,147,86,255" />
+
+               <value
+                color="228,110,89,255" />
+
+               <value
+                color="228,150,120,255" />
+
+               <value
+                color="223,227,213,255" />
+
+               <value
+                color="96,116,87,255" />
+
+               <value
+                color="88,143,107,255" />
+
+               <value
+                color="194,231,223,255" />
+
+               <value
+                color="207,227,234,255" />
+
+               <value
+                color="41,171,212,255" />
+
+               <value
+                color="180,137,130,255" />
+
+               <value
+                color="173,125,105,255" />
+
+               <value
+                color="144,95,98,255" />
+
+               <value
+                color="115,70,77,255" />
+
+               <value
+                color="155,78,47,255" />
+
+               <value
+                color="239,239,239,255" />
+
+               <value
+                color="194,194,194,255" />
+
+               <value
+                color="120,120,120,255" />
+
+               <value
+                color="10,10,10,255" />
+            </param_color>
+         </param>
+
+         <param
+          id="706"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="12"
+          name="Out Shdw Opacity"
+          label_min="Clear"
+          label_max="Opaque"
+          value_min=".2"
+          value_max="1"
+          value_default=".6"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_color
+             operation="multiply">
+               <value
+                color="255,255,255,0" />
+
+               <value
+                color="255,255,255,255" />
+            </param_color>
+         </param>
+
+         <param
+          id="707"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="10"
+          name="Outer Shadow"
+          label_min="No Eyeshadow"
+          label_max="More Eyeshadow"
+          value_min="0"
+          value_max=".7"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_alpha
+             tga_file="eyeshadow_outer_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="Inner Eye Shadow">
+         <param
+          id="712"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="8"
+          name="In Shdw Color"
+          label_min="Light"
+          label_max="Dark"
+          value_min="0"
+          value_max="1"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_color>
+               <value
+                color="252,247,246,255" />
+
+               <value
+                color="255,206,206,255" />
+
+               <value
+                color="233,135,149,255" />
+
+               <value
+                color="220,168,192,255" />
+
+               <value
+                color="228,203,232,255" />
+
+               <value
+                color="255,234,195,255" />
+
+               <value
+                color="230,157,101,255" />
+
+               <value
+                color="255,147,86,255" />
+
+               <value
+                color="228,110,89,255" />
+
+               <value
+                color="228,150,120,255" />
+
+               <value
+                color="223,227,213,255" />
+
+               <value
+                color="96,116,87,255" />
+
+               <value
+                color="88,143,107,255" />
+
+               <value
+                color="194,231,223,255" />
+
+               <value
+                color="207,227,234,255" />
+
+               <value
+                color="41,171,212,255" />
+
+               <value
+                color="180,137,130,255" />
+
+               <value
+                color="173,125,105,255" />
+
+               <value
+                color="144,95,98,255" />
+
+               <value
+                color="115,70,77,255" />
+
+               <value
+                color="155,78,47,255" />
+
+               <value
+                color="239,239,239,255" />
+
+               <value
+                color="194,194,194,255" />
+
+               <value
+                color="120,120,120,255" />
+
+               <value
+                color="10,10,10,255" />
+            </param_color>
+         </param>
+
+         <param
+          id="713"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="9"
+          name="In Shdw Opacity"
+          label_min="Clear"
+          label_max="Opaque"
+          value_min=".2"
+          value_max="1"
+          value_default=".7"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_color
+             operation="multiply">
+               <value
+                color="255,255,255,0" />
+
+               <value
+                color="255,255,255,255" />
+            </param_color>
+         </param>
+
+         <param
+          id="709"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="7"
+          name="Inner Shadow"
+          label_min="No Eyeshadow"
+          label_max="More Eyeshadow"
+          value_min="0"
+          value_max="1"
+          value_default="0"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_alpha
+             tga_file="eyeshadow_inner_alpha.tga"
+             skip_if_zero="true"
+             domain="0.2" />
+         </param>
+      </layer>
+
+      <layer
+       name="eyeliner"
+       fixed_color="0,0,0,200">
+         <param
+          id="703"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="13"
+          name="Eyeliner"
+          label_min="No Eyeliner"
+          label_max="Full Eyeliner"
+          value_min="0"
+          value_max="1"
+          value_default="0.0"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_alpha
+             tga_file="eyeliner_alpha.tga"
+             skip_if_zero="true"
+             domain="0.1" />
+         </param>
+
+         <param
+          id="714"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="14"
+          name="Eyeliner Color"
+          label_min="Dark Green"
+          label_max="Black"
+          value_min="0"
+          value_max="1"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_color>
+               <value
+                color="24,98,40,250" />
+
+<!-- dark green -->
+               <value
+                color="9,100,127,250" />
+
+<!-- lt.aqua  blue -->
+               <value
+                color="61,93,134,250" />
+
+<!-- aqua  -->
+               <value
+                color="70,29,27,250" />
+
+<!--    dark brown -->
+               <value
+                color="115,75,65,250" />
+
+<!-- lt. brown  blue -->
+               <value
+                color="100,100,100,250" />
+
+<!-- grey -->
+               <value
+                color="91,80,74,250" />
+
+<!-- grey/brown  -->
+               <value
+                color="112,42,76,250" />
+
+<!-- plum -->
+               <value
+                color="14,14,14,250" />
+
+<!-- black -->
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="facialhair bump"
+       render_pass="bump">
+         <texture
+          tga_file="head_hair.tga"
+          file_is_mask="false" />
+
+         <param
+          id="1004"
+          sex="male"
+          group="1"
+          wearable="hair"
+          edit_group="driven"
+          name="Sideburns bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_sideburns_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1006"
+          sex="male"
+          group="1"
+          wearable="hair"
+          edit_group="driven"
+          name="Moustache bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_moustache_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1008"
+          sex="male"
+          group="1"
+          wearable="hair"
+          edit_group="driven"
+          name="Soulpatch bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_soulpatch_alpha.tga"
+             skip_if_zero="true"
+             domain="0.1" />
+         </param>
+
+         <param
+          id="1010"
+          sex="male"
+          group="1"
+          edit_group="driven"
+          wearable="hair"
+          name="Chin Curtains bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_chincurtains_alpha.tga"
+             skip_if_zero="true"
+             domain="0.03" />
+         </param>
+
+         <param
+          id="1012"
+          group="1"
+          sex="male"
+          wearable="hair"
+          edit_group="driven"
+          name="5 O'Clock Shadow bump"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="255,255,255,255" />
+
+               <value
+                color="255,255,255,0" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="facialhair"
+       global_color="hair_color">
+         <morph_mask
+          morph_name="Displace_Hair_Facial" />
+
+         <texture
+          tga_file="head_hair.tga"
+          file_is_mask="false" />
+
+         <param
+          id="1005"
+          sex="male"
+          group="1"
+          edit_group="driven"
+          name="Sideburns"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_sideburns_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1007"
+          sex="male"
+          group="1"
+          edit_group="driven"
+          name="Moustache"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_moustache_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1009"
+          sex="male"
+          group="1"
+          edit_group="driven"
+          name="Soulpatch"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_soulpatch_alpha.tga"
+             skip_if_zero="true"
+             domain="0.1" />
+         </param>
+
+         <param
+          id="1011"
+          sex="male"
+          group="1"
+          edit_group="driven"
+          name="Chin Curtains"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_chincurtains_alpha.tga"
+             skip_if_zero="true"
+             domain="0.03" />
+         </param>
+
+         <param
+          id="751"
+          group="1"
+          wearable="hair"
+          sex="male"
+          edit_group="hair_facial"
+          name="5 O'Clock Shadow"
+          label_min="Dense hair"
+          label_max="Shadow hair"
+          value_min="0"
+          value_max="1"
+          value_default="0.7"
+          camera_elevation=".1"
+          camera_distance=".3">
+            <param_color
+             operation="multiply">
+               <value
+                color="255,255,255,255" />
+
+               <value
+                color="255,255,255,30" />
+            </param_color>
+         </param>
+      </layer>
+
+   </layer_set>
+
+<!-- =========================================================== -->
+   <layer_set
+    body_region="upper_body"
+    width="512"
+    height="512">
+      <layer
+       name="base_upperbody bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+      </layer>
+      <layer
+       name="upperbody bump definition"
+       render_pass="bump">
+   		 <texture
+          tga_file="bump_upperbody_base.tga" 
+		  file_is_mask="FALSE"/>
+
+         <param
+          id="874"
+          group="1"
+          wearable="skin"
+          edit_group="driven"
+          edit_group_order="20"
+          name="Bump upperdef"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             domain="0" />
+         </param>
+      </layer>
+
+      <layer
+       name="base"
+       global_color="skin_color">
+         <texture
+          tga_file="body_skingrain.tga" />
+      </layer>
+
+      <layer
+       name="nipples">
+         <texture
+          tga_file="upperbody_color.tga" />
+      </layer>
+
+      <layer
+       name="shadow">
+         <texture
+          tga_file="upperbody_shading_alpha.tga"
+          file_is_mask="TRUE" />
+
+         <param
+          id="125"
+          group="1"
+          name="Shading"
+          wearable="skin"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 0" />
+
+               <value
+                color="0, 0, 0, 128" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="highlight">
+         <texture
+          tga_file="upperbody_highlights_alpha.tga"
+          file_is_mask="TRUE" />
+
+         <param
+          id="126"
+          group="1"
+          wearable="skin"
+          name="Shading"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 64" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="upper_bodypaint">
+         <texture
+          local_texture="upper_bodypaint" />
+      </layer>
+
+      <layer
+       name="freckles upper"
+       fixed_color="120,47,20,128">
+         <param
+          id="776"
+          group="1"
+          name="freckles upper"
+          wearable="skin"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="upperbodyfreckles_alpha.tga"
+             skip_if_zero="true"
+             domain="0.6" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_undershirt bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="upper_undershirt"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1043"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Sleeve Length bump"
+          value_min=".01"
+          value_max="1"
+          value_default=".4">
+            <param_alpha
+             tga_file="shirt_sleeve_alpha.tga"
+             multiply_blend="false"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1045"
+          group="1"
+          wearable="undershirt"
+          edit_group="undershirt"
+          edit_group_order="2"
+          name="Bottom bump"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="shirt_bottom_alpha.tga"
+             multiply_blend="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1047"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Collar Front bump"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="shirt_collar_alpha.tga"
+             multiply_blend="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1049"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Collar Back bump"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="shirt_collar_back_alpha.tga"
+             multiply_blend="true"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_undershirt">
+         <texture
+          local_texture="upper_undershirt" />
+
+         <param
+          id="821"
+          group="0"
+          wearable="undershirt"
+          edit_group="colorpicker"
+          name="undershirt_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="822"
+          group="0"
+          wearable="undershirt"
+          edit_group="colorpicker"
+          name="undershirt_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="823"
+          group="0"
+          wearable="undershirt"
+          edit_group="colorpicker"
+          name="undershirt_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1042"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Sleeve Length"
+          value_min=".01"
+          value_max="1"
+          value_default=".4">
+            <param_alpha
+             tga_file="shirt_sleeve_alpha.tga"
+             multiply_blend="false"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1044"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Bottom"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="shirt_bottom_alpha.tga"
+             multiply_blend="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1046"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Collar Front"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="shirt_collar_alpha.tga"
+             multiply_blend="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1048"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Collar Back"
+          label_min="Low"
+          label_max="High"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="shirt_collar_back_alpha.tga"
+             multiply_blend="true"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="Nail Polish">
+         <param
+          id="710"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="15"
+          name="Nail Polish"
+          label_min="No Polish"
+          label_max="Painted Nails"
+          value_min="0"
+          value_max="1"
+          value_default="0.0"
+          camera_distance="1.6"
+          camera_elevation="-.4"
+          camera_angle="70">
+            <param_alpha
+             tga_file="nailpolish_alpha.tga"
+             skip_if_zero="true"
+             domain="0.1" />
+         </param>
+
+         <param
+          id="715"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="16"
+          name="Nail Polish Color"
+          label_min="Pink"
+          label_max="Black"
+          value_min="0"
+          value_max="1"
+          camera_distance="1.6"
+          camera_elevation="-.4"
+          camera_angle="70">
+            <param_color>
+               <value
+                color="255,187,200,255" />
+
+               <value
+                color="194,102,127,255" />
+
+               <value
+                color="227,34,99,255" />
+
+               <value
+                color="168,41,60,255" />
+
+               <value
+                color="97,28,59,255" />
+
+               <value
+                color="234,115,93,255" />
+
+               <value
+                color="142,58,47,255" />
+
+               <value
+                color="114,30,46,255" />
+
+               <value
+                color="14,14,14,255" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="upper_gloves bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="upper_gloves"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1059"
+          group="1"
+          wearable="gloves"
+          edit_group="driven"
+          name="Glove Length bump"
+          value_min=".01"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="glove_length_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1061"
+          group="1"
+          wearable="gloves"
+          edit_group="driven"
+          name="Glove Fingers bump"
+          value_min=".01"
+          value_max="1"
+          value_default="1">
+            <param_alpha
+             tga_file="gloves_fingers_alpha.tga"
+             multiply_blend="true"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_gloves">
+         <texture
+          local_texture="upper_gloves" />
+
+         <param
+          id="827"
+          group="0"
+          wearable="gloves"
+          edit_group="colorpicker"
+          name="gloves_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="829"
+          group="0"
+          wearable="gloves"
+          edit_group="colorpicker"
+          name="gloves_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="830"
+          group="0"
+          wearable="gloves"
+          edit_group="colorpicker"
+          name="gloves_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1058"
+          group="1"
+          wearable="gloves"
+          edit_group="driven"
+          name="Glove Length"
+          value_min=".01"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="glove_length_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1060"
+          group="1"
+          wearable="gloves"
+          edit_group="driven"
+          name="Glove Fingers"
+          value_min=".01"
+          value_max="1"
+          value_default="1">
+            <param_alpha
+             tga_file="gloves_fingers_alpha.tga"
+             multiply_blend="true"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_clothes_shadow">
+         <texture
+          local_texture="upper_shirt" />
+
+         <param
+          id="899"
+          group="1"
+          edit_group="driven"
+          wearable="shirt"
+          name="Upper Clothes Shading"
+          value_min="0"
+          value_max="1"
+          value_default="0">
+            <param_color>
+               <value
+                color="0, 0, 0, 0" />
+
+               <value
+                color="0, 0, 0, 80" />
+            </param_color>
+         </param>
+
+         <param
+          id="900"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Sleeve Length Shadow"
+          value_min="0.02"
+          value_max=".87"
+          value_default="0.02">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             skip_if_zero="true"
+             domain="0.03" />
+         </param>
+
+         <param
+          id="901"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Shirt Shadow Bottom"
+          value_min="0.02"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_bottom_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="902"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Front Shadow Height"
+          value_min="0.02"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             skip_if_zero="true"
+             domain="0.02" />
+         </param>
+
+         <param
+          id="903"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Back Shadow Height"
+          value_min="0.02"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             skip_if_zero="true"
+             domain="0.02" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_shirt base bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="upper_shirt"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1029"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Sleeve Length Cloth"
+          value_min="0"
+          value_max="0.85">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1030"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Shirt Bottom Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_bottom_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1031"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Front Height Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1032"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Back Height Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_clothes bump"
+       render_pass="bump">
+         <texture
+          tga_file="bump_shirt_wrinkles.tga" />
+
+         <texture
+          local_texture="upper_shirt"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="868"
+          group="0"
+          wearable="shirt"
+          edit_group="shirt"
+          edit_group_order="8"
+          name="Shirt Wrinkles"
+          value_min="0"
+          value_max="1"
+          value_default="0">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1013"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Sleeve Length Cloth"
+          value_min="0"
+          value_max="0.85">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1014"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Shirt Bottom Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_bottom_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1015"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Front Height Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1016"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Back Height Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_clothes">
+         <texture
+          local_texture="upper_shirt" />
+
+         <morph_mask
+          morph_name="Displace_Loose_Upperbody" />
+
+         <morph_mask
+          morph_name="Shirtsleeve_flair" />
+
+         <param
+          id="803"
+          group="0"
+          wearable="shirt"
+          edit_group="colorpicker"
+          name="shirt_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="804"
+          group="0"
+          wearable="shirt"
+          edit_group="colorpicker"
+          name="shirt_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="805"
+          group="0"
+          wearable="shirt"
+          edit_group="colorpicker"
+          name="shirt_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="600"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Sleeve Length Cloth"
+          value_min="0"
+          value_max="0.85"
+          value_default=".7">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="601"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Shirt Bottom Cloth"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_bottom_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="602"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Front Height Cloth"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="778"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Back Height Cloth"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_jacket base bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="upper_jacket"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1039"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          edit_group_order="1"
+          name="Jacket Sleeve Length bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1040"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="Jacket Collar Front bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1041"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          edit_group_order="3.5"
+          name="Jacket Collar Back bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1037"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket bottom length upper bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_length_upper_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1038"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket open upper bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_open_upper_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_jacket bump"
+       render_pass="bump">
+         <texture
+          tga_file="bump_shirt_wrinkles.tga" />
+
+         <texture
+          local_texture="upper_jacket"
+          local_texture_alpha_only="true" />
+          
+          <param
+          id="875"
+          group="1"
+          wearable="jacket"
+          name="jacket upper Wrinkles"
+          value_min="0"
+          value_max="1"
+          value_default="0">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1019"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          edit_group_order="1"
+          name="Jacket Sleeve Length bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1021"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="Jacket Collar Front bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1023"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          edit_group_order="3.5"
+          name="Jacket Collar Back bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1025"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket bottom length upper bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_length_upper_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1026"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket open upper bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_open_upper_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_jacket">
+         <texture
+          local_texture="upper_jacket" />
+
+         <param
+          id="831"
+          group="1"
+          edit_group="colorpicker_driven"
+          wearable="jacket"
+          name="upper_jacket_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="832"
+          group="1"
+          edit_group="colorpicker_driven"
+          wearable="jacket"
+          name="upper_jacket_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="833"
+          group="1"
+          edit_group="colorpicker_driven"
+          wearable="jacket"
+          name="upper_jacket_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1020"
+          group="1"
+          edit_group="driven"
+          name="jacket Sleeve Length"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1022"
+          group="1"
+          edit_group="driven"
+          name="jacket Collar Front"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1024"
+          group="1"
+          edit_group="driven"
+          edit_group_order="3.5"
+          name="jacket Collar Back"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="620"
+          group="1"
+          wearable="jacket"
+          edit_group="jacket"
+          name="bottom length upper"
+          label_min="hi cut"
+          label_max="low cut"
+          value_min="0"
+          value_max="1"
+          value_default=".8"
+          camera_distance="1.2"
+          camera_angle="30"
+          camera_elevation=".2">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_length_upper_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="622"
+          group="1"
+          wearable="jacket"
+          edit_group="jacket"
+          name="open upper"
+          label_min="closed"
+          label_max="open"
+          value_min="0"
+          value_max="1"
+          value_default=".8"
+          camera_distance="1.2"
+          camera_angle="30"
+          camera_elevation=".2">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_open_upper_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+   </layer_set>
+
+<!-- =========================================================== -->
+   <layer_set
+    body_region="lower_body"
+    width="512"
+    height="512">
+		<layer
+		   name="lower body bump base"
+		   fixed_color = "128,128,128,255"
+		   render_pass="bump">
+		</layer>
+      <layer
+       name="base_lowerbody bump"
+       render_pass="bump">
+         <texture
+          tga_file="bump_lowerbody_base.tga"
+		  file_is_mask="FALSE" />
+
+         <param
+          id="878"
+          group="1"
+          wearable="skin"
+          edit_group="driven"
+          edit_group_order="20"
+          name="Bump upperdef"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             domain="0" />
+         </param>
+      </layer>
+
+      <layer
+       name="base"
+       global_color="skin_color">
+         <texture
+          tga_file="body_skingrain.tga" />
+      </layer>
+
+      <layer
+       name="shadow">
+         <texture
+          tga_file="lowerbody_shading_alpha.tga"
+          file_is_mask="TRUE" />
+
+         <param
+          id="160"
+          group="1"
+          name="Shading"
+          wearable="pants"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 0" />
+
+               <value
+                color="0, 0, 0, 128" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="highlight">
+         <texture
+          tga_file="lowerbody_highlights_alpha.tga"
+          file_is_mask="TRUE" />
+
+         <param
+          id="161"
+          group="1"
+          name="Shading"
+          wearable="skin"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 64" />
+            </param_color>
+         </param>
+      </layer>
+
+	  <layer
+       name="toenails">
+         <texture
+          tga_file="lowerbody_color.tga" />
+      </layer>
+
+      <layer
+       name="lower_bodypaint">
+         <texture
+          local_texture="lower_bodypaint" />
+      </layer>
+
+      <layer
+       name="freckles lower"
+       fixed_color="120,47,20,128">
+         <param
+          id="777"
+          group="1"
+          name="freckles lower"
+          wearable="skin"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="bodyfreckles_alpha.tga"
+             skip_if_zero="true"
+             domain="0.6" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_underpants bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="lower_underpants"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1055"
+          group="1"
+          wearable="underpants"
+          edit_group="underpants"
+          name="Pants Length"
+          value_min="0"
+          value_max="1"
+          value_default=".3">
+            <param_alpha
+             tga_file="pants_length_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1057"
+          group="1"
+          wearable="underpants"
+          edit_group="underpants"
+          name="Pants Waist"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="pants_waist_alpha.tga"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_underpants">
+         <texture
+          local_texture="lower_underpants" />
+
+         <param
+          id="824"
+          group="0"
+          wearable="underpants"
+          edit_group="colorpicker"
+          name="underpants_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="825"
+          group="0"
+          wearable="underpants"
+          edit_group="colorpicker"
+          name="underpants_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="826"
+          group="0"
+          wearable="underpants"
+          edit_group="colorpicker"
+          name="underpants_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1054"
+          group="1"
+          wearable="underpants"
+          edit_group="driven"
+          name="Pants Length"
+          value_min="0"
+          value_max="1"
+          value_default=".3"
+          camera_distance="1.2"
+          camera_angle="30"
+          camera_elevation="-.3">
+            <param_alpha
+             tga_file="pants_length_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1056"
+          group="1"
+          wearable="underpants"
+          edit_group="driven"
+          name="Pants Waist"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="pants_waist_alpha.tga"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_socks bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="lower_socks"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1051"
+          group="1"
+          wearable="socks"
+          edit_group="driven"
+          name="Socks Length bump"
+          value_min="0"
+          value_max="1"
+          value_default="0.35">
+            <param_alpha
+             tga_file="shoe_height_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_socks">
+         <texture
+          local_texture="lower_socks" />
+
+         <param
+          id="818"
+          group="0"
+          wearable="socks"
+          edit_group="colorpicker"
+          name="socks_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="819"
+          group="0"
+          wearable="socks"
+          edit_group="colorpicker"
+          name="socks_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="820"
+          group="0"
+          wearable="socks"
+          edit_group="colorpicker"
+          name="socks_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1050"
+          group="1"
+          wearable="socks"
+          edit_group="driven"
+          name="Socks Length bump"
+          value_min="0"
+          value_max="1"
+          value_default="0.35">
+            <param_alpha
+             tga_file="shoe_height_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_shoes bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="lower_shoes"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1053"
+          group="1"
+          wearable="shoes"
+          edit_group="driven"
+          name="Shoe Height bump"
+          value_min="0"
+          value_max="1"
+          value_default="0.1">
+            <param_alpha
+             tga_file="shoe_height_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_shoes">
+         <texture
+          local_texture="lower_shoes" />
+
+         <param
+          id="812"
+          group="0"
+          wearable="shoes"
+          edit_group="colorpicker"
+          name="shoes_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="813"
+          group="0"
+          wearable="shoes"
+          edit_group="colorpicker"
+          name="shoes_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="817"
+          group="0"
+          wearable="shoes"
+          edit_group="colorpicker"
+          name="shoes_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1052"
+          group="1"
+          wearable="shoes"
+          edit_group="driven"
+          name="Shoe Height"
+          value_min="0"
+          value_max="1"
+          value_default="0.1">
+            <param_alpha
+             tga_file="shoe_height_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_clothes_shadow">
+         <texture
+          local_texture="lower_pants" />
+
+         <param
+          id="913"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Lower Clothes Shading"
+          value_min="0"
+          value_max="1"
+          value_default="0">
+            <param_color>
+               <value
+                color="0, 0, 0, 0" />
+
+               <value
+                color="0, 0, 0, 80" />
+            </param_color>
+         </param>
+
+         <param
+          id="914"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Waist Height Shadow"
+          value_min="0.02"
+          value_max="1">
+            <param_alpha
+             tga_file="pants_waist_alpha.tga"
+             skip_if_zero="true"
+             domain="0.04" />
+         </param>
+
+         <param
+          id="915"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Pants Length Shadow"
+          value_min="0.02"
+          value_max="1">
+            <param_alpha
+             tga_file="pants_length_alpha.tga"
+             skip_if_zero="true"
+             domain="0.03" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_pants base bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="lower_pants"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1035"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Waist Height Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="pants_waist_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1036"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Pants Length Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="pants_length_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_pants bump"
+       render_pass="bump">
+         <texture
+          tga_file="bump_pants_wrinkles.tga" />
+
+         <texture
+          local_texture="lower_pants"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="869"
+          group="0"
+          wearable="pants"
+          edit_group="pants"
+          edit_group_order="6"
+          name="Pants Wrinkles"
+          value_min="0"
+          value_max="1"
+          value_default="0">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1017"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Waist Height Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="pants_waist_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1018"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Pants Length Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="pants_length_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_pants">
+         <texture
+          local_texture="lower_pants" />
+
+         <morph_mask
+          morph_name="Displace_Loose_Lowerbody" />
+
+         <morph_mask
+          morph_name="Leg_Pantflair" />
+
+         <morph_mask
+          morph_name="Low_Crotch" />
+
+         <morph_mask
+          morph_name="Leg_Longcuffs" />
+
+         <param
+          id="806"
+          group="0"
+          wearable="pants"
+          edit_group="colorpicker"
+          name="pants_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="807"
+          group="0"
+          wearable="pants"
+          edit_group="colorpicker"
+          name="pants_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="808"
+          group="0"
+          wearable="pants"
+          edit_group="colorpicker"
+          name="pants_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="614"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Waist Height Cloth"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="pants_waist_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="615"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Pants Length Cloth"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="pants_length_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_jacket base bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="lower_jacket"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1033"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket bottom length lower bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="jacket_length_lower_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1034"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket open lower bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_open_lower_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_jacket bump"
+       render_pass="bump">
+         <texture
+          tga_file="bump_pants_wrinkles.tga" />
+
+         <texture
+          local_texture="lower_jacket"
+          local_texture_alpha_only="true" />
+          
+         <param
+          id="876"
+          group="1"
+          wearable="jacket"
+          name="jacket upper Wrinkles"
+          value_min="0"
+          value_max="1"
+          value_default="0">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1027"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket bottom length lower bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="jacket_length_lower_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1028"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket open lower bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_open_lower_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_jacket">
+         <texture
+          local_texture="lower_jacket" />
+
+         <param
+          id="809"
+          group="1"
+          edit_group="colorpicker_driven"
+          wearable="jacket"
+          name="lower_jacket_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="810"
+          group="1"
+          edit_group="colorpicker_driven"
+          wearable="jacket"
+          name="lower_jacket_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="811"
+          group="1"
+          edit_group="colorpicker_driven"
+          wearable="jacket"
+          name="lower_jacket_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="621"
+          group="1"
+          wearable="jacket"
+          edit_group="jacket"
+          name="bottom length lower"
+          label_min="hi cut"
+          label_max="low cut"
+          value_min="0"
+          value_max="1"
+          value_default=".8"
+          camera_distance="1.2"
+          camera_angle="30"
+          camera_elevation=".2">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="jacket_length_lower_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="623"
+          group="1"
+          wearable="jacket"
+          edit_group="jacket"
+          name="open lower"
+          label_min="open"
+          label_max="closed"
+          value_min="0"
+          value_max="1"
+          value_default=".8"
+          camera_distance="1.2"
+          camera_angle="30"
+          camera_elevation=".2">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_open_lower_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+   </layer_set>
+
+<!-- =========================================================== -->
+   <layer_set
+    body_region="eyes"
+    width="128"
+    height="128">
+      <layer
+       name="whites">
+         <texture
+          tga_file="eyewhite.tga" />
+      </layer>
+
+      <layer
+       name="iris"
+       global_color="eye_color">
+         <texture
+          local_texture="eyes_iris" />
+      </layer>
+   </layer_set>
+
+<!-- =========================================================== -->
+   <layer_set
+    body_region="skirt"
+    width="512"
+    height="512"
+    clear_alpha="false">
+      <layer
+       name="skirt_fabric"
+       write_all_channels="true">
+         <texture
+          local_texture="skirt" />
+
+         <param
+          id="921"
+          group="0"
+          wearable="skirt"
+          edit_group="colorpicker"
+          name="skirt_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="922"
+          group="0"
+          wearable="skirt"
+          edit_group="colorpicker"
+          name="skirt_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="923"
+          group="0"
+          wearable="skirt"
+          edit_group="colorpicker"
+          name="skirt_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="skirt_fabric_alpha">
+         <param
+          id="858"
+          group="0"
+          wearable="skirt"
+          edit_group="skirt"
+          edit_group_order="1"
+          name="Skirt Length"
+		  show_simple="true"
+          label_min="Short"
+          label_max="Long"
+          value_min=".01"
+          value_max="1"
+          value_default=".4"
+		  simple_percent_min="40"
+		  simple_percent_max="100"
+          camera_distance="1.3"
+          camera_elevation="-.5"
+          camera_angle="30">
+            <param_alpha
+             tga_file="skirt_length_alpha.tga"
+             domain="0"
+             multiply_blend="true" />
+         </param>
+
+         <param
+          id="859"
+          group="0"
+          wearable="skirt"
+          edit_group="skirt"
+          edit_group_order="4"
+          name="Slit Front"
+          label_min="Open Front"
+          label_max="Closed Front"
+          value_min="0"
+          value_max="1"
+          value_default="1"
+          camera_distance="1.3"
+          camera_elevation="-.5"
+          camera_angle="30">
+            <param_alpha
+             tga_file="skirt_slit_front_alpha.tga"
+             multiply_blend="true"
+             domain="0" />
+         </param>
+
+         <param
+          id="860"
+          group="0"
+          wearable="skirt"
+          edit_group="skirt"
+          edit_group_order="5"
+          name="Slit Back"
+          label_min="Open Back"
+          label_max="Closed Back"
+          value_min="0"
+          value_max="1"
+          value_default="1"
+          camera_distance="1.3"
+          camera_elevation="-.5"
+          camera_angle="160">
+            <param_alpha
+             tga_file="skirt_slit_back_alpha.tga"
+             multiply_blend="true"
+             domain="0" />
+         </param>
+
+         <param
+          id="861"
+          group="0"
+          wearable="skirt"
+          edit_group="skirt"
+          edit_group_order="6"
+          name="Slit Left"
+          label_min="Open Left"
+          label_max="Closed Left"
+          value_min="0"
+          value_max="1"
+          value_default="1"
+          camera_distance="1.3"
+          camera_elevation="-.5"
+          camera_angle="30">
+            <param_alpha
+             tga_file="skirt_slit_left_alpha.tga"
+             multiply_blend="true"
+             domain="0" />
+         </param>
+
+         <param
+          id="862"
+          group="0"
+          wearable="skirt"
+          edit_group="skirt"
+          edit_group_order="7"
+          name="Slit Right"
+          label_min="Open Right"
+          label_max="Closed Right"
+          value_min="0"
+          value_max="1"
+          value_default="1"
+          camera_distance="1.3"
+          camera_elevation="-.5"
+          camera_angle="-30">
+            <param_alpha
+             tga_file="skirt_slit_right_alpha.tga"
+             multiply_blend="true"
+             domain="0" />
+         </param>
+      </layer>
+   </layer_set>
+
+<!-- =========================================================== -->
+   <driver_parameters>
+      <param
+       id="828"
+       group="0"
+       name="Loose Upper Clothing"
+       label="Shirt Fit"
+	   show_simple="true"
+       wearable="shirt"
+       edit_group="shirt"
+       edit_group_order="4"
+       label_min="Tight Shirt"
+       label_max="Loose Shirt"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="628" />
+
+            <driven
+             id="899"
+             min1="0.1"
+             max1="0.5"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="816"
+       group="0"
+       name="Loose Lower Clothing"
+       label="Pants Fit"
+	   show_simple="true"
+       wearable="pants"
+       edit_group="pants"
+       edit_group_order="2.5"
+       label_min="Tight Pants"
+       label_max="Loose Pants"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.8"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_driver>
+            <driven
+             id="516" />
+
+            <driven
+             id="913"
+             min1="0.1"
+             max1="0.5"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="814"
+       group="0"
+       wearable="pants"
+       edit_group="pants"
+       edit_group_order="2"
+       name="Waist Height"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default="1"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_driver>
+            <driven
+             id="614" />
+
+            <driven
+             id="1017" />
+
+            <driven
+             id="1033" />
+
+            <driven
+             id="914"
+             min1="0"
+             max1=".98"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="815"
+       group="0"
+       wearable="pants"
+       edit_group="pants"
+       edit_group_order="1"
+       name="Pants Length"
+	   show_simple="true"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".8"
+	   simple_percent_min="20"
+	   simple_percent_max="100"
+       camera_distance="1.8"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_driver>
+            <driven
+             id="615"
+             min1="0"
+             max1=".9"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="1018"
+             min1="0"
+             max1=".9"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="1036"
+             min1="0"
+             max1=".9"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="793"
+             min1=".9"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="915"
+             min1="0"
+             max1=".882"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="800"
+       group="0"
+       wearable="shirt"
+       edit_group="shirt"
+       edit_group_order="1"
+       name="Sleeve Length"
+	   show_simple="true"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".89"
+	   simple_percent_min="15"
+	   simple_percent_max="100"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="600" />
+
+            <driven
+             id="1013" />
+
+            <driven
+             id="1029" />
+
+            <driven
+             id="900"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="801"
+       group="0"
+       wearable="shirt"
+       edit_group="shirt"
+       edit_group_order="2"
+       name="Shirt Bottom"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default="1"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="601" />
+
+            <driven
+             id="1014" />
+
+            <driven
+             id="1030" />
+
+            <driven
+             id="901"
+             min1="0"
+             max1=".98"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="802"
+       group="0"
+       wearable="shirt"
+       edit_group="shirt"
+       edit_group_order="3"
+       name="Collar Front"
+	   show_simple="true"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".78"
+	   simple_percent_min="40"
+	   simple_percent_max="100"
+       camera_distance="1.2"
+       camera_angle="15"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="602" />
+
+            <driven
+             id="1015" />
+
+            <driven
+             id="1031" />
+
+            <driven
+             id="902"
+             min1="0"
+             max1=".98"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="781"
+       group="0"
+       wearable="shirt"
+       edit_group="shirt"
+       edit_group_order="3.1"
+       name="Collar Back"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".78"
+       camera_distance="1.2"
+       camera_angle="195"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="778" />
+
+            <driven
+             id="1016" />
+
+            <driven
+             id="1032" />
+
+            <driven
+             id="903"
+             min1="0"
+             max1=".98"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="150"
+       group="0"
+       wearable="skin"
+       edit_group="skin_bodydetail"
+       name="Body Definition"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_distance="1.4"
+       camera_elevation="-.2">
+         <param_driver>
+            <driven
+             id="125" />
+
+            <driven
+             id="126" />
+
+            <driven
+             id="160" />
+
+            <driven
+             id="161" />
+
+            <driven
+             id="874" />
+
+            <driven
+             id="878" />
+
+         </param_driver>
+      </param>
+
+      <param
+       id="775"
+       group="0"
+       wearable="skin"
+       edit_group="skin_bodydetail"
+       name="Body Freckles"
+       label_min="Less Freckles"
+       label_max="More Freckles"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_distance="1.4"
+       camera_elevation="-.2">
+         <param_driver>
+            <driven
+             id="776" />
+
+            <driven
+             id="777" />
+         </param_driver>
+      </param>
+
+      <param
+       id="162"
+       group="0"
+       wearable="skin"
+       edit_group="skin_facedetail"
+       edit_group_order="1"
+       name="Facial Definition"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1"
+       camera_distance=".3"
+       camera_elevation=".07"
+       value_default="0">
+         <param_driver>
+            <driven
+             id="158" />
+
+            <driven
+             id="159" />
+
+			<driven
+             id="873" />
+         </param_driver>
+      </param>
+
+      <param
+       id="163"
+       group="0"
+       wearable="skin"
+       edit_group="skin_facedetail"
+       edit_group_order="3"
+       name="wrinkles"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1"
+       camera_distance=".3"
+       camera_elevation=".07"
+       value_default="0">
+         <param_driver>
+<!--<driven
+             id="128" />-->
+            <driven
+             id="118" />
+         </param_driver>
+      </param>
+
+      <param
+       id="505"
+       group="0"
+       wearable="shape"
+       edit_group="shape_mouth"
+       edit_group_order="3"
+       name="Lip Thickness"
+       label_min="Thin Lips"
+       label_max="Fat Lips"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_distance=".3"
+       camera_elevation=".04"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="26"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="28"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="799"
+       group="0"
+       wearable="shape"
+       edit_group="shape_mouth"
+       edit_group_order="3.2"
+       name="Lip Ratio"
+	   label="Lip Ratio"
+	   show_simple="true"
+       label_min="More Upper Lip"
+       label_max="More Lower Lip"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_distance=".3"
+       camera_elevation=".04"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="797"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="798"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="155"
+       group="0"
+       wearable="shape"
+       edit_group="shape_mouth"
+       edit_group_order="1"
+       name="Lip Width"
+	   label="Lip Width"
+       label_min="Narrow Lips"
+       label_max="Wide Lips"
+       show_simple="true"
+       value_min="-0.9"
+       value_max="1.3"
+       camera_distance=".3"
+       camera_elevation=".04"
+       value_default="0">
+         <param_driver>
+            <driven
+             id="29" />
+
+            <driven
+             id="30" />
+         </param_driver>
+      </param>
+
+      <param
+       id="196"
+       group="0"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="2"
+       name="Eye Spacing"
+	   label="Eye Spacing"
+       label_min="Close Set Eyes"
+       label_max="Far Set Eyes"
+       show_simple="true"
+       value_min="-2"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".35"
+       camera_angle="5">
+         <param_driver>
+            <driven
+             id="194" />
+
+            <driven
+             id="195" />
+         </param_driver>
+      </param>
+
+      <param
+       id="769"
+       group="0"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="4.5"
+       name="Eye Depth"
+       label_min="Sunken Eyes"
+       label_max="Bugged Eyes"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="75">
+         <param_driver>
+            <driven
+             id="767" />
+
+            <driven
+             id="768" />
+         </param_driver>
+      </param>
+
+      <param
+       id="198"
+       group="0"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="2"
+       name="Heel Height"
+       label_min="Low Heels"
+       label_max="High Heels"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_angle="45"
+       camera_distance=".8"
+       camera_elevation="-1">
+         <param_driver>
+            <driven
+             id="197" />
+
+            <driven
+             id="500" />
+         </param_driver>
+      </param>
+
+      <param
+       id="513"
+       group="0"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="3"
+       name="Heel Shape"
+       label_min="Pointy Heels"
+       label_max="Thick Heels"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_angle="45"
+       camera_distance="1.5"
+       camera_elevation="-1">
+         <param_driver>
+            <driven
+             id="509"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="510"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="514"
+       group="0"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="4"
+       name="Toe Shape"
+       label_min="Pointy"
+       label_max="Square"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_angle="5"
+       camera_distance=".8"
+       camera_elevation="-.8">
+         <param_driver>
+            <driven
+             id="511"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="512"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="503"
+       group="0"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="6"
+       name="Platform Height"
+       label_min="Low Platforms"
+       label_max="High Platforms"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_angle="45"
+       camera_distance=".5"
+       camera_elevation="-1">
+         <param_driver>
+            <driven
+             id="501" />
+
+            <driven
+             id="502" />
+         </param_driver>
+      </param>
+
+      <param
+       id="193"
+       group="0"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="3"
+       name="Head Shape"
+	   label="Head Shape"
+       label_min="More Square"
+       label_max="More Round"
+       show_simple="true"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="188"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="642"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="189"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="643"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="157"
+       group="0"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="13"
+       name="Belly Size"
+       label_min="Small"
+       label_max="Big"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_distance="1.4"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="104" />
+
+            <driven
+             id="156" />
+
+            <driven
+             id="849" />
+         </param_driver>
+      </param>
+
+      <param
+       id="637"
+       group="0"
+       wearable="shape"
+       edit_group="shape_body"
+       edit_group_order="3"
+       name="Body Fat"
+       label_min="Less Body Fat"
+       label_max="More Body Fat"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_distance="1.8">
+         <param_driver>
+            <driven
+             id="633" />
+
+            <driven
+             id="634" />
+
+            <driven
+             id="635" />
+
+            <driven
+             id="851" />
+         </param_driver>
+      </param>
+
+      <param
+       id="130"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="8"
+       name="Front Fringe"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".45"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="144"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="145"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="131"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="9"
+       name="Side Fringe"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_driver>
+            <driven
+             id="146"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="147"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="132"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="10"
+       name="Back Fringe"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".39"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="160">
+         <param_driver>
+            <driven
+             id="148"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="149"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="133"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="2"
+       name="Hair Front"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".25"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="172"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="171"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="134"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="3"
+       name="Hair Sides"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_driver>
+            <driven
+             id="174"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="173"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="135"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="4"
+       name="Hair Back"
+	   show_simple="true"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".55"
+       camera_elevation="-.1"
+       camera_distance=".8"
+       camera_angle="160">
+         <param_driver>
+            <driven
+             id="176"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="175"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="136"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="11.5"
+       name="Hair Sweep"
+       label_min="Sweep Forward"
+       label_max="Sweep Back"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_driver>
+            <driven
+             id="179"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="178"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="137"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="16"
+       name="Hair Tilt"
+       label_min="Left"
+       label_max="Right"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_driver>
+            <driven
+             id="190"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="191"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="608"
+       group="0"
+       wearable="jacket"
+       edit_group="jacket"
+       edit_group_order="2"
+       name="bottom length lower"
+       label="Jacket Length"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".8"
+       camera_distance="1.4"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="620" />
+
+            <driven
+             id="1025" />
+
+            <driven
+             id="1037" />
+
+            <driven
+             id="621" />
+
+            <driven
+             id="1027" />
+
+            <driven
+             id="1033" />
+         </param_driver>
+      </param>
+
+      <param
+       id="609"
+       group="0"
+       wearable="jacket"
+       edit_group="jacket"
+       edit_group_order="4"
+       name="open jacket"
+       label="Open Front"
+       label_min="Open"
+       label_max="Closed"
+       value_min="0"
+       value_max="1"
+       value_default=".2"
+       camera_distance="1.4"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="622" />
+
+            <driven
+             id="1026" />
+
+            <driven
+             id="1038" />
+
+            <driven
+             id="623" />
+
+            <driven
+             id="1028" />
+
+            <driven
+             id="1034" />
+         </param_driver>
+      </param>
+
+      <param
+       id="105"
+       group="0"
+       sex="female"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="6"
+       name="Breast Size"
+       label_min="Small"
+       label_max="Large"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".3"
+       camera_distance="1.2"
+       camera_angle="30">
+         <param_driver>
+            <driven
+             id="843"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".01" />
+
+            <driven
+             id="627"
+             min1="0"
+             max1="0.01"
+             max2="0.01"
+             min2=".5" />
+
+            <driven
+             id="626"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="629"
+       group="0"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="6"
+       name="Forehead Angle"
+       label_min="More Vertical"
+       label_max="More Sloped"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="70">
+         <param_driver>
+            <driven
+             id="630"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="644"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="631"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="645"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="646"
+       group="0"
+       name="Egg_Head"
+       label="Egg Head"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="4"
+       label_min="Chin Heavy"
+       label_max="Forehead Heavy"
+       show_simple="true"
+       value_min="-1.3"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="640" />
+
+            <driven
+             id="186" />
+         </param_driver>
+      </param>
+
+      <param
+       id="647"
+       group="0"
+       name="Squash_Stretch_Head"
+       label="Head Stretch"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="2"
+       show_simple="true"
+       label_min="Squash Head"
+       label_max="Stretch Head"
+       value_min="-0.5"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="641" />
+
+            <driven
+             id="187" />
+         </param_driver>
+      </param>
+
+      <param
+       id="649"
+       group="0"
+       sex="female"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="1.1"
+       name="Torso Muscles"
+	   label="Torso Muscles"
+	   show_simple="true"
+       label_min="Less Muscular"
+       label_max="More Muscular"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance="1"
+       camera_angle="15">
+         <param_driver>
+            <driven
+             id="648"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="106"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="678"
+       group="0"
+       sex="male"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="1"
+       name="Torso Muscles"
+       show_simple="true"
+	   label_min="Less Muscular"
+       label_max="More Muscular"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance="1.2"
+       camera_angle="0">
+         <param_driver>
+            <driven
+             id="677"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="106"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="652"
+       group="0"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="1"
+       name="Leg Muscles"
+       label_min="Less Muscular"
+       label_max="More Muscular"
+       show_simple="true"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_distance="1.3"
+       camera_elevation="-.5"
+       camera_angle="15">
+         <param_driver>
+            <driven
+             id="651"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="152"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="80"
+       name="male"
+       group="0"
+       edit_group="dummy"
+       wearable="shape"
+       value_min="0"
+       value_max="1">
+         <param_driver>
+            <driven
+             id="32" />
+
+            <driven
+             id="153" />
+
+            <driven
+             id="40" />
+
+            <driven
+             id="100" />
+
+            <driven
+             id="857" />
+         </param_driver>
+      </param>
+
+      <param
+       id="659"
+       group="0"
+       wearable="shape"
+       edit_group="shape_mouth"
+       edit_group_order="5"
+       name="Mouth Corner"
+       label_min="Corner Down"
+       label_max="Corner Up"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation="0"
+       camera_distance=".28">
+         <param_driver>
+            <driven
+             id="658"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="657"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="662"
+       group="0"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="5"
+       name="Face Shear"
+       label_min="Shear Right Up"
+       label_max="Shear Left Up"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_driver>
+            <driven
+             id="660" />
+
+            <driven
+             id="661" />
+
+            <driven
+             id="774" />
+         </param_driver>
+      </param>
+
+      <param
+       id="773"
+       group="0"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="4.5"
+       name="Head Length"
+       label_min="Flat Head"
+       label_max="Long Head"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="75">
+         <param_driver>
+            <driven
+             id="770" />
+
+            <driven
+             id="771" />
+
+            <driven
+             id="772" />
+         </param_driver>
+      </param>
+
+      <param
+       id="682"
+       group="0"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="1"
+       name="Head Size"
+	   label="Head Size"
+       label_min="Small Head"
+       label_max="Big Head"
+       show_simple="true"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_driver>
+            <driven
+             id="679" />
+
+            <driven
+             id="694" />
+
+            <driven
+             id="680" />
+
+            <driven
+             id="681" />
+
+            <driven
+             id="655" />
+         </param_driver>
+      </param>
+
+      <param
+       id="690"
+       group="0"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="1"
+       name="Eye Size"
+	   label="Eye Size"
+       label_min="Beady Eyes"
+       label_max="Anime Eyes"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+	   show_simple="true"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_driver>
+            <driven
+             id="686" />
+
+            <driven
+             id="687" />
+
+            <driven
+             id="695" />
+
+            <driven
+             id="688" />
+
+            <driven
+             id="691" />
+
+            <driven
+             id="689" />
+         </param_driver>
+      </param>
+
+      <param
+       id="752"
+       group="0"
+       sex="male"
+       wearable="hair"
+       edit_group="hair_facial"
+       edit_group_order="1"
+       name="Hair Thickness"
+       label_min="5 O'Clock Shadow"
+       label_max="Bushy Hair"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation="0"
+       camera_distance=".28">
+         <param_driver>
+            <driven
+             id="751"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".2" />
+
+            <driven
+             id="1012"
+             min1="0"
+             max1="0"
+             max2=".2"
+             min2=".6" />
+
+            <driven
+             id="400"
+             min1=".2"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="763"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="1"
+       name="Hair Volume"
+	   show_simple="true"
+       label_min="Less Volume"
+       label_max="More Volume"
+       value_min="0"
+       value_max="1"
+       value_default=".55"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="761"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="180"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="834"
+       group="0"
+       wearable="jacket"
+       edit_group="colorpicker"
+       name="jacket_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+         <param_driver>
+            <driven
+             id="809"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="831"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="835"
+       group="0"
+       wearable="jacket"
+       edit_group="colorpicker"
+       name="jacket_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+         <param_driver>
+            <driven
+             id="810"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="832"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="836"
+       group="0"
+       wearable="jacket"
+       edit_group="colorpicker"
+       name="jacket_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+         <param_driver>
+            <driven
+             id="811"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="833"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="785"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="14.6"
+       name="Pigtails"
+	   show_simple="true"
+       label_min="Short Pigtails"
+       label_max="Long Pigtails"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="15">
+         <param_driver>
+            <driven
+             id="782"
+             min1="0"
+             max1=".10"
+             max2=".10"
+             min2=".5" />
+
+            <driven
+             id="783"
+             min1=".10"
+             max1=".5"
+             max2=".5"
+             min2=".75" />
+
+            <driven
+             id="790"
+             min1=".5"
+             max1=".75"
+             max2=".75"
+             min2="1" />
+
+            <driven
+             id="784"
+             min1=".75"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="789"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="14.7"
+       name="Ponytail"
+       label_min="Short Ponytail"
+       label_max="Long Ponytail"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="180">
+         <param_driver>
+            <driven
+             id="786"
+             min1="0"
+             max1=".10"
+             max2=".10"
+             min2=".66" />
+
+            <driven
+             id="787"
+             min1=".10"
+             max1=".66"
+             max2=".66"
+             min2="1" />
+
+            <driven
+             id="788"
+             min1=".66"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="795"
+       group="0"
+       name="Butt Size"
+       label="Butt Size"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="4"
+       label_min="Flat Butt"
+       label_max="Big Butt"
+       value_min="0"
+       value_max="1"
+       value_default=".25"
+       camera_angle="180"
+       camera_distance=".6">
+         <param_driver>
+            <driven
+             id="867"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".3" />
+
+            <driven
+             id="794"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".3" />
+
+            <driven
+             id="151"
+             min1=".3"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="852"
+             min1=".3"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="841"
+       group="0"
+       name="Bowed_Legs"
+       label="Knee Angle"
+       wearable="shape"
+       edit_group_order="5.5"
+       edit_group="shape_legs"
+       label_min="Knock Kneed"
+       label_max="Bow Legged"
+       value_min="-1"
+       value_max="1"
+       value_default="0"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_driver>
+            <driven
+             id="853" />
+
+            <driven
+             id="847" />
+         </param_driver>
+      </param>
+
+      <param
+       id="753"
+       group="0"
+       name="Saddlebags"
+       label="Saddle Bags"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="5"
+       label_min="Less Saddle"
+       label_max="More Saddle"
+       value_min="-0.5"
+       value_max="3"
+       value_default="0"
+       camera_angle="0"
+       camera_distance="1.2">
+         <param_driver>
+            <driven
+             id="850" />
+
+            <driven
+             id="854" />
+         </param_driver>
+      </param>
+
+      <param
+       id="676"
+       group="0"
+       name="Love_Handles"
+       label="Love Handles"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="12"
+       label_min="Less Love"
+       label_max="More Love"
+       value_min="-1"
+       value_max="2"
+       value_default="0"
+       camera_elevation=".3"
+       camera_distance=".9">
+         <param_driver>
+            <driven
+             id="855" />
+
+            <driven
+             id="856" />
+         </param_driver>
+      </param>
+
+      <param
+       id="863"
+       group="0"
+       name="skirt_looseness"
+       label="Skirt Fit"
+	   show_simple="true"
+       clothing_morph="true"
+       wearable="skirt"
+       edit_group_order="2"
+       edit_group="skirt"
+       label_min="Tight Skirt"
+       label_max="Poofy Skirt"
+       value_min="0"
+       value_max="1"
+       value_default=".333"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_driver>
+            <driven
+             id="866"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".2" />
+
+            <driven
+             id="846"
+             min1="0"
+             max1=".5"
+             max2=".5"
+             min2="1" />
+
+            <driven
+             id="845"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="119"
+       group="0"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="1"
+       name="Eyebrow Size"
+	   show_simple="true"
+       label_min="Thin Eyebrows"
+       label_max="Bushy Eyebrows"
+       value_min="0"
+       value_max="1"
+       value_default="0.5"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_driver>
+            <driven
+             id="1000" />
+
+            <driven
+             id="1001" />
+         </param_driver>
+      </param>
+
+      <param
+       id="750"
+       group="0"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="2"
+       name="Eyebrow Density"
+       label_min="Sparse"
+       label_max="Dense"
+       value_min="0"
+       value_max="1"
+       value_default="0.7"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_driver>
+            <driven
+             id="1002" />
+
+            <driven
+             id="1003" />
+         </param_driver>
+      </param>
+
+      <param
+       id="166"
+       sex="male"
+       group="0"
+       wearable="hair"
+       edit_group="hair_facial"
+       edit_group_order="2"
+       name="Sideburns"
+	   show_simple="true"
+       label_min="Short Sideburns"
+       label_max="Mutton Chops"
+       value_min="0"
+       value_max="1"
+       value_default="0.0"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="30">
+         <param_driver>
+            <driven
+             id="1004" />
+
+            <driven
+             id="1005" />
+         </param_driver>
+      </param>
+
+      <param
+       id="167"
+       sex="male"
+       group="0"
+       wearable="hair"
+       edit_group="hair_facial"
+       edit_group_order="3"
+       name="Moustache"
+	   show_simple="true"
+       label_min="Chaplin"
+       label_max="Handlebars"
+       value_min="0"
+       value_max="1"
+       value_default="0.0"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="30">
+         <param_driver>
+            <driven
+             id="1006" />
+
+            <driven
+             id="1007" />
+         </param_driver>
+      </param>
+
+      <param
+       id="168"
+       sex="male"
+       group="0"
+       wearable="hair"
+       edit_group="hair_facial"
+       edit_group_order="5"
+       name="Soulpatch"
+	   show_simple="true"
+       label_min="Less soul"
+       label_max="More soul"
+       value_min="0"
+       value_max="1"
+       value_default="0.0"
+       camera_elevation="-.1"
+       camera_distance=".3"
+       camera_angle="0">
+         <param_driver>
+            <driven
+             id="1008" />
+
+            <driven
+             id="1009" />
+         </param_driver>
+      </param>
+
+      <param
+       id="169"
+       sex="male"
+       group="0"
+       wearable="hair"
+       edit_group="hair_facial"
+       edit_group_order="4"
+       name="Chin Curtains"
+	   show_simple="true"
+       label_min="Less Curtains"
+       label_max="More Curtains"
+       value_min="0"
+       value_max="1"
+       value_default="0.0"
+       camera_elevation="-.1"
+       camera_distance=".3"
+       camera_angle="45">
+         <param_driver>
+            <driven
+             id="1010" />
+
+            <driven
+             id="1011" />
+         </param_driver>
+      </param>
+
+      <param
+       id="606"
+       group="0"
+       wearable="jacket"
+       edit_group="jacket"
+       edit_group_order="1"
+       name="Sleeve Length"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".8"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1019" />
+
+            <driven
+             id="1039" />
+
+            <driven
+             id="1020" />
+         </param_driver>
+      </param>
+
+      <param
+       id="607"
+       group="0"
+       wearable="jacket"
+       edit_group="jacket"
+       edit_group_order="3"
+       name="Collar Front"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".8"
+       camera_distance="1.2"
+       camera_angle="15"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1021" />
+
+            <driven
+             id="1040" />
+
+            <driven
+             id="1022" />
+         </param_driver>
+      </param>
+
+      <param
+       id="780"
+       group="0"
+       wearable="jacket"
+       edit_group="jacket"
+       edit_group_order="3.5"
+       name="Collar Back"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".8"
+       camera_distance="1.2"
+       camera_angle="195"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1023" />
+
+            <driven
+             id="1041" />
+
+            <driven
+             id="1024" />
+         </param_driver>
+      </param>
+
+      <param
+       id="603"
+       group="0"
+       wearable="undershirt"
+       edit_group="undershirt"
+       edit_group_order="1"
+       name="Sleeve Length"
+       label_min="Short"
+       label_max="Long"
+       value_min=".01"
+       value_max="1"
+       value_default=".4"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1042" />
+
+            <driven
+             id="1043" />
+         </param_driver>
+      </param>
+
+      <param
+       id="604"
+       group="0"
+       wearable="undershirt"
+       edit_group="undershirt"
+       edit_group_order="2"
+       name="Bottom"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".85"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1044" />
+
+            <driven
+             id="1045" />
+         </param_driver>
+      </param>
+
+      <param
+       id="605"
+       group="0"
+       wearable="undershirt"
+       edit_group="undershirt"
+       edit_group_order="3"
+       name="Collar Front"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".84"
+       camera_distance=".8"
+       camera_angle="15"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1046" />
+
+            <driven
+             id="1047" />
+         </param_driver>
+      </param>
+
+      <param
+       id="779"
+       group="0"
+       wearable="undershirt"
+       edit_group="undershirt"
+       edit_group_order="4"
+       name="Collar Back"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".84"
+       camera_distance=".8"
+       camera_angle="195"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1048" />
+
+            <driven
+             id="1049" />
+         </param_driver>
+      </param>
+
+      <param
+       id="617"
+       group="0"
+       wearable="socks"
+       edit_group="socks"
+       name="Socks Length"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default="0.35"
+       camera_distance=".95"
+       camera_angle="30"
+       camera_elevation="-.75">
+         <param_driver>
+            <driven
+             id="1050" />
+
+            <driven
+             id="1051" />
+         </param_driver>
+      </param>
+
+      <param
+       id="616"
+       group="0"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="1"
+       name="Shoe Height"
+       label_min="Short"
+       label_max="Tall"
+       value_min="0"
+       value_max="1"
+       value_default="0.1"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation="-.75">
+         <param_driver>
+            <driven
+             id="1052" />
+
+            <driven
+             id="1053" />
+         </param_driver>
+      </param>
+
+      <param
+       id="619"
+       group="0"
+       wearable="underpants"
+       edit_group="underpants"
+       name="Pants Length"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".3"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_driver>
+            <driven
+             id="1054" />
+
+            <driven
+             id="1055" />
+         </param_driver>
+      </param>
+
+      <param
+       id="624"
+       group="0"
+       wearable="underpants"
+       edit_group="underpants"
+       name="Pants Waist"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".8"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_driver>
+            <driven
+             id="1056" />
+
+            <driven
+             id="1057" />
+         </param_driver>
+      </param>
+
+      <param
+       id="93"
+       group="0"
+       wearable="gloves"
+       edit_group="gloves"
+       name="Glove Length"
+       label_min="Short"
+       label_max="Long"
+       value_min=".01"
+       value_max="1"
+       value_default=".8"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1058" />
+
+            <driven
+             id="1059" />
+         </param_driver>
+      </param>
+
+      <param
+       id="844"
+       group="0"
+       wearable="gloves"
+       edit_group="gloves"
+       name="Glove Fingers"
+       label_min="Fingerless"
+       label_max="Fingers"
+       value_min=".01"
+       value_max="1"
+       value_default="1"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1060" />
+
+            <driven
+             id="1061" />
+         </param_driver>
+      </param>
+
+<!--Pointy eyebrows became a driver/driven param with new max value for backwards compatibility between 1.0 and 1.1-->
+      <param
+       id="16"
+       group="0"
+       name="Pointy_Eyebrows"
+       label="Eyebrow Points"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="4"
+       label_min="Smooth"
+       label_max="Pointy"
+       value_min="-.5"
+       value_max="3"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_driver>
+            <driven
+             id="870" />
+         </param_driver>
+      </param>
+
+<!--Lower eyebrows became a driver/driven param with new min value for backwards compatibility between 1.0 and 1.1-->
+      <param
+       id="757"
+       group="0"
+       name="Lower_Eyebrows"
+       label="Eyebrow Height"
+	   show_simple="true"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="2.5"
+       label_min="Higher"
+       label_max="Lower"
+       value_min="-4"
+       value_max="2"
+       value_default="-1"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_driver>
+            <driven
+             id="871" />
+         </param_driver>
+      </param>
+
+<!--Arced eyebrows became a driver/driven param with new max value for backwards compatibility between 1.0 and 1.1-->
+      <param
+       id="31"
+       group="0"
+       name="Arced_Eyebrows"
+       label="Eyebrow Arc"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="3"
+       label_min="Flat"
+       label_max="Arced"
+       value_min="0"
+       value_max="2"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_driver>
+            <driven
+             id="872" />
+         </param_driver>
+      </param>
+      
+      <param
+       id="877"
+       group="0"
+       name="Jacket Wrinkles"
+       label="Jacket Wrinkles"
+       wearable="jacket"
+       edit_group="jacket"
+       edit_group_order="20"
+       label_min="No Wrinkles"
+       label_max="Wrinkles"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_driver>
+            <driven
+             id="875" />
+             
+             <driven
+             id="876" />
+         </param_driver>
+      </param>
+      
+   </driver_parameters>
+</linden_avatar>
+
diff --git a/indra/newview/character/avatar_lower_body.llm b/indra/newview/character/avatar_lower_body.llm
new file mode 100644
index 0000000000..0420899739
Binary files /dev/null and b/indra/newview/character/avatar_lower_body.llm differ
diff --git a/indra/newview/character/avatar_lower_body_1.llm b/indra/newview/character/avatar_lower_body_1.llm
new file mode 100644
index 0000000000..1394eb848b
Binary files /dev/null and b/indra/newview/character/avatar_lower_body_1.llm differ
diff --git a/indra/newview/character/avatar_lower_body_2.llm b/indra/newview/character/avatar_lower_body_2.llm
new file mode 100644
index 0000000000..0da9c1249e
Binary files /dev/null and b/indra/newview/character/avatar_lower_body_2.llm differ
diff --git a/indra/newview/character/avatar_lower_body_3.llm b/indra/newview/character/avatar_lower_body_3.llm
new file mode 100644
index 0000000000..f3c49a1568
Binary files /dev/null and b/indra/newview/character/avatar_lower_body_3.llm differ
diff --git a/indra/newview/character/avatar_lower_body_4.llm b/indra/newview/character/avatar_lower_body_4.llm
new file mode 100644
index 0000000000..e71721063e
Binary files /dev/null and b/indra/newview/character/avatar_lower_body_4.llm differ
diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml
new file mode 100644
index 0000000000..5e73804f2d
--- /dev/null
+++ b/indra/newview/character/avatar_skeleton.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
+<linden_skeleton version="1.0" num_bones="46" num_collision_volumes="19">
+<bone name="mPelvis" pos="0.000 0.000 1.067" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.000000 1.067015">
+	<collision_volume name="PELVIS" pos = "-0.01 0 -0.02" rot="0.000000 8.00000 0.000000" scale="0.12 0.16 0.17"/>
+	<bone name="mTorso" pos="0.000 0.000 0.084" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.000000 0.084073">
+		<collision_volume name="BELLY" pos = "0.028 0 0.04" rot="0.000000 8.00000 0.000000" scale="0.09 0.13 0.15"/>
+		<bone name="mChest" pos="-0.015 0.000 0.205" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.015368 0.000000 0.204877">
+			<collision_volume name="CHEST" pos = "0.028 0 0.07" rot="0.000000 -10.00000 0.000000" scale="0.11 0.15 0.2"/>
+			<bone name="mNeck" pos="-0.010 0.000 0.251" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.009507 0.000000 0.251108">
+				<collision_volume name="NECK" pos = "0.0 0 0.02" rot="0.000000 0.000000 0.000000" scale="0.05 0.06 0.08"/>
+				<bone name="mHead" pos="0.000 -0.000 0.076" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 -0.000000 0.075630">
+					<collision_volume name="HEAD" pos = "0.02 0 0.07" rot="0.000000 0.000000 0.000000" scale="0.11 0.09 0.12"/>
+					<bone name="mSkull" pos="0.000 0.000 0.079" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.000000 0.079000">
+					</bone>
+					<bone name="mEyeRight" pos="0.098 -0.036 0.079" rot="0.000000 0.000000 -0.000000" scale="1.000 1.000 1.000" pivot="0.098466 -0.036000 0.079000">
+					</bone>
+					<bone name="mEyeLeft" pos="0.098 0.036 0.079" rot="0.000000 -0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.098461 0.036000 0.079000">
+					</bone>
+				</bone>
+			</bone>
+			<bone name="mCollarLeft" pos="-0.021 0.085 0.165" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.020927 0.084665 0.165396">
+				<collision_volume name="L_CLAVICLE" pos = "0.02 0 0.02" rot="0.000000 0.00000 0.000000" scale="0.07 0.14 0.05"/>
+				<bone name="mShoulderLeft" pos="0.000 0.079 -0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.079000 -0.000000">
+					<collision_volume name="L_UPPER_ARM" pos = "0.0 0.12 0.01" rot="-5.000000 0.00000 0.000000" scale="0.05 0.17 0.05"/>
+					<bone name="mElbowLeft" pos="0.000 0.248 0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.248000 0.000000">
+						<collision_volume name="L_LOWER_ARM" pos = "0.0 0.1 0.0" rot="-3.000000 0.00000 0.000000" scale="0.04 0.14 0.04"/>
+						<bone name="mWristLeft" pos="-0.000 0.205 0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.000000 0.204846 0.000000">
+							<collision_volume name="L_HAND" pos = "0.01 0.05 0.0" rot="-3.000000 0.00000 -10.000000" scale="0.05 0.08 0.03"/>
+						</bone>
+					</bone>
+				</bone>
+			</bone>
+			<bone name="mCollarRight" pos="-0.021 -0.085 0.165" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.020927 -0.085000 0.165396">
+				<collision_volume name="R_CLAVICLE" pos = "0.02 0 0.02" rot="0.000000 0.00000 0.000000" scale="0.07 0.14 0.05"/>
+				<bone name="mShoulderRight" pos="0.000 -0.079 -0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 -0.079418 -0.000000">
+					<collision_volume name="R_UPPER_ARM" pos = "0.0 -0.12 0.01" rot="5.000000 0.00000 0.000000" scale="0.05 0.17 0.05"/>
+					<bone name="mElbowRight" pos="0.000 -0.248 -0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 -0.248000 -0.000000">
+						<collision_volume name="R_LOWER_ARM" pos = "0.0 -0.1 0.0" rot="3.000000 0.00000 0.000000" scale="0.04 0.14 0.04"/>
+						<bone name="mWristRight" pos="0.000 -0.205 -0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.000000 -0.205000 -0.000000">
+							<collision_volume name="R_HAND" pos = "0.01 -0.05 0.0" rot="3.000000 0.00000 10.000000" scale="0.05 0.08 0.03"/>
+						</bone>
+					</bone>
+				</bone>
+			</bone>
+		</bone>
+	</bone>
+	<bone name="mHipRight" pos="0.034 -0.129 -0.041" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.033620 -0.128806 -0.041086">
+		<collision_volume name="R_UPPER_LEG" pos = "-0.02 0.05 -0.22" rot="0.000000 0.00000 0.000000" scale="0.09 0.09 0.32"/>
+		<bone name="mKneeRight" pos="-0.001 0.049 -0.491" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.000780 0.048635 -0.490922">
+			<collision_volume name="R_LOWER_LEG" pos = "-0.02 0.0 -0.2" rot="0.000000 0.00000 0.000000" scale="0.06 0.06 0.25"/>
+			<bone name="mAnkleRight" pos="-0.029 0.000 -0.468" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.028869 0.000000 -0.468494">
+				<collision_volume name="R_FOOT"  pos = "0.077 0.0 -0.041" rot="0.000000 10.00000 0.000000" scale="0.13 0.05 0.05"/>
+				<bone name="mFootRight" pos="0.112 -0.000 -0.061" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.111956 -0.000000 -0.060637">
+					<bone name="mToeRight" pos="0.109 0.000 0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.105399 -0.010408 -0.000104">
+					</bone>
+				</bone>
+			</bone>
+		</bone>
+	</bone>
+	<bone name="mHipLeft" pos="0.034 0.127 -0.041" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.033757 0.126765 -0.040998">
+		<collision_volume name="L_UPPER_LEG" pos = "-0.02 -0.05 -0.22" rot="0.000000 0.00000 0.000000" scale="0.09 0.09 0.32"/>
+		<bone name="mKneeLeft" pos="-0.001 -0.046 -0.491" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.000887 -0.045568 -0.491053">
+			<collision_volume name="L_LOWER_LEG" pos = "-0.02 0.0 -0.2" rot="0.000000 0.00000 0.000000" scale="0.06 0.06 0.25"/>
+			<bone name="mAnkleLeft" pos="-0.029 0.001 -0.468" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.028887 0.001378 -0.468449">
+				<collision_volume name="L_FOOT" pos = "0.077 0.0 -0.041" rot="0.000000 10.00000 0.000000" scale="0.13 0.05 0.05"/>
+				<bone name="mFootLeft" pos="0.112 -0.000 -0.061" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.111956 -0.000000 -0.060620">
+					<bone name="mToeLeft" pos="0.109 0.000 0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.105387 0.008270 0.000871">
+					</bone>
+				</bone>
+			</bone>
+		</bone>
+	</bone>
+</bone>
+</linden_skeleton>
\ No newline at end of file
diff --git a/indra/newview/character/avatar_skirt.llm b/indra/newview/character/avatar_skirt.llm
new file mode 100644
index 0000000000..08ce3d1700
Binary files /dev/null and b/indra/newview/character/avatar_skirt.llm differ
diff --git a/indra/newview/character/avatar_skirt_1.llm b/indra/newview/character/avatar_skirt_1.llm
new file mode 100644
index 0000000000..88076c321f
Binary files /dev/null and b/indra/newview/character/avatar_skirt_1.llm differ
diff --git a/indra/newview/character/avatar_skirt_2.llm b/indra/newview/character/avatar_skirt_2.llm
new file mode 100644
index 0000000000..73b3effbc6
Binary files /dev/null and b/indra/newview/character/avatar_skirt_2.llm differ
diff --git a/indra/newview/character/avatar_skirt_3.llm b/indra/newview/character/avatar_skirt_3.llm
new file mode 100644
index 0000000000..ded546fdea
Binary files /dev/null and b/indra/newview/character/avatar_skirt_3.llm differ
diff --git a/indra/newview/character/avatar_skirt_4.llm b/indra/newview/character/avatar_skirt_4.llm
new file mode 100644
index 0000000000..b9d5cb945e
Binary files /dev/null and b/indra/newview/character/avatar_skirt_4.llm differ
diff --git a/indra/newview/character/avatar_upper_body.llm b/indra/newview/character/avatar_upper_body.llm
new file mode 100644
index 0000000000..da7d990540
Binary files /dev/null and b/indra/newview/character/avatar_upper_body.llm differ
diff --git a/indra/newview/character/avatar_upper_body_1.llm b/indra/newview/character/avatar_upper_body_1.llm
new file mode 100644
index 0000000000..31e104cc20
Binary files /dev/null and b/indra/newview/character/avatar_upper_body_1.llm differ
diff --git a/indra/newview/character/avatar_upper_body_2.llm b/indra/newview/character/avatar_upper_body_2.llm
new file mode 100644
index 0000000000..c1f4199b9c
Binary files /dev/null and b/indra/newview/character/avatar_upper_body_2.llm differ
diff --git a/indra/newview/character/avatar_upper_body_3.llm b/indra/newview/character/avatar_upper_body_3.llm
new file mode 100644
index 0000000000..9e89ed8b3e
Binary files /dev/null and b/indra/newview/character/avatar_upper_body_3.llm differ
diff --git a/indra/newview/character/avatar_upper_body_4.llm b/indra/newview/character/avatar_upper_body_4.llm
new file mode 100644
index 0000000000..ec836d1dc3
Binary files /dev/null and b/indra/newview/character/avatar_upper_body_4.llm differ
diff --git a/indra/newview/character/blush_alpha.tga b/indra/newview/character/blush_alpha.tga
new file mode 100644
index 0000000000..05be7e7e3d
Binary files /dev/null and b/indra/newview/character/blush_alpha.tga differ
diff --git a/indra/newview/character/body_skingrain.tga b/indra/newview/character/body_skingrain.tga
new file mode 100644
index 0000000000..7264baac14
Binary files /dev/null and b/indra/newview/character/body_skingrain.tga differ
diff --git a/indra/newview/character/bodyfreckles_alpha.tga b/indra/newview/character/bodyfreckles_alpha.tga
new file mode 100644
index 0000000000..d30ab3d122
Binary files /dev/null and b/indra/newview/character/bodyfreckles_alpha.tga differ
diff --git a/indra/newview/character/bump_face_wrinkles.tga b/indra/newview/character/bump_face_wrinkles.tga
new file mode 100644
index 0000000000..54bf7a55be
Binary files /dev/null and b/indra/newview/character/bump_face_wrinkles.tga differ
diff --git a/indra/newview/character/bump_head_base.tga b/indra/newview/character/bump_head_base.tga
new file mode 100644
index 0000000000..fa3568573a
Binary files /dev/null and b/indra/newview/character/bump_head_base.tga differ
diff --git a/indra/newview/character/bump_lowerbody_base.tga b/indra/newview/character/bump_lowerbody_base.tga
new file mode 100644
index 0000000000..498ea3c721
Binary files /dev/null and b/indra/newview/character/bump_lowerbody_base.tga differ
diff --git a/indra/newview/character/bump_pants_wrinkles.tga b/indra/newview/character/bump_pants_wrinkles.tga
new file mode 100644
index 0000000000..cca72415e8
Binary files /dev/null and b/indra/newview/character/bump_pants_wrinkles.tga differ
diff --git a/indra/newview/character/bump_shirt_wrinkles.tga b/indra/newview/character/bump_shirt_wrinkles.tga
new file mode 100644
index 0000000000..9e0d757a48
Binary files /dev/null and b/indra/newview/character/bump_shirt_wrinkles.tga differ
diff --git a/indra/newview/character/bump_upperbody_base.tga b/indra/newview/character/bump_upperbody_base.tga
new file mode 100644
index 0000000000..e57d6352e6
Binary files /dev/null and b/indra/newview/character/bump_upperbody_base.tga differ
diff --git a/indra/newview/character/eyebrows_alpha.tga b/indra/newview/character/eyebrows_alpha.tga
new file mode 100644
index 0000000000..c363e482e1
Binary files /dev/null and b/indra/newview/character/eyebrows_alpha.tga differ
diff --git a/indra/newview/character/eyeliner_alpha.tga b/indra/newview/character/eyeliner_alpha.tga
new file mode 100644
index 0000000000..1611eb3355
Binary files /dev/null and b/indra/newview/character/eyeliner_alpha.tga differ
diff --git a/indra/newview/character/eyeshadow_inner_alpha.tga b/indra/newview/character/eyeshadow_inner_alpha.tga
new file mode 100644
index 0000000000..37d7919395
Binary files /dev/null and b/indra/newview/character/eyeshadow_inner_alpha.tga differ
diff --git a/indra/newview/character/eyeshadow_outer_alpha.tga b/indra/newview/character/eyeshadow_outer_alpha.tga
new file mode 100644
index 0000000000..00eef9d9f7
Binary files /dev/null and b/indra/newview/character/eyeshadow_outer_alpha.tga differ
diff --git a/indra/newview/character/eyewhite.tga b/indra/newview/character/eyewhite.tga
new file mode 100644
index 0000000000..a720496988
Binary files /dev/null and b/indra/newview/character/eyewhite.tga differ
diff --git a/indra/newview/character/facehair_chincurtains_alpha.tga b/indra/newview/character/facehair_chincurtains_alpha.tga
new file mode 100644
index 0000000000..b10397063c
Binary files /dev/null and b/indra/newview/character/facehair_chincurtains_alpha.tga differ
diff --git a/indra/newview/character/facehair_moustache_alpha.tga b/indra/newview/character/facehair_moustache_alpha.tga
new file mode 100644
index 0000000000..4068c4f2b1
Binary files /dev/null and b/indra/newview/character/facehair_moustache_alpha.tga differ
diff --git a/indra/newview/character/facehair_sideburns_alpha.tga b/indra/newview/character/facehair_sideburns_alpha.tga
new file mode 100644
index 0000000000..acddc2d9bd
Binary files /dev/null and b/indra/newview/character/facehair_sideburns_alpha.tga differ
diff --git a/indra/newview/character/facehair_soulpatch_alpha.tga b/indra/newview/character/facehair_soulpatch_alpha.tga
new file mode 100644
index 0000000000..687091a29f
Binary files /dev/null and b/indra/newview/character/facehair_soulpatch_alpha.tga differ
diff --git a/indra/newview/character/freckles_alpha.tga b/indra/newview/character/freckles_alpha.tga
new file mode 100644
index 0000000000..a9a4ec0735
Binary files /dev/null and b/indra/newview/character/freckles_alpha.tga differ
diff --git a/indra/newview/character/genepool.xml b/indra/newview/character/genepool.xml
new file mode 100644
index 0000000000..52300c2bab
--- /dev/null
+++ b/indra/newview/character/genepool.xml
@@ -0,0 +1,7107 @@
+<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
+<linden_genepool version="1.0">
+   <archetype name="M W Skinny">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="1.540" />
+
+      <param id="2" name="Nose_Big_Out" value="0.720" />
+
+      <param id="4" name="Broad_Nostrils" value="0.540" />
+
+      <param id="5" name="Cleft_Chin" value="0.960" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.820" />
+
+      <param id="7" name="Weak_Chin" value="-0.260" />
+
+      <param id="8" name="Double_Chin" value="1.120" />
+
+      <param id="10" name="Sunken_Cheeks" value="1.780" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.100" />
+
+      <param id="12" name="Jowls" value="0.520" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.940" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.550" />
+
+      <param id="15" name="Ears_Out" value="0.160" />
+
+      <param id="17" name="Square_Jaw" value="-0.060" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-0.020" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.630" />
+
+      <param id="20" name="Bulbous_Nose" value="0.440" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.280" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.980" />
+
+      <param id="24" name="Wide_Eyes" value="-0.030" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.250" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.030" />
+
+      <param id="33" name="Height" value="1.440" />
+
+      <param id="34" name="Thickness" value="-0.500" />
+
+      <param id="35" name="Big_Ears" value="0.590" />
+
+      <param id="36" name="Shoulders" value="0.180" />
+
+      <param id="37" name="Hip Width" value="-1.160" />
+
+      <param id="38" name="Torso Length" value="-0.180" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.110" />
+
+      <param id="155" name="Lip Width" value="0.770" />
+
+      <param id="157" name="Belly Size" value="0.030" />
+
+      <param id="185" name="Deep_Chin" value="-0.320" />
+
+      <param id="193" name="Head Shape" value="0.350" />
+
+      <param id="196" name="Eye Spacing" value="-0.050" />
+
+      <param id="505" name="Lip Thickness" value="0.560" />
+
+      <param id="506" name="Mouth_Height" value="-0.400" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.560" />
+
+      <param id="517" name="Wide_Nose" value="-0.290" />
+
+      <param id="518" name="Eyelashes_Long" value="0.640" />
+
+      <param id="629" name="Forehead Angle" value="0.040" />
+
+      <param id="637" name="Body Fat" value="0.070" />
+
+      <param id="646" name="Egg_Head" value="-0.590" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.760" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.250" />
+
+      <param id="652" name="Leg Muscles" value="0.600" />
+
+      <param id="653" name="Tall_Lips" value="-1.000" />
+
+      <param id="656" name="Crooked_Nose" value="-0.120" />
+
+      <param id="659" name="Mouth Corner" value="0.720" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.230" />
+
+      <param id="665" name="Jaw_Jut" value="0.040" />
+
+      <param id="675" name="Hand Size" value="0.060" />
+
+      <param id="676" name="Love_Handles" value="-0.160" />
+
+      <param id="678" name="Torso Muscles" value="0.550" />
+
+      <param id="682" name="Head Size" value="0.670" />
+
+      <param id="683" name="Neck Thickness" value="-0.090" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.280" />
+
+      <param id="690" name="Eye Size" value="0.470" />
+
+      <param id="692" name="Leg Length" value="0.540" />
+
+      <param id="693" name="Arm Length" value="0.540" />
+
+      <param id="753" name="Saddlebags" value="0.030" />
+
+      <param id="756" name="Neck Length" value="0.240" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.720" />
+
+      <param id="759" name="Low_Septum_Nose" value="1.200" />
+
+      <param id="760" name="Jaw_Angle" value="0.910" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.610" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.820" />
+
+      <param id="769" name="Eye Depth" value="0.190" />
+
+      <param id="773" name="Head Length" value="0.370" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.097" />
+
+      <param id="111" name="Pigment" value="0.120" />
+
+      <param id="116" name="Rosy Complexion" value="0.320" />
+
+      <param id="117" name="Lip Pinkness" value="0.560" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.210" />
+
+      <param id="163" name="Wrinkles" value="0.490" />
+
+      <param id="165" name="Freckles" value="0.740" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.810" />
+
+      <param id="31" name="Arced_Eyebrows" value="1.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.150" />
+
+      <param id="114" name="Blonde Hair" value="0.960" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.210" />
+
+      <param id="130" name="Front Fringe" value="0.580" />
+
+      <param id="131" name="Side Fringe" value="0.370" />
+
+      <param id="132" name="Back Fringe" value="0.480" />
+
+      <param id="133" name="Hair Front" value="0.260" />
+
+      <param id="134" name="Hair Sides" value="0.580" />
+
+      <param id="135" name="Hair Back" value="0.570" />
+
+      <param id="136" name="Hair Sweep" value="0.370" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="1.520" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.315" />
+
+      <param id="166" name="Sideburns" value="0.890" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.260" />
+
+      <param id="169" name="Chin Curtains" value="0.890" />
+
+      <param id="177" name="Hair_Rumpled" value="0.560" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.060" />
+
+      <param id="182" name="Hair_Big_Top" value="-0.420" />
+
+      <param id="183" name="Hair_Big_Back" value="0.000" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.260" />
+
+      <param id="750" name="Eyebrow Density" value="0.840" />
+
+      <param id="752" name="Hair Thickness" value="0.120" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.020" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.000" />
+
+      <param id="757" name="Lower_Eyebrows" value="2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.770" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.260" />
+
+      <param id="99" name="Eye Color" value="0.420" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M W Old">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="1.680" />
+
+      <param id="2" name="Nose_Big_Out" value="1.250" />
+
+      <param id="4" name="Broad_Nostrils" value="0.340" />
+
+      <param id="5" name="Cleft_Chin" value="0.410" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.310" />
+
+      <param id="7" name="Weak_Chin" value="-0.120" />
+
+      <param id="8" name="Double_Chin" value="1.500" />
+
+      <param id="10" name="Sunken_Cheeks" value="1.650" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.160" />
+
+      <param id="12" name="Jowls" value="2.020" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.330" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.200" />
+
+      <param id="15" name="Ears_Out" value="0.660" />
+
+      <param id="17" name="Square_Jaw" value="-0.500" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-1.500" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-1.350" />
+
+      <param id="20" name="Bulbous_Nose" value="0.440" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.790" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="1.500" />
+
+      <param id="24" name="Wide_Eyes" value="-0.340" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="1.270" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.100" />
+
+      <param id="33" name="Height" value="-0.060" />
+
+      <param id="34" name="Thickness" value="-0.410" />
+
+      <param id="35" name="Big_Ears" value="1.430" />
+
+      <param id="36" name="Shoulders" value="-1.800" />
+
+      <param id="37" name="Hip Width" value="-0.380" />
+
+      <param id="38" name="Torso Length" value="0.060" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.230" />
+
+      <param id="155" name="Lip Width" value="0.440" />
+
+      <param id="157" name="Belly Size" value="0.610" />
+
+      <param id="185" name="Deep_Chin" value="0.060" />
+
+      <param id="193" name="Head Shape" value="0.240" />
+
+      <param id="196" name="Eye Spacing" value="0.580" />
+
+      <param id="505" name="Lip Thickness" value="0.280" />
+
+      <param id="506" name="Mouth_Height" value="0.680" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="2.000" />
+
+      <param id="517" name="Wide_Nose" value="-0.140" />
+
+      <param id="518" name="Eyelashes_Long" value="-0.010" />
+
+      <param id="629" name="Forehead Angle" value="0.080" />
+
+      <param id="637" name="Body Fat" value="0.220" />
+
+      <param id="646" name="Egg_Head" value="0.240" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.500" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.520" />
+
+      <param id="652" name="Leg Muscles" value="0.160" />
+
+      <param id="653" name="Tall_Lips" value="-1.000" />
+
+      <param id="656" name="Crooked_Nose" value="0.680" />
+
+      <param id="659" name="Mouth Corner" value="0.210" />
+
+      <param id="662" name="Face Shear" value="0.570" />
+
+      <param id="663" name="Shift_Mouth" value="0.960" />
+
+      <param id="664" name="Pop_Eye" value="-0.340" />
+
+      <param id="665" name="Jaw_Jut" value="0.360" />
+
+      <param id="675" name="Hand Size" value="0.170" />
+
+      <param id="676" name="Love_Handles" value="0.740" />
+
+      <param id="678" name="Torso Muscles" value="0.120" />
+
+      <param id="682" name="Head Size" value="0.730" />
+
+      <param id="683" name="Neck Thickness" value="-0.240" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.970" />
+
+      <param id="690" name="Eye Size" value="0.370" />
+
+      <param id="692" name="Leg Length" value="0.320" />
+
+      <param id="693" name="Arm Length" value="0.580" />
+
+      <param id="753" name="Saddlebags" value="1.040" />
+
+      <param id="756" name="Neck Length" value="0.540" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.990" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.520" />
+
+      <param id="760" name="Jaw_Angle" value="-0.020" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="-0.250" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="2.500" />
+
+      <param id="769" name="Eye Depth" value="0.000" />
+
+      <param id="773" name="Head Length" value="0.530" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.010" />
+
+      <param id="111" name="Pigment" value="0.160" />
+
+      <param id="116" name="Rosy Complexion" value="0.010" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.660" />
+
+      <param id="162" name="Facial Definition" value="1.000" />
+
+      <param id="163" name="Wrinkles" value="1.000" />
+
+      <param id="165" name="Freckles" value="0.920" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.805" />
+
+      <param id="31" name="Arced_Eyebrows" value="1.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.150" />
+
+      <param id="114" name="Blonde Hair" value="0.960" />
+
+      <param id="115" name="White Hair" value="1.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.210" />
+
+      <param id="130" name="Front Fringe" value="0.580" />
+
+      <param id="131" name="Side Fringe" value="0.000" />
+
+      <param id="132" name="Back Fringe" value="0.480" />
+
+      <param id="133" name="Hair Front" value="0.390" />
+
+      <param id="134" name="Hair Sides" value="0.350" />
+
+      <param id="135" name="Hair Back" value="0.540" />
+
+      <param id="136" name="Hair Sweep" value="0.370" />
+
+      <param id="137" name="Hair Tilt" value="0.370" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="2.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.070" />
+
+      <param id="166" name="Sideburns" value="0.890" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.260" />
+
+      <param id="169" name="Chin Curtains" value="0.890" />
+
+      <param id="177" name="Hair_Rumpled" value="0.470" />
+
+      <param id="181" name="Hair_Big_Front" value="0.460" />
+
+      <param id="182" name="Hair_Big_Top" value="-0.160" />
+
+      <param id="183" name="Hair_Big_Back" value="0.100" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.560" />
+
+      <param id="750" name="Eyebrow Density" value="0.840" />
+
+      <param id="752" name="Hair Thickness" value="0.120" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.190" />
+
+      <param id="755" name="Hair_Taper_Front" value="1.500" />
+
+      <param id="757" name="Lower_Eyebrows" value="2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="1.710" />
+
+      <param id="763" name="Hair Volume" value="0.820" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.260" />
+
+      <param id="99" name="Eye Color" value="0.420" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M W Obese">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="1.380" />
+
+      <param id="2" name="Nose_Big_Out" value="0.750" />
+
+      <param id="4" name="Broad_Nostrils" value="0.170" />
+
+      <param id="5" name="Cleft_Chin" value="0.940" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.810" />
+
+      <param id="7" name="Weak_Chin" value="-0.070" />
+
+      <param id="8" name="Double_Chin" value="0.040" />
+
+      <param id="10" name="Sunken_Cheeks" value="-1.500" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.480" />
+
+      <param id="12" name="Jowls" value="1.990" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="1.500" />
+
+      <param id="14" name="High_Cheek_Bones" value="-0.310" />
+
+      <param id="15" name="Ears_Out" value="1.160" />
+
+      <param id="17" name="Square_Jaw" value="0.670" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="2.500" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.500" />
+
+      <param id="20" name="Bulbous_Nose" value="0.540" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.090" />
+
+      <param id="22" name="Attached_Earlobes" value="0.420" />
+
+      <param id="23" name="Baggy_Eyes" value="1.500" />
+
+      <param id="24" name="Wide_Eyes" value="-0.100" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.800" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.950" />
+
+      <param id="33" name="Height" value="-1.230" />
+
+      <param id="34" name="Thickness" value="1.500" />
+
+      <param id="35" name="Big_Ears" value="-0.220" />
+
+      <param id="36" name="Shoulders" value="-0.810" />
+
+      <param id="37" name="Hip Width" value="0.160" />
+
+      <param id="38" name="Torso Length" value="-0.360" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.540" />
+
+      <param id="155" name="Lip Width" value="-0.900" />
+
+      <param id="157" name="Belly Size" value="0.150" />
+
+      <param id="185" name="Deep_Chin" value="1.000" />
+
+      <param id="193" name="Head Shape" value="0.950" />
+
+      <param id="196" name="Eye Spacing" value="-1.100" />
+
+      <param id="505" name="Lip Thickness" value="1.000" />
+
+      <param id="506" name="Mouth_Height" value="1.240" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="0.120" />
+
+      <param id="517" name="Wide_Nose" value="0.580" />
+
+      <param id="518" name="Eyelashes_Long" value="0.220" />
+
+      <param id="629" name="Forehead Angle" value="0.120" />
+
+      <param id="637" name="Body Fat" value="1.000" />
+
+      <param id="646" name="Egg_Head" value="-1.280" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.500" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.950" />
+
+      <param id="652" name="Leg Muscles" value="0.520" />
+
+      <param id="653" name="Tall_Lips" value="0.890" />
+
+      <param id="656" name="Crooked_Nose" value="-0.240" />
+
+      <param id="659" name="Mouth Corner" value="0.310" />
+
+      <param id="662" name="Face Shear" value="0.470" />
+
+      <param id="663" name="Shift_Mouth" value="0.520" />
+
+      <param id="664" name="Pop_Eye" value="0.570" />
+
+      <param id="665" name="Jaw_Jut" value="-0.600" />
+
+      <param id="675" name="Hand Size" value="-0.110" />
+
+      <param id="676" name="Love_Handles" value="-0.130" />
+
+      <param id="678" name="Torso Muscles" value="0.410" />
+
+      <param id="682" name="Head Size" value="0.150" />
+
+      <param id="683" name="Neck Thickness" value="0.090" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="-0.400" />
+
+      <param id="690" name="Eye Size" value="0.070" />
+
+      <param id="692" name="Leg Length" value="-0.080" />
+
+      <param id="693" name="Arm Length" value="-0.060" />
+
+      <param id="753" name="Saddlebags" value="1.500" />
+
+      <param id="756" name="Neck Length" value="-0.520" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.990" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.300" />
+
+      <param id="760" name="Jaw_Angle" value="0.208" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.980" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="2.280" />
+
+      <param id="769" name="Eye Depth" value="0.370" />
+
+      <param id="773" name="Head Length" value="0.190" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.100" />
+
+      <param id="111" name="Pigment" value="0.000" />
+
+      <param id="116" name="Rosy Complexion" value="0.350" />
+
+      <param id="117" name="Lip Pinkness" value="0.470" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.000" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.400" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.500" />
+
+      <param id="31" name="Arced_Eyebrows" value="1.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.320" />
+
+      <param id="114" name="Blonde Hair" value="0.510" />
+
+      <param id="115" name="White Hair" value="0.170" />
+
+      <param id="119" name="Eyebrow Size" value="0.190" />
+
+      <param id="130" name="Front Fringe" value="0.470" />
+
+      <param id="131" name="Side Fringe" value="0.370" />
+
+      <param id="132" name="Back Fringe" value="0.300" />
+
+      <param id="133" name="Hair Front" value="0.370" />
+
+      <param id="134" name="Hair Sides" value="0.190" />
+
+      <param id="135" name="Hair Back" value="0.000" />
+
+      <param id="136" name="Hair Sweep" value="0.600" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.370" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.860" />
+
+      <param id="181" name="Hair_Big_Front" value="0.240" />
+
+      <param id="182" name="Hair_Big_Top" value="0.060" />
+
+      <param id="183" name="Hair_Big_Back" value="0.120" />
+
+      <param id="184" name="Hair_Spiked" value="0.120" />
+
+      <param id="192" name="Bangs_Part_Middle" value="1.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="-0.640" />
+
+      <param id="750" name="Eyebrow Density" value="0.410" />
+
+      <param id="752" name="Hair Thickness" value="0.000" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.350" />
+
+      <param id="755" name="Hair_Taper_Front" value="-1.170" />
+
+      <param id="757" name="Lower_Eyebrows" value="-2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="1.500" />
+
+      <param id="763" name="Hair Volume" value="0.820" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.270" />
+
+      <param id="99" name="Eye Color" value="0.090" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name=" M W Muscle">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.550" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.070" />
+
+      <param id="4" name="Broad_Nostrils" value="0.160" />
+
+      <param id="5" name="Cleft_Chin" value="0.960" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.700" />
+
+      <param id="7" name="Weak_Chin" value="-0.280" />
+
+      <param id="8" name="Double_Chin" value="0.460" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.120" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.240" />
+
+      <param id="12" name="Jowls" value="0.010" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.940" />
+
+      <param id="14" name="High_Cheek_Bones" value="-0.020" />
+
+      <param id="15" name="Ears_Out" value="-0.260" />
+
+      <param id="17" name="Square_Jaw" value="-0.090" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-0.580" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.630" />
+
+      <param id="20" name="Bulbous_Nose" value="0.020" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.160" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.500" />
+
+      <param id="24" name="Wide_Eyes" value="-0.490" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.580" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="0.000" />
+
+      <param id="33" name="Height" value="0.580" />
+
+      <param id="34" name="Thickness" value="0.660" />
+
+      <param id="35" name="Big_Ears" value="0.410" />
+
+      <param id="36" name="Shoulders" value="0.470" />
+
+      <param id="37" name="Hip Width" value="-0.920" />
+
+      <param id="38" name="Torso Length" value="0.220" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.020" />
+
+      <param id="155" name="Lip Width" value="0.240" />
+
+      <param id="157" name="Belly Size" value="0.110" />
+
+      <param id="185" name="Deep_Chin" value="0.260" />
+
+      <param id="193" name="Head Shape" value="0.370" />
+
+      <param id="196" name="Eye Spacing" value="-0.080" />
+
+      <param id="505" name="Lip Thickness" value="0.500" />
+
+      <param id="506" name="Mouth_Height" value="0.600" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.800" />
+
+      <param id="517" name="Wide_Nose" value="-0.080" />
+
+      <param id="518" name="Eyelashes_Long" value="-0.080" />
+
+      <param id="629" name="Forehead Angle" value="0.170" />
+
+      <param id="637" name="Body Fat" value="0.120" />
+
+      <param id="646" name="Egg_Head" value="0.470" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.430" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.250" />
+
+      <param id="652" name="Leg Muscles" value="0.720" />
+
+      <param id="653" name="Tall_Lips" value="-0.580" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.480" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.000" />
+
+      <param id="665" name="Jaw_Jut" value="0.560" />
+
+      <param id="675" name="Hand Size" value="0.100" />
+
+      <param id="676" name="Love_Handles" value="0.140" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.650" />
+
+      <param id="683" name="Neck Thickness" value="0.070" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.260" />
+
+      <param id="692" name="Leg Length" value="0.340" />
+
+      <param id="693" name="Arm Length" value="0.440" />
+
+      <param id="753" name="Saddlebags" value="0.440" />
+
+      <param id="756" name="Neck Length" value="-0.020" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.270" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.950" />
+
+      <param id="760" name="Jaw_Angle" value="-0.050" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.470" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.820" />
+
+      <param id="769" name="Eye Depth" value="0.230" />
+
+      <param id="773" name="Head Length" value="0.670" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.075" />
+
+      <param id="111" name="Pigment" value="0.220" />
+
+      <param id="116" name="Rosy Complexion" value="0.170" />
+
+      <param id="117" name="Lip Pinkness" value="0.170" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.320" />
+
+      <param id="163" name="Wrinkles" value="0.490" />
+
+      <param id="165" name="Freckles" value="0.250" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.280" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.270" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.480" />
+
+      <param id="114" name="Blonde Hair" value="0.500" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.470" />
+
+      <param id="130" name="Front Fringe" value="0.350" />
+
+      <param id="131" name="Side Fringe" value="0.370" />
+
+      <param id="132" name="Back Fringe" value="0.420" />
+
+      <param id="133" name="Hair Front" value="0.040" />
+
+      <param id="134" name="Hair Sides" value="0.580" />
+
+      <param id="135" name="Hair Back" value="0.520" />
+
+      <param id="136" name="Hair Sweep" value="0.510" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="1.520" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.200" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.560" />
+
+      <param id="181" name="Hair_Big_Front" value="0.520" />
+
+      <param id="182" name="Hair_Big_Top" value="0.020" />
+
+      <param id="183" name="Hair_Big_Back" value="0.460" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.050" />
+
+      <param id="750" name="Eyebrow Density" value="0.610" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.020" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.000" />
+
+      <param id="757" name="Lower_Eyebrows" value="0.560" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.650" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.170" />
+
+      <param id="99" name="Eye Color" value="0.340" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="W M Chubby">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.710" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.110" />
+
+      <param id="4" name="Broad_Nostrils" value="0.310" />
+
+      <param id="5" name="Cleft_Chin" value="0.340" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.260" />
+
+      <param id="7" name="Weak_Chin" value="-0.260" />
+
+      <param id="8" name="Double_Chin" value="1.040" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.560" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.020" />
+
+      <param id="12" name="Jowls" value="1.240" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.690" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.650" />
+
+      <param id="15" name="Ears_Out" value="-0.180" />
+
+      <param id="17" name="Square_Jaw" value="-0.170" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.580" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.500" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.020" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.600" />
+
+      <param id="22" name="Attached_Earlobes" value="0.420" />
+
+      <param id="23" name="Baggy_Eyes" value="0.680" />
+
+      <param id="24" name="Wide_Eyes" value="0.460" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.250" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.320" />
+
+      <param id="33" name="Height" value="0.880" />
+
+      <param id="34" name="Thickness" value="0.800" />
+
+      <param id="35" name="Big_Ears" value="1.100" />
+
+      <param id="36" name="Shoulders" value="0.310" />
+
+      <param id="37" name="Hip Width" value="-1.040" />
+
+      <param id="38" name="Torso Length" value="-0.740" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.330" />
+
+      <param id="155" name="Lip Width" value="-0.200" />
+
+      <param id="157" name="Belly Size" value="0.320" />
+
+      <param id="185" name="Deep_Chin" value="0.680" />
+
+      <param id="193" name="Head Shape" value="0.720" />
+
+      <param id="196" name="Eye Spacing" value="-0.380" />
+
+      <param id="505" name="Lip Thickness" value="0.680" />
+
+      <param id="506" name="Mouth_Height" value="0.080" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.120" />
+
+      <param id="517" name="Wide_Nose" value="0.070" />
+
+      <param id="518" name="Eyelashes_Long" value="0.400" />
+
+      <param id="629" name="Forehead Angle" value="0.620" />
+
+      <param id="637" name="Body Fat" value="0.130" />
+
+      <param id="646" name="Egg_Head" value="-0.220" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.030" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.380" />
+
+      <param id="652" name="Leg Muscles" value="0.770" />
+
+      <param id="653" name="Tall_Lips" value="0.470" />
+
+      <param id="656" name="Crooked_Nose" value="-0.400" />
+
+      <param id="659" name="Mouth Corner" value="0.520" />
+
+      <param id="662" name="Face Shear" value="0.460" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.310" />
+
+      <param id="665" name="Jaw_Jut" value="-0.680" />
+
+      <param id="675" name="Hand Size" value="0.010" />
+
+      <param id="676" name="Love_Handles" value="0.380" />
+
+      <param id="678" name="Torso Muscles" value="0.800" />
+
+      <param id="682" name="Head Size" value="0.690" />
+
+      <param id="683" name="Neck Thickness" value="-0.030" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.010" />
+
+      <param id="690" name="Eye Size" value="0.210" />
+
+      <param id="692" name="Leg Length" value="-0.260" />
+
+      <param id="693" name="Arm Length" value="0.200" />
+
+      <param id="753" name="Saddlebags" value="0.650" />
+
+      <param id="756" name="Neck Length" value="-0.040" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.210" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.650" />
+
+      <param id="760" name="Jaw_Angle" value="0.240" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.610" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="1.100" />
+
+      <param id="769" name="Eye Depth" value="0.580" />
+
+      <param id="773" name="Head Length" value="0.350" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.084" />
+
+      <param id="111" name="Pigment" value="0.320" />
+
+      <param id="116" name="Rosy Complexion" value="0.120" />
+
+      <param id="117" name="Lip Pinkness" value="0.220" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.370" />
+
+      <param id="163" name="Wrinkles" value="0.150" />
+
+      <param id="165" name="Freckles" value="0.740" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.370" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.130" />
+
+      <param id="114" name="Blonde Hair" value="0.040" />
+
+      <param id="115" name="White Hair" value="0.170" />
+
+      <param id="119" name="Eyebrow Size" value="0.540" />
+
+      <param id="130" name="Front Fringe" value="0.470" />
+
+      <param id="131" name="Side Fringe" value="0.480" />
+
+      <param id="132" name="Back Fringe" value="0.500" />
+
+      <param id="133" name="Hair Front" value="0.370" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.600" />
+
+      <param id="136" name="Hair Sweep" value="0.210" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="2.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.785" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.470" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.000" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.120" />
+
+      <param id="182" name="Hair_Big_Top" value="0.060" />
+
+      <param id="183" name="Hair_Big_Back" value="0.240" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.020" />
+
+      <param id="750" name="Eyebrow Density" value="0.920" />
+
+      <param id="752" name="Hair Thickness" value="0.390" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.620" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.990" />
+
+      <param id="757" name="Lower_Eyebrows" value="-0.200" />
+
+      <param id="762" name="Hair_Shear_Front" value="1.440" />
+
+      <param id="763" name="Hair Volume" value="0.610" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.270" />
+
+      <param id="99" name="Eye Color" value="0.090" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M Troll">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="2.000" />
+
+      <param id="2" name="Nose_Big_Out" value="1.670" />
+
+      <param id="4" name="Broad_Nostrils" value="0.730" />
+
+      <param id="5" name="Cleft_Chin" value="0.110" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="1.000" />
+
+      <param id="7" name="Weak_Chin" value="0.500" />
+
+      <param id="8" name="Double_Chin" value="0.840" />
+
+      <param id="10" name="Sunken_Cheeks" value="1.830" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.440" />
+
+      <param id="12" name="Jowls" value="0.760" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.940" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.810" />
+
+      <param id="15" name="Ears_Out" value="1.500" />
+
+      <param id="17" name="Square_Jaw" value="0.050" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.420" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="0.300" />
+
+      <param id="20" name="Bulbous_Nose" value="1.040" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="-0.060" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="1.500" />
+
+      <param id="24" name="Wide_Eyes" value="1.970" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.720" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.300" />
+
+      <param id="33" name="Height" value="-2.210" />
+
+      <param id="34" name="Thickness" value="0.910" />
+
+      <param id="35" name="Big_Ears" value="2.000" />
+
+      <param id="36" name="Shoulders" value="1.180" />
+
+      <param id="37" name="Hip Width" value="-1.160" />
+
+      <param id="38" name="Torso Length" value="1.000" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.110" />
+
+      <param id="155" name="Lip Width" value="1.300" />
+
+      <param id="157" name="Belly Size" value="0.740" />
+
+      <param id="185" name="Deep_Chin" value="-0.960" />
+
+      <param id="193" name="Head Shape" value="0.010" />
+
+      <param id="196" name="Eye Spacing" value="1.000" />
+
+      <param id="505" name="Lip Thickness" value="0.730" />
+
+      <param id="506" name="Mouth_Height" value="1.080" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.560" />
+
+      <param id="517" name="Wide_Nose" value="0.170" />
+
+      <param id="518" name="Eyelashes_Long" value="1.500" />
+
+      <param id="629" name="Forehead Angle" value="1.000" />
+
+      <param id="637" name="Body Fat" value="0.000" />
+
+      <param id="646" name="Egg_Head" value="0.700" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.220" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.100" />
+
+      <param id="652" name="Leg Muscles" value="0.640" />
+
+      <param id="653" name="Tall_Lips" value="0.920" />
+
+      <param id="656" name="Crooked_Nose" value="-1.160" />
+
+      <param id="659" name="Mouth Corner" value="1.000" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="-0.320" />
+
+      <param id="664" name="Pop_Eye" value="1.250" />
+
+      <param id="665" name="Jaw_Jut" value="1.760" />
+
+      <param id="675" name="Hand Size" value="0.300" />
+
+      <param id="676" name="Love_Handles" value="-0.160" />
+
+      <param id="678" name="Torso Muscles" value="0.290" />
+
+      <param id="682" name="Head Size" value="1.000" />
+
+      <param id="683" name="Neck Thickness" value="-0.004" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.332" />
+
+      <param id="690" name="Eye Size" value="1.000" />
+
+      <param id="692" name="Leg Length" value="0.240" />
+
+      <param id="693" name="Arm Length" value="-0.220" />
+
+      <param id="753" name="Saddlebags" value="0.030" />
+
+      <param id="756" name="Neck Length" value="-0.420" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-1.500" />
+
+      <param id="759" name="Low_Septum_Nose" value="1.500" />
+
+      <param id="760" name="Jaw_Angle" value="1.580" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="1.100" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="2.440" />
+
+      <param id="769" name="Eye Depth" value="0.000" />
+
+      <param id="773" name="Head Length" value="1.000" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="1.000" />
+
+      <param id="110" name="Red Skin" value="0.100" />
+
+      <param id="111" name="Pigment" value="1.000" />
+
+      <param id="116" name="Rosy Complexion" value="0.320" />
+
+      <param id="117" name="Lip Pinkness" value="0.560" />
+
+      <param id="150" name="Body Definition" value="1.000" />
+
+      <param id="162" name="Facial Definition" value="1.000" />
+
+      <param id="163" name="Wrinkles" value="0.490" />
+
+      <param id="165" name="Freckles" value="0.740" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.805" />
+
+      <param id="31" name="Arced_Eyebrows" value="1.000" />
+
+      <param id="112" name="Rainbow Color" value="1.000" />
+
+      <param id="113" name="Red Hair" value="0.000" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.210" />
+
+      <param id="130" name="Front Fringe" value="0.580" />
+
+      <param id="131" name="Side Fringe" value="0.000" />
+
+      <param id="132" name="Back Fringe" value="1.000" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.670" />
+
+      <param id="136" name="Hair Sweep" value="0.940" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-3.835" />
+
+      <param id="166" name="Sideburns" value="0.890" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.260" />
+
+      <param id="169" name="Chin Curtains" value="0.890" />
+
+      <param id="177" name="Hair_Rumpled" value="0.560" />
+
+      <param id="181" name="Hair_Big_Front" value="0.480" />
+
+      <param id="182" name="Hair_Big_Top" value="0.320" />
+
+      <param id="183" name="Hair_Big_Back" value="0.240" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.440" />
+
+      <param id="750" name="Eyebrow Density" value="0.840" />
+
+      <param id="752" name="Hair Thickness" value="0.120" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.350" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.330" />
+
+      <param id="757" name="Lower_Eyebrows" value="2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="3.000" />
+
+      <param id="763" name="Hair Volume" value="0.940" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.000" />
+
+      <param id="99" name="Eye Color" value="1.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M B Skinny">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.320" />
+
+      <param id="2" name="Nose_Big_Out" value="0.420" />
+
+      <param id="4" name="Broad_Nostrils" value="0.320" />
+
+      <param id="5" name="Cleft_Chin" value="0.680" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.490" />
+
+      <param id="7" name="Weak_Chin" value="-0.350" />
+
+      <param id="8" name="Double_Chin" value="-0.360" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.440" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.320" />
+
+      <param id="12" name="Jowls" value="-0.470" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.520" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.010" />
+
+      <param id="15" name="Ears_Out" value="1.020" />
+
+      <param id="17" name="Square_Jaw" value="-0.430" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.180" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-1.270" />
+
+      <param id="20" name="Bulbous_Nose" value="0.040" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="-0.040" />
+
+      <param id="22" name="Attached_Earlobes" value="0.590" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.300" />
+
+      <param id="24" name="Wide_Eyes" value="1.340" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.250" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.300" />
+
+      <param id="33" name="Height" value="-0.370" />
+
+      <param id="34" name="Thickness" value="-0.280" />
+
+      <param id="35" name="Big_Ears" value="0.410" />
+
+      <param id="36" name="Shoulders" value="-0.140" />
+
+      <param id="37" name="Hip Width" value="-0.860" />
+
+      <param id="38" name="Torso Length" value="-0.560" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.540" />
+
+      <param id="155" name="Lip Width" value="-0.170" />
+
+      <param id="157" name="Belly Size" value="0.000" />
+
+      <param id="185" name="Deep_Chin" value="0.720" />
+
+      <param id="193" name="Head Shape" value="0.700" />
+
+      <param id="196" name="Eye Spacing" value="0.610" />
+
+      <param id="505" name="Lip Thickness" value="0.800" />
+
+      <param id="506" name="Mouth_Height" value="0.400" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.080" />
+
+      <param id="517" name="Wide_Nose" value="0.870" />
+
+      <param id="518" name="Eyelashes_Long" value="0.940" />
+
+      <param id="629" name="Forehead Angle" value="0.340" />
+
+      <param id="637" name="Body Fat" value="0.170" />
+
+      <param id="646" name="Egg_Head" value="-0.010" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.250" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.220" />
+
+      <param id="652" name="Leg Muscles" value="0.520" />
+
+      <param id="653" name="Tall_Lips" value="0.950" />
+
+      <param id="656" name="Crooked_Nose" value="0.120" />
+
+      <param id="659" name="Mouth Corner" value="0.500" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="-0.400" />
+
+      <param id="664" name="Pop_Eye" value="0.100" />
+
+      <param id="665" name="Jaw_Jut" value="0.640" />
+
+      <param id="675" name="Hand Size" value="0.160" />
+
+      <param id="676" name="Love_Handles" value="-0.190" />
+
+      <param id="678" name="Torso Muscles" value="0.370" />
+
+      <param id="682" name="Head Size" value="0.820" />
+
+      <param id="683" name="Neck Thickness" value="-0.220" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="-0.260" />
+
+      <param id="690" name="Eye Size" value="0.470" />
+
+      <param id="692" name="Leg Length" value="0.540" />
+
+      <param id="693" name="Arm Length" value="0.780" />
+
+      <param id="753" name="Saddlebags" value="-0.250" />
+
+      <param id="756" name="Neck Length" value="0.540" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.690" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.550" />
+
+      <param id="760" name="Jaw_Angle" value="1.330" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.040" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="-0.300" />
+
+      <param id="769" name="Eye Depth" value="0.790" />
+
+      <param id="773" name="Head Length" value="0.690" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.650" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.800" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.440" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.220" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.580" />
+
+      <param id="130" name="Front Fringe" value="0.360" />
+
+      <param id="131" name="Side Fringe" value="0.310" />
+
+      <param id="132" name="Back Fringe" value="0.050" />
+
+      <param id="133" name="Hair Front" value="0.100" />
+
+      <param id="134" name="Hair Sides" value="0.170" />
+
+      <param id="135" name="Hair Back" value="0.450" />
+
+      <param id="136" name="Hair Sweep" value="0.670" />
+
+      <param id="137" name="Hair Tilt" value="0.520" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.095" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.610" />
+
+      <param id="168" name="Soulpatch" value="0.420" />
+
+      <param id="169" name="Chin Curtains" value="0.820" />
+
+      <param id="177" name="Hair_Rumpled" value="0.000" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.160" />
+
+      <param id="182" name="Hair_Big_Top" value="-0.080" />
+
+      <param id="183" name="Hair_Big_Back" value="0.140" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="-0.310" />
+
+      <param id="750" name="Eyebrow Density" value="0.540" />
+
+      <param id="752" name="Hair Thickness" value="0.750" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.400" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.030" />
+
+      <param id="757" name="Lower_Eyebrows" value="-2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.600" />
+
+      <param id="763" name="Hair Volume" value="0.660" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.000" />
+
+      <param id="99" name="Eye Color" value="0.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M B Muscle">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.090" />
+
+      <param id="2" name="Nose_Big_Out" value="0.090" />
+
+      <param id="4" name="Broad_Nostrils" value="0.950" />
+
+      <param id="5" name="Cleft_Chin" value="0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="-0.010" />
+
+      <param id="7" name="Weak_Chin" value="-0.040" />
+
+      <param id="8" name="Double_Chin" value="-0.040" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.880" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.140" />
+
+      <param id="12" name="Jowls" value="0.520" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.190" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.500" />
+
+      <param id="15" name="Ears_Out" value="0.340" />
+
+      <param id="17" name="Square_Jaw" value="-0.500" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="0.540" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.080" />
+
+      <param id="20" name="Bulbous_Nose" value="0.520" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.100" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.440" />
+
+      <param id="24" name="Wide_Eyes" value="0.500" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.410" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="0.450" />
+
+      <param id="33" name="Height" value="1.440" />
+
+      <param id="34" name="Thickness" value="1.190" />
+
+      <param id="35" name="Big_Ears" value="-0.040" />
+
+      <param id="36" name="Shoulders" value="0.920" />
+
+      <param id="37" name="Hip Width" value="-1.640" />
+
+      <param id="38" name="Torso Length" value="0.660" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.550" />
+
+      <param id="155" name="Lip Width" value="0.880" />
+
+      <param id="157" name="Belly Size" value="0.160" />
+
+      <param id="185" name="Deep_Chin" value="0.540" />
+
+      <param id="193" name="Head Shape" value="0.140" />
+
+      <param id="196" name="Eye Spacing" value="0.460" />
+
+      <param id="505" name="Lip Thickness" value="0.920" />
+
+      <param id="506" name="Mouth_Height" value="0.280" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="2.000" />
+
+      <param id="517" name="Wide_Nose" value="0.470" />
+
+      <param id="518" name="Eyelashes_Long" value="0.640" />
+
+      <param id="629" name="Forehead Angle" value="0.000" />
+
+      <param id="637" name="Body Fat" value="0.010" />
+
+      <param id="646" name="Egg_Head" value="0.330" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.440" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.430" />
+
+      <param id="652" name="Leg Muscles" value="0.860" />
+
+      <param id="653" name="Tall_Lips" value="0.860" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.820" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.280" />
+
+      <param id="664" name="Pop_Eye" value="-0.260" />
+
+      <param id="665" name="Jaw_Jut" value="0.080" />
+
+      <param id="675" name="Hand Size" value="0.170" />
+
+      <param id="676" name="Love_Handles" value="-0.100" />
+
+      <param id="678" name="Torso Muscles" value="0.850" />
+
+      <param id="682" name="Head Size" value="0.820" />
+
+      <param id="683" name="Neck Thickness" value="0.100" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="-0.230" />
+
+      <param id="690" name="Eye Size" value="0.520" />
+
+      <param id="692" name="Leg Length" value="0.600" />
+
+      <param id="693" name="Arm Length" value="0.640" />
+
+      <param id="753" name="Saddlebags" value="0.030" />
+
+      <param id="756" name="Neck Length" value="0.140" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.420" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.030" />
+
+      <param id="760" name="Jaw_Angle" value="0.850" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.370" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.460" />
+
+      <param id="769" name="Eye Depth" value="0.740" />
+
+      <param id="773" name="Head Length" value="0.520" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.010" />
+
+      <param id="111" name="Pigment" value="0.720" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.170" />
+
+      <param id="150" name="Body Definition" value="0.820" />
+
+      <param id="162" name="Facial Definition" value="0.870" />
+
+      <param id="163" name="Wrinkles" value="0.060" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.730" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.930" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.000" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.330" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="0.410" />
+
+      <param id="132" name="Back Fringe" value="0.000" />
+
+      <param id="133" name="Hair Front" value="0.030" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.530" />
+
+      <param id="136" name="Hair Sweep" value="0.570" />
+
+      <param id="137" name="Hair Tilt" value="0.540" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.095" />
+
+      <param id="166" name="Sideburns" value="0.960" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.120" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.040" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.220" />
+
+      <param id="182" name="Hair_Big_Top" value="-0.120" />
+
+      <param id="183" name="Hair_Big_Back" value="0.080" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.860" />
+
+      <param id="750" name="Eyebrow Density" value="0.680" />
+
+      <param id="752" name="Hair Thickness" value="0.500" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.130" />
+
+      <param id="755" name="Hair_Taper_Front" value="1.470" />
+
+      <param id="757" name="Lower_Eyebrows" value="0.720" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.330" />
+
+      <param id="763" name="Hair Volume" value="0.870" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.180" />
+
+      <param id="99" name="Eye Color" value="0.060" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M B Chubby">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="1.240" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.110" />
+
+      <param id="4" name="Broad_Nostrils" value="0.310" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.260" />
+
+      <param id="7" name="Weak_Chin" value="-0.260" />
+
+      <param id="8" name="Double_Chin" value="0.540" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.080" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.020" />
+
+      <param id="12" name="Jowls" value="1.240" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.070" />
+
+      <param id="15" name="Ears_Out" value="-0.180" />
+
+      <param id="17" name="Square_Jaw" value="-0.170" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="2.500" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.500" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.020" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.600" />
+
+      <param id="22" name="Attached_Earlobes" value="0.420" />
+
+      <param id="23" name="Baggy_Eyes" value="0.680" />
+
+      <param id="24" name="Wide_Eyes" value="1.050" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.250" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.320" />
+
+      <param id="33" name="Height" value="1.400" />
+
+      <param id="34" name="Thickness" value="1.260" />
+
+      <param id="35" name="Big_Ears" value="1.100" />
+
+      <param id="36" name="Shoulders" value="0.820" />
+
+      <param id="37" name="Hip Width" value="-0.380" />
+
+      <param id="38" name="Torso Length" value="0.380" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.640" />
+
+      <param id="155" name="Lip Width" value="0.400" />
+
+      <param id="157" name="Belly Size" value="0.480" />
+
+      <param id="185" name="Deep_Chin" value="0.680" />
+
+      <param id="193" name="Head Shape" value="0.950" />
+
+      <param id="196" name="Eye Spacing" value="-0.710" />
+
+      <param id="505" name="Lip Thickness" value="0.840" />
+
+      <param id="506" name="Mouth_Height" value="1.000" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.760" />
+
+      <param id="517" name="Wide_Nose" value="0.070" />
+
+      <param id="518" name="Eyelashes_Long" value="0.400" />
+
+      <param id="629" name="Forehead Angle" value="0.000" />
+
+      <param id="637" name="Body Fat" value="0.130" />
+
+      <param id="646" name="Egg_Head" value="-0.910" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.320" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.130" />
+
+      <param id="652" name="Leg Muscles" value="0.830" />
+
+      <param id="653" name="Tall_Lips" value="0.410" />
+
+      <param id="656" name="Crooked_Nose" value="-0.400" />
+
+      <param id="659" name="Mouth Corner" value="0.580" />
+
+      <param id="662" name="Face Shear" value="0.460" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.310" />
+
+      <param id="665" name="Jaw_Jut" value="0.120" />
+
+      <param id="675" name="Hand Size" value="0.150" />
+
+      <param id="676" name="Love_Handles" value="0.530" />
+
+      <param id="678" name="Torso Muscles" value="0.850" />
+
+      <param id="682" name="Head Size" value="0.810" />
+
+      <param id="683" name="Neck Thickness" value="0.100" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="-0.020" />
+
+      <param id="690" name="Eye Size" value="0.460" />
+
+      <param id="692" name="Leg Length" value="-0.040" />
+
+      <param id="693" name="Arm Length" value="0.500" />
+
+      <param id="753" name="Saddlebags" value="0.620" />
+
+      <param id="756" name="Neck Length" value="-0.160" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.210" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.650" />
+
+      <param id="760" name="Jaw_Angle" value="-0.720" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.440" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="1.100" />
+
+      <param id="769" name="Eye Depth" value="0.720" />
+
+      <param id="773" name="Head Length" value="0.370" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.600" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.560" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.550" />
+
+      <param id="163" name="Wrinkles" value="0.520" />
+
+      <param id="165" name="Freckles" value="0.250" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="1.000" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.580" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.000" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.170" />
+
+      <param id="119" name="Eyebrow Size" value="0.540" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="0.230" />
+
+      <param id="132" name="Back Fringe" value="0.110" />
+
+      <param id="133" name="Hair Front" value="0.270" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.530" />
+
+      <param id="136" name="Hair Sweep" value="0.760" />
+
+      <param id="137" name="Hair Tilt" value="0.620" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.425" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="1.000" />
+
+      <param id="181" name="Hair_Big_Front" value="0.240" />
+
+      <param id="182" name="Hair_Big_Top" value="0.080" />
+
+      <param id="183" name="Hair_Big_Back" value="0.020" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.350" />
+
+      <param id="750" name="Eyebrow Density" value="0.850" />
+
+      <param id="752" name="Hair Thickness" value="0.000" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.340" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.330" />
+
+      <param id="757" name="Lower_Eyebrows" value="2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="1.260" />
+
+      <param id="763" name="Hair Volume" value="0.770" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.200" />
+
+      <param id="99" name="Eye Color" value="0.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M A Skinny">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="1.680" />
+
+      <param id="2" name="Nose_Big_Out" value="0.420" />
+
+      <param id="4" name="Broad_Nostrils" value="0.340" />
+
+      <param id="5" name="Cleft_Chin" value="0.030" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.120" />
+
+      <param id="7" name="Weak_Chin" value="0.020" />
+
+      <param id="8" name="Double_Chin" value="0.040" />
+
+      <param id="10" name="Sunken_Cheeks" value="1.070" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.460" />
+
+      <param id="12" name="Jowls" value="-0.500" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.560" />
+
+      <param id="14" name="High_Cheek_Bones" value="1.000" />
+
+      <param id="15" name="Ears_Out" value="0.160" />
+
+      <param id="17" name="Square_Jaw" value="0.550" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.220" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="0.300" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.500" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="1.080" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.180" />
+
+      <param id="24" name="Wide_Eyes" value="-1.430" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.530" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.930" />
+
+      <param id="33" name="Height" value="-0.150" />
+
+      <param id="34" name="Thickness" value="-0.500" />
+
+      <param id="35" name="Big_Ears" value="-0.040" />
+
+      <param id="36" name="Shoulders" value="-0.940" />
+
+      <param id="37" name="Hip Width" value="-1.580" />
+
+      <param id="38" name="Torso Length" value="0.020" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.270" />
+
+      <param id="155" name="Lip Width" value="-0.150" />
+
+      <param id="157" name="Belly Size" value="0.030" />
+
+      <param id="185" name="Deep_Chin" value="0.040" />
+
+      <param id="193" name="Head Shape" value="0.660" />
+
+      <param id="196" name="Eye Spacing" value="0.010" />
+
+      <param id="505" name="Lip Thickness" value="0.650" />
+
+      <param id="506" name="Mouth_Height" value="1.000" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="0.600" />
+
+      <param id="517" name="Wide_Nose" value="0.010" />
+
+      <param id="518" name="Eyelashes_Long" value="0.290" />
+
+      <param id="629" name="Forehead Angle" value="0.640" />
+
+      <param id="637" name="Body Fat" value="0.060" />
+
+      <param id="646" name="Egg_Head" value="-0.010" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.290" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.930" />
+
+      <param id="652" name="Leg Muscles" value="0.450" />
+
+      <param id="653" name="Tall_Lips" value="1.100" />
+
+      <param id="656" name="Crooked_Nose" value="0.040" />
+
+      <param id="659" name="Mouth Corner" value="0.340" />
+
+      <param id="662" name="Face Shear" value="0.600" />
+
+      <param id="663" name="Shift_Mouth" value="0.280" />
+
+      <param id="664" name="Pop_Eye" value="0.100" />
+
+      <param id="665" name="Jaw_Jut" value="0.040" />
+
+      <param id="675" name="Hand Size" value="-0.020" />
+
+      <param id="676" name="Love_Handles" value="-0.010" />
+
+      <param id="678" name="Torso Muscles" value="0.290" />
+
+      <param id="682" name="Head Size" value="0.480" />
+
+      <param id="683" name="Neck Thickness" value="-0.240" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.090" />
+
+      <param id="690" name="Eye Size" value="0.560" />
+
+      <param id="692" name="Leg Length" value="0.060" />
+
+      <param id="693" name="Arm Length" value="0.380" />
+
+      <param id="753" name="Saddlebags" value="-0.400" />
+
+      <param id="756" name="Neck Length" value="-0.020" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.510" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.680" />
+
+      <param id="760" name="Jaw_Angle" value="1.296" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.350" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="-0.300" />
+
+      <param id="769" name="Eye Depth" value="0.570" />
+
+      <param id="773" name="Head Length" value="0.170" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.010" />
+
+      <param id="111" name="Pigment" value="0.360" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.260" />
+
+      <param id="150" name="Body Definition" value="0.310" />
+
+      <param id="162" name="Facial Definition" value="0.260" />
+
+      <param id="163" name="Wrinkles" value="0.030" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.805" />
+
+      <param id="31" name="Arced_Eyebrows" value="1.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.000" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.270" />
+
+      <param id="130" name="Front Fringe" value="0.870" />
+
+      <param id="131" name="Side Fringe" value="0.590" />
+
+      <param id="132" name="Back Fringe" value="0.550" />
+
+      <param id="133" name="Hair Front" value="0.220" />
+
+      <param id="134" name="Hair Sides" value="0.350" />
+
+      <param id="135" name="Hair Back" value="0.470" />
+
+      <param id="136" name="Hair Sweep" value="0.580" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="1.380" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.235" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.000" />
+
+      <param id="181" name="Hair_Big_Front" value="0.120" />
+
+      <param id="182" name="Hair_Big_Top" value="-0.160" />
+
+      <param id="183" name="Hair_Big_Back" value="0.480" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.620" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.590" />
+
+      <param id="750" name="Eyebrow Density" value="0.840" />
+
+      <param id="752" name="Hair Thickness" value="0.250" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.190" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.210" />
+
+      <param id="757" name="Lower_Eyebrows" value="2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.150" />
+
+      <param id="763" name="Hair Volume" value="0.610" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.370" />
+
+      <param id="99" name="Eye Color" value="0.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M A Muscle">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="-0.020" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.310" />
+
+      <param id="4" name="Broad_Nostrils" value="0.470" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.400" />
+
+      <param id="7" name="Weak_Chin" value="0.160" />
+
+      <param id="8" name="Double_Chin" value="-0.080" />
+
+      <param id="10" name="Sunken_Cheeks" value="1.250" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.320" />
+
+      <param id="12" name="Jowls" value="0.010" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.650" />
+
+      <param id="15" name="Ears_Out" value="-0.080" />
+
+      <param id="17" name="Square_Jaw" value="0.540" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.620" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.080" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.460" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="1.300" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.540" />
+
+      <param id="24" name="Wide_Eyes" value="-0.900" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="1.020" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.170" />
+
+      <param id="33" name="Height" value="0.580" />
+
+      <param id="34" name="Thickness" value="0.250" />
+
+      <param id="35" name="Big_Ears" value="-0.040" />
+
+      <param id="36" name="Shoulders" value="-0.650" />
+
+      <param id="37" name="Hip Width" value="-0.800" />
+
+      <param id="38" name="Torso Length" value="0.800" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.290" />
+
+      <param id="155" name="Lip Width" value="-0.500" />
+
+      <param id="157" name="Belly Size" value="0.070" />
+
+      <param id="185" name="Deep_Chin" value="0.180" />
+
+      <param id="193" name="Head Shape" value="0.830" />
+
+      <param id="196" name="Eye Spacing" value="0.070" />
+
+      <param id="505" name="Lip Thickness" value="0.720" />
+
+      <param id="506" name="Mouth_Height" value="0.880" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.160" />
+
+      <param id="517" name="Wide_Nose" value="0.250" />
+
+      <param id="518" name="Eyelashes_Long" value="0.020" />
+
+      <param id="629" name="Forehead Angle" value="1.000" />
+
+      <param id="637" name="Body Fat" value="0.140" />
+
+      <param id="646" name="Egg_Head" value="-0.200" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.310" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.570" />
+
+      <param id="652" name="Leg Muscles" value="0.680" />
+
+      <param id="653" name="Tall_Lips" value="1.280" />
+
+      <param id="656" name="Crooked_Nose" value="-0.200" />
+
+      <param id="659" name="Mouth Corner" value="0.330" />
+
+      <param id="662" name="Face Shear" value="0.520" />
+
+      <param id="663" name="Shift_Mouth" value="0.200" />
+
+      <param id="664" name="Pop_Eye" value="-0.080" />
+
+      <param id="665" name="Jaw_Jut" value="-0.160" />
+
+      <param id="675" name="Hand Size" value="-0.070" />
+
+      <param id="676" name="Love_Handles" value="-0.250" />
+
+      <param id="678" name="Torso Muscles" value="0.540" />
+
+      <param id="682" name="Head Size" value="0.730" />
+
+      <param id="683" name="Neck Thickness" value="-0.030" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="-0.180" />
+
+      <param id="690" name="Eye Size" value="0.620" />
+
+      <param id="692" name="Leg Length" value="0.400" />
+
+      <param id="693" name="Arm Length" value="0.780" />
+
+      <param id="753" name="Saddlebags" value="0.090" />
+
+      <param id="756" name="Neck Length" value="0.140" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.300" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.320" />
+
+      <param id="760" name="Jaw_Angle" value="0.750" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="-0.380" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.790" />
+
+      <param id="769" name="Eye Depth" value="0.650" />
+
+      <param id="773" name="Head Length" value="0.240" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.220" />
+
+      <param id="116" name="Rosy Complexion" value="0.020" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.820" />
+
+      <param id="162" name="Facial Definition" value="0.600" />
+
+      <param id="163" name="Wrinkles" value="0.040" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.580" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.650" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.010" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.400" />
+
+      <param id="130" name="Front Fringe" value="0.350" />
+
+      <param id="131" name="Side Fringe" value="0.520" />
+
+      <param id="132" name="Back Fringe" value="0.470" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.580" />
+
+      <param id="135" name="Hair Back" value="0.540" />
+
+      <param id="136" name="Hair Sweep" value="0.880" />
+
+      <param id="137" name="Hair Tilt" value="0.470" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="1.520" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.345" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.120" />
+
+      <param id="168" name="Soulpatch" value="0.270" />
+
+      <param id="169" name="Chin Curtains" value="0.090" />
+
+      <param id="177" name="Hair_Rumpled" value="0.180" />
+
+      <param id="181" name="Hair_Big_Front" value="0.520" />
+
+      <param id="182" name="Hair_Big_Top" value="0.200" />
+
+      <param id="183" name="Hair_Big_Back" value="0.060" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.110" />
+
+      <param id="750" name="Eyebrow Density" value="1.000" />
+
+      <param id="752" name="Hair Thickness" value="0.470" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.200" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.240" />
+
+      <param id="757" name="Lower_Eyebrows" value="-0.760" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.810" />
+
+      <param id="763" name="Hair Volume" value="0.520" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.000" />
+
+      <param id="99" name="Eye Color" value="0.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M A Chubby">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="1.130" />
+
+      <param id="2" name="Nose_Big_Out" value="0.590" />
+
+      <param id="4" name="Broad_Nostrils" value="-0.060" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="-0.300" />
+
+      <param id="7" name="Weak_Chin" value="-0.260" />
+
+      <param id="8" name="Double_Chin" value="0.620" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.780" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.500" />
+
+      <param id="12" name="Jowls" value="-0.080" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.440" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.580" />
+
+      <param id="15" name="Ears_Out" value="-0.500" />
+
+      <param id="17" name="Square_Jaw" value="-0.500" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="2.380" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="0.000" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.020" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.850" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.180" />
+
+      <param id="24" name="Wide_Eyes" value="-0.800" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.260" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.350" />
+
+      <param id="33" name="Height" value="0.110" />
+
+      <param id="34" name="Thickness" value="1.320" />
+
+      <param id="35" name="Big_Ears" value="-0.040" />
+
+      <param id="36" name="Shoulders" value="-0.710" />
+
+      <param id="37" name="Hip Width" value="-0.560" />
+
+      <param id="38" name="Torso Length" value="0.040" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.010" />
+
+      <param id="155" name="Lip Width" value="-0.750" />
+
+      <param id="157" name="Belly Size" value="0.380" />
+
+      <param id="185" name="Deep_Chin" value="0.760" />
+
+      <param id="193" name="Head Shape" value="0.240" />
+
+      <param id="196" name="Eye Spacing" value="-0.140" />
+
+      <param id="505" name="Lip Thickness" value="0.760" />
+
+      <param id="506" name="Mouth_Height" value="0.040" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="0.640" />
+
+      <param id="517" name="Wide_Nose" value="0.790" />
+
+      <param id="518" name="Eyelashes_Long" value="0.550" />
+
+      <param id="629" name="Forehead Angle" value="0.820" />
+
+      <param id="637" name="Body Fat" value="0.130" />
+
+      <param id="646" name="Egg_Head" value="-0.860" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.500" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-1.150" />
+
+      <param id="652" name="Leg Muscles" value="0.820" />
+
+      <param id="653" name="Tall_Lips" value="1.550" />
+
+      <param id="656" name="Crooked_Nose" value="-0.600" />
+
+      <param id="659" name="Mouth Corner" value="0.760" />
+
+      <param id="662" name="Face Shear" value="0.460" />
+
+      <param id="663" name="Shift_Mouth" value="-0.360" />
+
+      <param id="664" name="Pop_Eye" value="0.080" />
+
+      <param id="665" name="Jaw_Jut" value="-1.080" />
+
+      <param id="675" name="Hand Size" value="-0.040" />
+
+      <param id="676" name="Love_Handles" value="0.290" />
+
+      <param id="678" name="Torso Muscles" value="0.630" />
+
+      <param id="682" name="Head Size" value="0.600" />
+
+      <param id="683" name="Neck Thickness" value="0.060" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="-0.180" />
+
+      <param id="690" name="Eye Size" value="0.290" />
+
+      <param id="692" name="Leg Length" value="-0.340" />
+
+      <param id="693" name="Arm Length" value="-0.060" />
+
+      <param id="753" name="Saddlebags" value="0.900" />
+
+      <param id="756" name="Neck Length" value="-0.220" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.690" />
+
+      <param id="759" name="Low_Septum_Nose" value="-0.950" />
+
+      <param id="760" name="Jaw_Angle" value="-0.340" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.250" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.600" />
+
+      <param id="769" name="Eye Depth" value="0.720" />
+
+      <param id="773" name="Head Length" value="0.240" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.200" />
+
+      <param id="116" name="Rosy Complexion" value="0.120" />
+
+      <param id="117" name="Lip Pinkness" value="0.220" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.250" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.370" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.000" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.540" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="0.380" />
+
+      <param id="132" name="Back Fringe" value="0.320" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.320" />
+
+      <param id="135" name="Hair Back" value="0.540" />
+
+      <param id="136" name="Hair Sweep" value="0.170" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.100" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.290" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.820" />
+
+      <param id="177" name="Hair_Rumpled" value="0.170" />
+
+      <param id="181" name="Hair_Big_Front" value="0.300" />
+
+      <param id="182" name="Hair_Big_Top" value="0.200" />
+
+      <param id="183" name="Hair_Big_Back" value="0.060" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="-0.460" />
+
+      <param id="750" name="Eyebrow Density" value="0.920" />
+
+      <param id="752" name="Hair Thickness" value="0.670" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.830" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.840" />
+
+      <param id="757" name="Lower_Eyebrows" value="-0.200" />
+
+      <param id="762" name="Hair_Shear_Front" value="1.710" />
+
+      <param id="763" name="Hair Volume" value="0.510" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.270" />
+
+      <param id="99" name="Eye Color" value="0.090" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F W Skinny">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.183" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.338" />
+
+      <param id="4" name="Broad_Nostrils" value="-0.155" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.636" />
+
+      <param id="7" name="Weak_Chin" value="-0.040" />
+
+      <param id="8" name="Double_Chin" value="-0.500" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.060" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.120" />
+
+      <param id="12" name="Jowls" value="0.850" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.370" />
+
+      <param id="15" name="Ears_Out" value="0.240" />
+
+      <param id="17" name="Square_Jaw" value="0.250" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-0.060" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.100" />
+
+      <param id="20" name="Bulbous_Nose" value="0.020" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.475" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.120" />
+
+      <param id="24" name="Wide_Eyes" value="0.250" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.511" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.850" />
+
+      <param id="33" name="Height" value="1.140" />
+
+      <param id="34" name="Thickness" value="-0.392" />
+
+      <param id="35" name="Big_Ears" value="-0.460" />
+
+      <param id="36" name="Shoulders" value="0.024" />
+
+      <param id="37" name="Hip Width" value="-0.800" />
+
+      <param id="38" name="Torso Length" value="0.480" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.270" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.092" />
+
+      <param id="155" name="Lip Width" value="-0.174" />
+
+      <param id="157" name="Belly Size" value="0.260" />
+
+      <param id="185" name="Deep_Chin" value="-0.400" />
+
+      <param id="193" name="Head Shape" value="0.890" />
+
+      <param id="196" name="Eye Spacing" value="0.310" />
+
+      <param id="505" name="Lip Thickness" value="0.470" />
+
+      <param id="506" name="Mouth_Height" value="-0.560" />
+
+      <param id="507" name="Breast_Gravity" value="-0.975" />
+
+      <param id="515" name="Foot_Size" value="1.640" />
+
+      <param id="517" name="Wide_Nose" value="0.055" />
+
+      <param id="518" name="Eyelashes_Long" value="-0.156" />
+
+      <param id="629" name="Forehead Angle" value="0.140" />
+
+      <param id="637" name="Body Fat" value="0.020" />
+
+      <param id="646" name="Egg_Head" value="0.655" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.595" />
+
+      <param id="649" name="Torso Muscles" value="0.400" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.225" />
+
+      <param id="652" name="Leg Muscles" value="0.430" />
+
+      <param id="653" name="Tall_Lips" value="-0.910" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.500" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.000" />
+
+      <param id="665" name="Jaw_Jut" value="0.320" />
+
+      <param id="675" name="Hand Size" value="0.066" />
+
+      <param id="676" name="Love_Handles" value="-0.040" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.770" />
+
+      <param id="683" name="Neck Thickness" value="-0.214" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.308" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.640" />
+
+      <param id="692" name="Leg Length" value="0.580" />
+
+      <param id="693" name="Arm Length" value="0.660" />
+
+      <param id="753" name="Saddlebags" value="0.795" />
+
+      <param id="756" name="Neck Length" value="0.300" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.570" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.500" />
+
+      <param id="760" name="Jaw_Angle" value="1.328" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="1.081" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.036" />
+
+      <param id="769" name="Eye Depth" value="0.270" />
+
+      <param id="773" name="Head Length" value="0.720" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.029" />
+
+      <param id="111" name="Pigment" value="0.090" />
+
+      <param id="116" name="Rosy Complexion" value="0.370" />
+
+      <param id="117" name="Lip Pinkness" value="0.640" />
+
+      <param id="150" name="Body Definition" value="0.870" />
+
+      <param id="162" name="Facial Definition" value="0.000" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.200" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.170" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.640" />
+
+      <param id="114" name="Blonde Hair" value="0.940" />
+
+      <param id="115" name="White Hair" value="0.120" />
+
+      <param id="119" name="Eyebrow Size" value="0.310" />
+
+      <param id="130" name="Front Fringe" value="0.590" />
+
+      <param id="131" name="Side Fringe" value="0.720" />
+
+      <param id="132" name="Back Fringe" value="0.720" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.580" />
+
+      <param id="135" name="Hair Back" value="0.940" />
+
+      <param id="136" name="Hair Sweep" value="0.370" />
+
+      <param id="137" name="Hair Tilt" value="0.510" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="1.520" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.040" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.410" />
+
+      <param id="181" name="Hair_Big_Front" value="0.020" />
+
+      <param id="182" name="Hair_Big_Top" value="0.840" />
+
+      <param id="183" name="Hair_Big_Back" value="0.000" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.740" />
+
+      <param id="750" name="Eyebrow Density" value="0.490" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.490" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.030" />
+
+      <param id="757" name="Lower_Eyebrows" value="-1.600" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.520" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.220" />
+
+      <param id="99" name="Eye Color" value="0.340" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F W Old">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.505" />
+
+      <param id="2" name="Nose_Big_Out" value="0.817" />
+
+      <param id="4" name="Broad_Nostrils" value="0.700" />
+
+      <param id="5" name="Cleft_Chin" value="1.000" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.116" />
+
+      <param id="7" name="Weak_Chin" value="0.200" />
+
+      <param id="8" name="Double_Chin" value="0.560" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.510" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.640" />
+
+      <param id="12" name="Jowls" value="2.260" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="1.170" />
+
+      <param id="14" name="High_Cheek_Bones" value="-0.395" />
+
+      <param id="15" name="Ears_Out" value="0.440" />
+
+      <param id="17" name="Square_Jaw" value="0.940" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-1.500" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-1.200" />
+
+      <param id="20" name="Bulbous_Nose" value="0.740" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.640" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="1.340" />
+
+      <param id="24" name="Wide_Eyes" value="-1.500" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="1.500" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.200" />
+
+      <param id="33" name="Height" value="-0.838" />
+
+      <param id="34" name="Thickness" value="1.500" />
+
+      <param id="35" name="Big_Ears" value="1.430" />
+
+      <param id="36" name="Shoulders" value="-1.736" />
+
+      <param id="37" name="Hip Width" value="-0.020" />
+
+      <param id="38" name="Torso Length" value="1.000" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.840" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.706" />
+
+      <param id="155" name="Lip Width" value="0.926" />
+
+      <param id="157" name="Belly Size" value="0.300" />
+
+      <param id="185" name="Deep_Chin" value="0.500" />
+
+      <param id="193" name="Head Shape" value="0.400" />
+
+      <param id="196" name="Eye Spacing" value="-0.560" />
+
+      <param id="505" name="Lip Thickness" value="0.220" />
+
+      <param id="506" name="Mouth_Height" value="1.160" />
+
+      <param id="507" name="Breast_Gravity" value="2.000" />
+
+      <param id="515" name="Foot_Size" value="2.080" />
+
+      <param id="517" name="Wide_Nose" value="-0.200" />
+
+      <param id="518" name="Eyelashes_Long" value="-0.300" />
+
+      <param id="629" name="Forehead Angle" value="0.000" />
+
+      <param id="637" name="Body Fat" value="0.930" />
+
+      <param id="646" name="Egg_Head" value="0.333" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.550" />
+
+      <param id="649" name="Torso Muscles" value="0.180" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.725" />
+
+      <param id="652" name="Leg Muscles" value="0.560" />
+
+      <param id="653" name="Tall_Lips" value="-1.000" />
+
+      <param id="656" name="Crooked_Nose" value="-0.400" />
+
+      <param id="659" name="Mouth Corner" value="0.180" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.600" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="-0.160" />
+
+      <param id="675" name="Hand Size" value="0.048" />
+
+      <param id="676" name="Love_Handles" value="-0.460" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.800" />
+
+      <param id="683" name="Neck Thickness" value="-0.088" />
+
+      <param id="684" name="Breast_Female_Clevage" value="-0.204" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.620" />
+
+      <param id="692" name="Leg Length" value="0.180" />
+
+      <param id="693" name="Arm Length" value="0.540" />
+
+      <param id="753" name="Saddlebags" value="1.390" />
+
+      <param id="756" name="Neck Length" value="-0.960" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.540" />
+
+      <param id="759" name="Low_Septum_Nose" value="1.125" />
+
+      <param id="760" name="Jaw_Angle" value="-0.368" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.928" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="1.576" />
+
+      <param id="769" name="Eye Depth" value="0.120" />
+
+      <param id="773" name="Head Length" value="0.770" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.000" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.740" />
+
+      <param id="162" name="Facial Definition" value="1.000" />
+
+      <param id="163" name="Wrinkles" value="1.000" />
+
+      <param id="165" name="Freckles" value="0.380" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.095" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.610" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.150" />
+
+      <param id="114" name="Blonde Hair" value="1.000" />
+
+      <param id="115" name="White Hair" value="1.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.110" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="0.000" />
+
+      <param id="132" name="Back Fringe" value="0.550" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.120" />
+
+      <param id="135" name="Hair Back" value="0.490" />
+
+      <param id="136" name="Hair Sweep" value="0.820" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.290" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.770" />
+
+      <param id="181" name="Hair_Big_Front" value="0.260" />
+
+      <param id="182" name="Hair_Big_Top" value="0.680" />
+
+      <param id="183" name="Hair_Big_Back" value="0.200" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.110" />
+
+      <param id="750" name="Eyebrow Density" value="0.580" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.670" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.060" />
+
+      <param id="757" name="Lower_Eyebrows" value="1.760" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.670" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.080" />
+
+      <param id="99" name="Eye Color" value="0.160" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F W Obese">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.597" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.800" />
+
+      <param id="4" name="Broad_Nostrils" value="0.835" />
+
+      <param id="5" name="Cleft_Chin" value="0.813" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.961" />
+
+      <param id="7" name="Weak_Chin" value="-0.230" />
+
+      <param id="8" name="Double_Chin" value="1.500" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.960" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.440" />
+
+      <param id="12" name="Jowls" value="1.000" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="1.500" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.280" />
+
+      <param id="15" name="Ears_Out" value="0.860" />
+
+      <param id="17" name="Square_Jaw" value="0.055" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="0.740" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.250" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.260" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.505" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="1.060" />
+
+      <param id="24" name="Wide_Eyes" value="0.915" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="1.500" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.200" />
+
+      <param id="33" name="Height" value="-1.096" />
+
+      <param id="34" name="Thickness" value="1.104" />
+
+      <param id="35" name="Big_Ears" value="0.350" />
+
+      <param id="36" name="Shoulders" value="-0.840" />
+
+      <param id="37" name="Hip Width" value="-0.500" />
+
+      <param id="38" name="Torso Length" value="1.000" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.760" />
+
+      <param id="151" name="Big_Butt_Legs" value="1.000" />
+
+      <param id="155" name="Lip Width" value="-0.900" />
+
+      <param id="157" name="Belly Size" value="0.670" />
+
+      <param id="185" name="Deep_Chin" value="1.000" />
+
+      <param id="193" name="Head Shape" value="0.830" />
+
+      <param id="196" name="Eye Spacing" value="-1.010" />
+
+      <param id="505" name="Lip Thickness" value="0.480" />
+
+      <param id="506" name="Mouth_Height" value="-0.320" />
+
+      <param id="507" name="Breast_Gravity" value="1.195" />
+
+      <param id="515" name="Foot_Size" value="0.200" />
+
+      <param id="517" name="Wide_Nose" value="-0.050" />
+
+      <param id="518" name="Eyelashes_Long" value="0.420" />
+
+      <param id="629" name="Forehead Angle" value="0.340" />
+
+      <param id="637" name="Body Fat" value="0.950" />
+
+      <param id="646" name="Egg_Head" value="-0.886" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.275" />
+
+      <param id="649" name="Torso Muscles" value="0.940" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.650" />
+
+      <param id="652" name="Leg Muscles" value="0.790" />
+
+      <param id="653" name="Tall_Lips" value="0.470" />
+
+      <param id="656" name="Crooked_Nose" value="-0.120" />
+
+      <param id="659" name="Mouth Corner" value="0.800" />
+
+      <param id="662" name="Face Shear" value="0.460" />
+
+      <param id="663" name="Shift_Mouth" value="0.760" />
+
+      <param id="664" name="Pop_Eye" value="-0.156" />
+
+      <param id="665" name="Jaw_Jut" value="-0.640" />
+
+      <param id="675" name="Hand Size" value="-0.168" />
+
+      <param id="676" name="Love_Handles" value="-0.550" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.380" />
+
+      <param id="683" name="Neck Thickness" value="0.164" />
+
+      <param id="684" name="Breast_Female_Clevage" value="-0.140" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.230" />
+
+      <param id="692" name="Leg Length" value="0.360" />
+
+      <param id="693" name="Arm Length" value="0.240" />
+
+      <param id="753" name="Saddlebags" value="2.720" />
+
+      <param id="756" name="Neck Length" value="-0.460" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-1.350" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.650" />
+
+      <param id="760" name="Jaw_Angle" value="-1.200" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.537" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="2.500" />
+
+      <param id="769" name="Eye Depth" value="0.320" />
+
+      <param id="773" name="Head Length" value="0.880" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.097" />
+
+      <param id="111" name="Pigment" value="0.070" />
+
+      <param id="116" name="Rosy Complexion" value="0.450" />
+
+      <param id="117" name="Lip Pinkness" value="0.720" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.000" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.830" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.095" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.610" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.120" />
+
+      <param id="114" name="Blonde Hair" value="0.460" />
+
+      <param id="115" name="White Hair" value="0.220" />
+
+      <param id="119" name="Eyebrow Size" value="0.110" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="0.080" />
+
+      <param id="132" name="Back Fringe" value="0.200" />
+
+      <param id="133" name="Hair Front" value="0.520" />
+
+      <param id="134" name="Hair Sides" value="0.400" />
+
+      <param id="135" name="Hair Back" value="0.560" />
+
+      <param id="136" name="Hair Sweep" value="1.000" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.290" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.770" />
+
+      <param id="181" name="Hair_Big_Front" value="0.260" />
+
+      <param id="182" name="Hair_Big_Top" value="0.200" />
+
+      <param id="183" name="Hair_Big_Back" value="0.300" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.110" />
+
+      <param id="750" name="Eyebrow Density" value="0.580" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.670" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.060" />
+
+      <param id="757" name="Lower_Eyebrows" value="1.760" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.210" />
+
+      <param id="763" name="Hair Volume" value="0.520" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.080" />
+
+      <param id="99" name="Eye Color" value="0.160" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F W Muscle">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.183" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.404" />
+
+      <param id="4" name="Broad_Nostrils" value="-0.095" />
+
+      <param id="5" name="Cleft_Chin" value="0.373" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.389" />
+
+      <param id="7" name="Weak_Chin" value="-0.200" />
+
+      <param id="8" name="Double_Chin" value="-0.160" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.060" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.340" />
+
+      <param id="12" name="Jowls" value="0.520" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.630" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.370" />
+
+      <param id="15" name="Ears_Out" value="-0.060" />
+
+      <param id="17" name="Square_Jaw" value="-0.200" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-0.060" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="0.025" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.240" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="-0.200" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.500" />
+
+      <param id="24" name="Wide_Eyes" value="0.425" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.087" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="0.000" />
+
+      <param id="33" name="Height" value="0.580" />
+
+      <param id="34" name="Thickness" value="0.660" />
+
+      <param id="35" name="Big_Ears" value="-0.040" />
+
+      <param id="36" name="Shoulders" value="-0.456" />
+
+      <param id="37" name="Hip Width" value="-0.380" />
+
+      <param id="38" name="Torso Length" value="-0.160" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.370" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.050" />
+
+      <param id="155" name="Lip Width" value="-0.636" />
+
+      <param id="157" name="Belly Size" value="0.050" />
+
+      <param id="185" name="Deep_Chin" value="-0.360" />
+
+      <param id="193" name="Head Shape" value="0.890" />
+
+      <param id="196" name="Eye Spacing" value="-0.020" />
+
+      <param id="505" name="Lip Thickness" value="0.600" />
+
+      <param id="506" name="Mouth_Height" value="-0.320" />
+
+      <param id="507" name="Breast_Gravity" value="-0.940" />
+
+      <param id="515" name="Foot_Size" value="0.880" />
+
+      <param id="517" name="Wide_Nose" value="0.070" />
+
+      <param id="518" name="Eyelashes_Long" value="0.330" />
+
+      <param id="629" name="Forehead Angle" value="0.070" />
+
+      <param id="637" name="Body Fat" value="0.120" />
+
+      <param id="646" name="Egg_Head" value="0.586" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.160" />
+
+      <param id="649" name="Torso Muscles" value="0.670" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.400" />
+
+      <param id="652" name="Leg Muscles" value="0.570" />
+
+      <param id="653" name="Tall_Lips" value="-0.190" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.620" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.000" />
+
+      <param id="665" name="Jaw_Jut" value="-0.160" />
+
+      <param id="675" name="Hand Size" value="-0.042" />
+
+      <param id="676" name="Love_Handles" value="-0.340" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.710" />
+
+      <param id="683" name="Neck Thickness" value="-0.088" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.644" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.480" />
+
+      <param id="692" name="Leg Length" value="0.420" />
+
+      <param id="693" name="Arm Length" value="0.520" />
+
+      <param id="753" name="Saddlebags" value="0.620" />
+
+      <param id="756" name="Neck Length" value="0.060" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.570" />
+
+      <param id="759" name="Low_Septum_Nose" value="1.300" />
+
+      <param id="760" name="Jaw_Angle" value="1.104" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.622" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="-0.300" />
+
+      <param id="769" name="Eye Depth" value="0.310" />
+
+      <param id="773" name="Head Length" value="0.720" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.082" />
+
+      <param id="111" name="Pigment" value="0.120" />
+
+      <param id="116" name="Rosy Complexion" value="0.370" />
+
+      <param id="117" name="Lip Pinkness" value="0.640" />
+
+      <param id="150" name="Body Definition" value="0.870" />
+
+      <param id="162" name="Facial Definition" value="0.000" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.460" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.280" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.270" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.640" />
+
+      <param id="114" name="Blonde Hair" value="0.030" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.470" />
+
+      <param id="130" name="Front Fringe" value="0.570" />
+
+      <param id="131" name="Side Fringe" value="0.720" />
+
+      <param id="132" name="Back Fringe" value="0.600" />
+
+      <param id="133" name="Hair Front" value="0.040" />
+
+      <param id="134" name="Hair Sides" value="0.580" />
+
+      <param id="135" name="Hair Back" value="0.610" />
+
+      <param id="136" name="Hair Sweep" value="0.370" />
+
+      <param id="137" name="Hair Tilt" value="0.510" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="1.520" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.455" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.410" />
+
+      <param id="181" name="Hair_Big_Front" value="0.060" />
+
+      <param id="182" name="Hair_Big_Top" value="0.640" />
+
+      <param id="183" name="Hair_Big_Back" value="0.440" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.740" />
+
+      <param id="750" name="Eyebrow Density" value="0.610" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.490" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.030" />
+
+      <param id="757" name="Lower_Eyebrows" value="0.560" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.520" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.170" />
+
+      <param id="99" name="Eye Color" value="0.270" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F W Chubby">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.436" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.074" />
+
+      <param id="4" name="Broad_Nostrils" value="0.100" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.012" />
+
+      <param id="7" name="Weak_Chin" value="0.150" />
+
+      <param id="8" name="Double_Chin" value="-0.500" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.285" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.440" />
+
+      <param id="12" name="Jowls" value="0.160" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.250" />
+
+      <param id="15" name="Ears_Out" value="0.580" />
+
+      <param id="17" name="Square_Jaw" value="-0.050" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.500" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.950" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.240" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.160" />
+
+      <param id="22" name="Attached_Earlobes" value="0.520" />
+
+      <param id="23" name="Baggy_Eyes" value="0.040" />
+
+      <param id="24" name="Wide_Eyes" value="0.810" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.110" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.850" />
+
+      <param id="33" name="Height" value="0.151" />
+
+      <param id="34" name="Thickness" value="0.312" />
+
+      <param id="35" name="Big_Ears" value="0.800" />
+
+      <param id="36" name="Shoulders" value="-1.224" />
+
+      <param id="37" name="Hip Width" value="-0.080" />
+
+      <param id="38" name="Torso Length" value="0.740" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.730" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.230" />
+
+      <param id="155" name="Lip Width" value="0.002" />
+
+      <param id="157" name="Belly Size" value="0.180" />
+
+      <param id="185" name="Deep_Chin" value="-0.600" />
+
+      <param id="193" name="Head Shape" value="0.470" />
+
+      <param id="196" name="Eye Spacing" value="-0.170" />
+
+      <param id="505" name="Lip Thickness" value="0.190" />
+
+      <param id="506" name="Mouth_Height" value="-0.920" />
+
+      <param id="507" name="Breast_Gravity" value="0.565" />
+
+      <param id="515" name="Foot_Size" value="1.760" />
+
+      <param id="517" name="Wide_Nose" value="0.055" />
+
+      <param id="518" name="Eyelashes_Long" value="-0.066" />
+
+      <param id="629" name="Forehead Angle" value="0.470" />
+
+      <param id="637" name="Body Fat" value="0.280" />
+
+      <param id="646" name="Egg_Head" value="0.379" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.020" />
+
+      <param id="649" name="Torso Muscles" value="0.540" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.250" />
+
+      <param id="652" name="Leg Muscles" value="0.740" />
+
+      <param id="653" name="Tall_Lips" value="-0.310" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.660" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.000" />
+
+      <param id="665" name="Jaw_Jut" value="-0.040" />
+
+      <param id="675" name="Hand Size" value="-0.084" />
+
+      <param id="676" name="Love_Handles" value="-0.370" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.840" />
+
+      <param id="683" name="Neck Thickness" value="-0.130" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.084" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.370" />
+
+      <param id="692" name="Leg Length" value="0.420" />
+
+      <param id="693" name="Arm Length" value="0.480" />
+
+      <param id="753" name="Saddlebags" value="1.040" />
+
+      <param id="756" name="Neck Length" value="-0.060" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.090" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.425" />
+
+      <param id="760" name="Jaw_Angle" value="0.400" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="-0.024" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.456" />
+
+      <param id="769" name="Eye Depth" value="0.420" />
+
+      <param id="773" name="Head Length" value="0.720" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.014" />
+
+      <param id="111" name="Pigment" value="0.140" />
+
+      <param id="116" name="Rosy Complexion" value="0.370" />
+
+      <param id="117" name="Lip Pinkness" value="0.640" />
+
+      <param id="150" name="Body Definition" value="0.500" />
+
+      <param id="162" name="Facial Definition" value="0.120" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.710" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.040" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.570" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.840" />
+
+      <param id="114" name="Blonde Hair" value="0.520" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.390" />
+
+      <param id="130" name="Front Fringe" value="0.720" />
+
+      <param id="131" name="Side Fringe" value="0.760" />
+
+      <param id="132" name="Back Fringe" value="0.800" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.580" />
+
+      <param id="135" name="Hair Back" value="0.680" />
+
+      <param id="136" name="Hair Sweep" value="0.370" />
+
+      <param id="137" name="Hair Tilt" value="0.620" />
+
+      <param id="140" name="Hair_Part_Middle" value="1.240" />
+
+      <param id="141" name="Hair_Part_Right" value="1.520" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="1.115" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.970" />
+
+      <param id="181" name="Hair_Big_Front" value="0.020" />
+
+      <param id="182" name="Hair_Big_Top" value="0.840" />
+
+      <param id="183" name="Hair_Big_Back" value="0.600" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="1.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="1.700" />
+
+      <param id="750" name="Eyebrow Density" value="0.650" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.710" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.030" />
+
+      <param id="757" name="Lower_Eyebrows" value="1.360" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.690" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.220" />
+
+      <param id="99" name="Eye Color" value="0.340" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F Troll">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.597" />
+
+      <param id="2" name="Nose_Big_Out" value="2.500" />
+
+      <param id="4" name="Broad_Nostrils" value="0.205" />
+
+      <param id="5" name="Cleft_Chin" value="0.945" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.220" />
+
+      <param id="7" name="Weak_Chin" value="0.170" />
+
+      <param id="8" name="Double_Chin" value="0.540" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.960" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.880" />
+
+      <param id="12" name="Jowls" value="0.490" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="1.500" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.280" />
+
+      <param id="15" name="Ears_Out" value="0.860" />
+
+      <param id="17" name="Square_Jaw" value="-0.500" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="0.740" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="1.000" />
+
+      <param id="20" name="Bulbous_Nose" value="1.040" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="-0.200" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.500" />
+
+      <param id="24" name="Wide_Eyes" value="1.720" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="1.500" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.225" />
+
+      <param id="33" name="Height" value="-1.483" />
+
+      <param id="34" name="Thickness" value="1.478" />
+
+      <param id="35" name="Big_Ears" value="-0.400" />
+
+      <param id="36" name="Shoulders" value="0.760" />
+
+      <param id="37" name="Hip Width" value="0.460" />
+
+      <param id="38" name="Torso Length" value="0.060" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.970" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.160" />
+
+      <param id="155" name="Lip Width" value="1.300" />
+
+      <param id="157" name="Belly Size" value="0.460" />
+
+      <param id="185" name="Deep_Chin" value="0.040" />
+
+      <param id="193" name="Head Shape" value="0.830" />
+
+      <param id="196" name="Eye Spacing" value="0.010" />
+
+      <param id="505" name="Lip Thickness" value="0.840" />
+
+      <param id="506" name="Mouth_Height" value="1.160" />
+
+      <param id="507" name="Breast_Gravity" value="0.845" />
+
+      <param id="515" name="Foot_Size" value="2.560" />
+
+      <param id="517" name="Wide_Nose" value="0.385" />
+
+      <param id="518" name="Eyelashes_Long" value="1.284" />
+
+      <param id="629" name="Forehead Angle" value="0.340" />
+
+      <param id="637" name="Body Fat" value="0.470" />
+
+      <param id="646" name="Egg_Head" value="-0.886" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.275" />
+
+      <param id="649" name="Torso Muscles" value="0.560" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.300" />
+
+      <param id="652" name="Leg Muscles" value="0.790" />
+
+      <param id="653" name="Tall_Lips" value="2.000" />
+
+      <param id="656" name="Crooked_Nose" value="0.280" />
+
+      <param id="659" name="Mouth Corner" value="1.000" />
+
+      <param id="662" name="Face Shear" value="0.460" />
+
+      <param id="663" name="Shift_Mouth" value="0.560" />
+
+      <param id="664" name="Pop_Eye" value="0.390" />
+
+      <param id="665" name="Jaw_Jut" value="1.160" />
+
+      <param id="675" name="Hand Size" value="0.252" />
+
+      <param id="676" name="Love_Handles" value="-1.000" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.950" />
+
+      <param id="683" name="Neck Thickness" value="-0.238" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.404" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.870" />
+
+      <param id="692" name="Leg Length" value="0.020" />
+
+      <param id="693" name="Arm Length" value="-0.260" />
+
+      <param id="753" name="Saddlebags" value="1.355" />
+
+      <param id="756" name="Neck Length" value="-0.160" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="1.020" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.650" />
+
+      <param id="760" name="Jaw_Angle" value="-0.400" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="-0.075" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="2.472" />
+
+      <param id="769" name="Eye Depth" value="1.000" />
+
+      <param id="773" name="Head Length" value="0.880" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.820" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.770" />
+
+      <param id="116" name="Rosy Complexion" value="0.450" />
+
+      <param id="117" name="Lip Pinkness" value="0.720" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.000" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.830" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.095" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.610" />
+
+      <param id="112" name="Rainbow Color" value="0.790" />
+
+      <param id="113" name="Red Hair" value="0.000" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.220" />
+
+      <param id="119" name="Eyebrow Size" value="0.110" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="1.000" />
+
+      <param id="132" name="Back Fringe" value="0.200" />
+
+      <param id="133" name="Hair Front" value="0.520" />
+
+      <param id="134" name="Hair Sides" value="0.400" />
+
+      <param id="135" name="Hair Back" value="0.480" />
+
+      <param id="136" name="Hair Sweep" value="1.000" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-2.790" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.770" />
+
+      <param id="181" name="Hair_Big_Front" value="0.720" />
+
+      <param id="182" name="Hair_Big_Top" value="1.000" />
+
+      <param id="183" name="Hair_Big_Back" value="1.000" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.110" />
+
+      <param id="750" name="Eyebrow Density" value="0.580" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="1.310" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.060" />
+
+      <param id="757" name="Lower_Eyebrows" value="1.760" />
+
+      <param id="762" name="Hair_Shear_Front" value="2.220" />
+
+      <param id="763" name="Hair Volume" value="0.720" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.000" />
+
+      <param id="99" name="Eye Color" value="0.890" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F B Skinny">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.321" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.239" />
+
+      <param id="4" name="Broad_Nostrils" value="-0.065" />
+
+      <param id="5" name="Cleft_Chin" value="0.483" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.376" />
+
+      <param id="7" name="Weak_Chin" value="-0.010" />
+
+      <param id="8" name="Double_Chin" value="0.440" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.840" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.100" />
+
+      <param id="12" name="Jowls" value="0.310" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.205" />
+
+      <param id="15" name="Ears_Out" value="-0.140" />
+
+      <param id="17" name="Square_Jaw" value="0.835" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-0.380" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.200" />
+
+      <param id="20" name="Bulbous_Nose" value="0.140" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.280" />
+
+      <param id="22" name="Attached_Earlobes" value="0.620" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.140" />
+
+      <param id="24" name="Wide_Eyes" value="0.460" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.350" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.125" />
+
+      <param id="33" name="Height" value="1.785" />
+
+      <param id="34" name="Thickness" value="-0.216" />
+
+      <param id="35" name="Big_Ears" value="-0.250" />
+
+      <param id="36" name="Shoulders" value="-0.008" />
+
+      <param id="37" name="Hip Width" value="-1.040" />
+
+      <param id="38" name="Torso Length" value="0.820" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.450" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.314" />
+
+      <param id="155" name="Lip Width" value="-0.130" />
+
+      <param id="157" name="Belly Size" value="0.100" />
+
+      <param id="185" name="Deep_Chin" value="-0.260" />
+
+      <param id="193" name="Head Shape" value="0.790" />
+
+      <param id="196" name="Eye Spacing" value="0.160" />
+
+      <param id="505" name="Lip Thickness" value="0.770" />
+
+      <param id="506" name="Mouth_Height" value="1.280" />
+
+      <param id="507" name="Breast_Gravity" value="-0.345" />
+
+      <param id="515" name="Foot_Size" value="2.000" />
+
+      <param id="517" name="Wide_Nose" value="0.460" />
+
+      <param id="518" name="Eyelashes_Long" value="0.906" />
+
+      <param id="629" name="Forehead Angle" value="0.000" />
+
+      <param id="637" name="Body Fat" value="0.000" />
+
+      <param id="646" name="Egg_Head" value="0.540" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.505" />
+
+      <param id="649" name="Torso Muscles" value="0.670" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.375" />
+
+      <param id="652" name="Leg Muscles" value="0.810" />
+
+      <param id="653" name="Tall_Lips" value="-0.190" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.610" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="-0.080" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="0.480" />
+
+      <param id="675" name="Hand Size" value="0.186" />
+
+      <param id="676" name="Love_Handles" value="-0.340" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.420" />
+
+      <param id="683" name="Neck Thickness" value="-0.178" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.148" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.470" />
+
+      <param id="692" name="Leg Length" value="0.620" />
+
+      <param id="693" name="Arm Length" value="0.820" />
+
+      <param id="753" name="Saddlebags" value="1.180" />
+
+      <param id="756" name="Neck Length" value="0.640" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.420" />
+
+      <param id="759" name="Low_Septum_Nose" value="-0.175" />
+
+      <param id="760" name="Jaw_Angle" value="1.104" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.350" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.652" />
+
+      <param id="769" name="Eye Depth" value="0.560" />
+
+      <param id="773" name="Head Length" value="0.570" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.060" />
+
+      <param id="111" name="Pigment" value="0.560" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.990" />
+
+      <param id="162" name="Facial Definition" value="0.070" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.010" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.470" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.310" />
+
+      <param id="114" name="Blonde Hair" value="0.110" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.370" />
+
+      <param id="130" name="Front Fringe" value="0.740" />
+
+      <param id="131" name="Side Fringe" value="0.730" />
+
+      <param id="132" name="Back Fringe" value="0.560" />
+
+      <param id="133" name="Hair Front" value="0.190" />
+
+      <param id="134" name="Hair Sides" value="0.100" />
+
+      <param id="135" name="Hair Back" value="0.000" />
+
+      <param id="136" name="Hair Sweep" value="0.920" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="2.000" />
+
+      <param id="141" name="Hair_Part_Right" value="2.000" />
+
+      <param id="142" name="Hair_Part_Left" value="2.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.205" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.270" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.160" />
+
+      <param id="182" name="Hair_Big_Top" value="0.860" />
+
+      <param id="183" name="Hair_Big_Back" value="1.000" />
+
+      <param id="184" name="Hair_Spiked" value="0.130" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.000" />
+
+      <param id="750" name="Eyebrow Density" value="1.000" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.340" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.030" />
+
+      <param id="757" name="Lower_Eyebrows" value="0.360" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.540" />
+
+      <param id="763" name="Hair Volume" value="0.770" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.320" />
+
+      <param id="99" name="Eye Color" value="0.130" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F B Muscle">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.321" />
+
+      <param id="2" name="Nose_Big_Out" value="0.091" />
+
+      <param id="4" name="Broad_Nostrils" value="0.175" />
+
+      <param id="5" name="Cleft_Chin" value="0.604" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.259" />
+
+      <param id="7" name="Weak_Chin" value="-0.320" />
+
+      <param id="8" name="Double_Chin" value="-0.100" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.255" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.080" />
+
+      <param id="12" name="Jowls" value="0.460" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.070" />
+
+      <param id="15" name="Ears_Out" value="0.400" />
+
+      <param id="17" name="Square_Jaw" value="0.610" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="0.860" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.375" />
+
+      <param id="20" name="Bulbous_Nose" value="0.060" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="-0.035" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.340" />
+
+      <param id="24" name="Wide_Eyes" value="-0.380" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.971" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.575" />
+
+      <param id="33" name="Height" value="1.097" />
+
+      <param id="34" name="Thickness" value="0.642" />
+
+      <param id="35" name="Big_Ears" value="0.050" />
+
+      <param id="36" name="Shoulders" value="-0.456" />
+
+      <param id="37" name="Hip Width" value="-1.340" />
+
+      <param id="38" name="Torso Length" value="0.720" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.750" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.202" />
+
+      <param id="155" name="Lip Width" value="0.024" />
+
+      <param id="157" name="Belly Size" value="0.220" />
+
+      <param id="185" name="Deep_Chin" value="0.400" />
+
+      <param id="193" name="Head Shape" value="0.810" />
+
+      <param id="196" name="Eye Spacing" value="-0.380" />
+
+      <param id="505" name="Lip Thickness" value="0.740" />
+
+      <param id="506" name="Mouth_Height" value="0.640" />
+
+      <param id="507" name="Breast_Gravity" value="0.600" />
+
+      <param id="515" name="Foot_Size" value="1.840" />
+
+      <param id="517" name="Wide_Nose" value="0.505" />
+
+      <param id="518" name="Eyelashes_Long" value="0.330" />
+
+      <param id="629" name="Forehead Angle" value="0.000" />
+
+      <param id="637" name="Body Fat" value="0.140" />
+
+      <param id="646" name="Egg_Head" value="0.563" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.130" />
+
+      <param id="649" name="Torso Muscles" value="0.870" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.700" />
+
+      <param id="652" name="Leg Muscles" value="0.850" />
+
+      <param id="653" name="Tall_Lips" value="1.850" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.860" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.160" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="-0.320" />
+
+      <param id="675" name="Hand Size" value="0.120" />
+
+      <param id="676" name="Love_Handles" value="-0.190" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.720" />
+
+      <param id="683" name="Neck Thickness" value="0.044" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.148" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.660" />
+
+      <param id="692" name="Leg Length" value="0.460" />
+
+      <param id="693" name="Arm Length" value="0.540" />
+
+      <param id="753" name="Saddlebags" value="0.865" />
+
+      <param id="756" name="Neck Length" value="0.220" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.000" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.100" />
+
+      <param id="760" name="Jaw_Angle" value="1.072" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.180" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.316" />
+
+      <param id="769" name="Eye Depth" value="0.780" />
+
+      <param id="773" name="Head Length" value="0.570" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.042" />
+
+      <param id="111" name="Pigment" value="0.570" />
+
+      <param id="116" name="Rosy Complexion" value="0.350" />
+
+      <param id="117" name="Lip Pinkness" value="0.470" />
+
+      <param id="150" name="Body Definition" value="0.690" />
+
+      <param id="162" name="Facial Definition" value="0.220" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.030" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.010" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.470" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.520" />
+
+      <param id="114" name="Blonde Hair" value="0.030" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.370" />
+
+      <param id="130" name="Front Fringe" value="0.280" />
+
+      <param id="131" name="Side Fringe" value="1.000" />
+
+      <param id="132" name="Back Fringe" value="1.000" />
+
+      <param id="133" name="Hair Front" value="0.280" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.570" />
+
+      <param id="136" name="Hair Sweep" value="1.000" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.040" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.270" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.260" />
+
+      <param id="182" name="Hair_Big_Top" value="0.860" />
+
+      <param id="183" name="Hair_Big_Back" value="0.300" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.620" />
+
+      <param id="750" name="Eyebrow Density" value="1.000" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.340" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.030" />
+
+      <param id="757" name="Lower_Eyebrows" value="0.360" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.570" />
+
+      <param id="763" name="Hair Volume" value="0.770" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.140" />
+
+      <param id="99" name="Eye Color" value="0.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F B Chubby">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.436" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.404" />
+
+      <param id="4" name="Broad_Nostrils" value="0.430" />
+
+      <param id="5" name="Cleft_Chin" value="0.219" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.428" />
+
+      <param id="7" name="Weak_Chin" value="0.270" />
+
+      <param id="8" name="Double_Chin" value="0.060" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.285" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.180" />
+
+      <param id="12" name="Jowls" value="0.640" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.250" />
+
+      <param id="15" name="Ears_Out" value="-0.280" />
+
+      <param id="17" name="Square_Jaw" value="0.280" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.500" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-1.175" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.200" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="-0.200" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.340" />
+
+      <param id="24" name="Wide_Eyes" value="1.020" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.064" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="0.025" />
+
+      <param id="33" name="Height" value="0.753" />
+
+      <param id="34" name="Thickness" value="0.928" />
+
+      <param id="35" name="Big_Ears" value="-0.130" />
+
+      <param id="36" name="Shoulders" value="-0.776" />
+
+      <param id="37" name="Hip Width" value="-0.860" />
+
+      <param id="38" name="Torso Length" value="0.860" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.850" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.398" />
+
+      <param id="155" name="Lip Width" value="0.134" />
+
+      <param id="157" name="Belly Size" value="0.150" />
+
+      <param id="185" name="Deep_Chin" value="-0.560" />
+
+      <param id="193" name="Head Shape" value="0.470" />
+
+      <param id="196" name="Eye Spacing" value="0.400" />
+
+      <param id="505" name="Lip Thickness" value="0.740" />
+
+      <param id="506" name="Mouth_Height" value="0.280" />
+
+      <param id="507" name="Breast_Gravity" value="1.370" />
+
+      <param id="515" name="Foot_Size" value="1.480" />
+
+      <param id="517" name="Wide_Nose" value="0.550" />
+
+      <param id="518" name="Eyelashes_Long" value="0.222" />
+
+      <param id="629" name="Forehead Angle" value="0.470" />
+
+      <param id="637" name="Body Fat" value="0.370" />
+
+      <param id="646" name="Egg_Head" value="0.379" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.430" />
+
+      <param id="649" name="Torso Muscles" value="0.680" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.325" />
+
+      <param id="652" name="Leg Muscles" value="0.800" />
+
+      <param id="653" name="Tall_Lips" value="0.560" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.830" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.160" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="-0.320" />
+
+      <param id="675" name="Hand Size" value="0.006" />
+
+      <param id="676" name="Love_Handles" value="-0.070" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.770" />
+
+      <param id="683" name="Neck Thickness" value="-0.064" />
+
+      <param id="684" name="Breast_Female_Clevage" value="-0.092" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.530" />
+
+      <param id="692" name="Leg Length" value="0.640" />
+
+      <param id="693" name="Arm Length" value="0.780" />
+
+      <param id="753" name="Saddlebags" value="1.250" />
+
+      <param id="756" name="Neck Length" value="0.200" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.060" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.925" />
+
+      <param id="760" name="Jaw_Angle" value="0.688" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.520" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.316" />
+
+      <param id="769" name="Eye Depth" value="0.620" />
+
+      <param id="773" name="Head Length" value="0.720" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.660" />
+
+      <param id="116" name="Rosy Complexion" value="0.080" />
+
+      <param id="117" name="Lip Pinkness" value="0.330" />
+
+      <param id="150" name="Body Definition" value="0.690" />
+
+      <param id="162" name="Facial Definition" value="0.470" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.190" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.655" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.180" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.340" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.200" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="0.730" />
+
+      <param id="132" name="Back Fringe" value="0.210" />
+
+      <param id="133" name="Hair Front" value="0.280" />
+
+      <param id="134" name="Hair Sides" value="0.170" />
+
+      <param id="135" name="Hair Back" value="0.560" />
+
+      <param id="136" name="Hair Sweep" value="0.800" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.040" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.230" />
+
+      <param id="181" name="Hair_Big_Front" value="0.400" />
+
+      <param id="182" name="Hair_Big_Top" value="0.340" />
+
+      <param id="183" name="Hair_Big_Back" value="0.380" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.830" />
+
+      <param id="750" name="Eyebrow Density" value="0.850" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.190" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.090" />
+
+      <param id="757" name="Lower_Eyebrows" value="-0.120" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.750" />
+
+      <param id="763" name="Hair Volume" value="0.660" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.140" />
+
+      <param id="99" name="Eye Color" value="0.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F A Skinny">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="-0.254" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.371" />
+
+      <param id="4" name="Broad_Nostrils" value="-0.365" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.675" />
+
+      <param id="7" name="Weak_Chin" value="0.230" />
+
+      <param id="8" name="Double_Chin" value="0.040" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.390" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.140" />
+
+      <param id="12" name="Jowls" value="-0.500" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.640" />
+
+      <param id="15" name="Ears_Out" value="0.140" />
+
+      <param id="17" name="Square_Jaw" value="-0.170" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="0.860" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="0.375" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.280" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="1.195" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.500" />
+
+      <param id="24" name="Wide_Eyes" value="-0.030" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="1.247" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.325" />
+
+      <param id="33" name="Height" value="-0.064" />
+
+      <param id="34" name="Thickness" value="-0.700" />
+
+      <param id="35" name="Big_Ears" value="0.260" />
+
+      <param id="36" name="Shoulders" value="-1.320" />
+
+      <param id="37" name="Hip Width" value="-2.060" />
+
+      <param id="38" name="Torso Length" value="0.280" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.100" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.260" />
+
+      <param id="155" name="Lip Width" value="-0.526" />
+
+      <param id="157" name="Belly Size" value="0.040" />
+
+      <param id="185" name="Deep_Chin" value="-0.460" />
+
+      <param id="193" name="Head Shape" value="0.540" />
+
+      <param id="196" name="Eye Spacing" value="-0.170" />
+
+      <param id="505" name="Lip Thickness" value="0.560" />
+
+      <param id="506" name="Mouth_Height" value="-0.480" />
+
+      <param id="507" name="Breast_Gravity" value="0.005" />
+
+      <param id="515" name="Foot_Size" value="0.040" />
+
+      <param id="517" name="Wide_Nose" value="0.535" />
+
+      <param id="518" name="Eyelashes_Long" value="1.230" />
+
+      <param id="629" name="Forehead Angle" value="0.470" />
+
+      <param id="637" name="Body Fat" value="0.000" />
+
+      <param id="646" name="Egg_Head" value="0.310" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.565" />
+
+      <param id="649" name="Torso Muscles" value="0.200" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.700" />
+
+      <param id="652" name="Leg Muscles" value="0.390" />
+
+      <param id="653" name="Tall_Lips" value="0.740" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.770" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="-0.080" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="-0.600" />
+
+      <param id="675" name="Hand Size" value="-0.216" />
+
+      <param id="676" name="Love_Handles" value="-0.340" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.500" />
+
+      <param id="683" name="Neck Thickness" value="-0.310" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.292" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.620" />
+
+      <param id="692" name="Leg Length" value="0.160" />
+
+      <param id="693" name="Arm Length" value="0.220" />
+
+      <param id="753" name="Saddlebags" value="0.865" />
+
+      <param id="756" name="Neck Length" value="-0.260" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.180" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.175" />
+
+      <param id="760" name="Jaw_Angle" value="0.496" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.061" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="-0.300" />
+
+      <param id="769" name="Eye Depth" value="0.710" />
+
+      <param id="773" name="Head Length" value="0.390" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.150" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.990" />
+
+      <param id="162" name="Facial Definition" value="0.070" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.205" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.450" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.310" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.350" />
+
+      <param id="130" name="Front Fringe" value="0.560" />
+
+      <param id="131" name="Side Fringe" value="0.730" />
+
+      <param id="132" name="Back Fringe" value="0.510" />
+
+      <param id="133" name="Hair Front" value="0.140" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.920" />
+
+      <param id="136" name="Hair Sweep" value="0.520" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="1.880" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.590" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.000" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.160" />
+
+      <param id="182" name="Hair_Big_Top" value="0.500" />
+
+      <param id="183" name="Hair_Big_Back" value="0.260" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.530" />
+
+      <param id="674" name="Hair_Shear_Back" value="1.500" />
+
+      <param id="750" name="Eyebrow Density" value="0.810" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.940" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.480" />
+
+      <param id="757" name="Lower_Eyebrows" value="-0.440" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.210" />
+
+      <param id="763" name="Hair Volume" value="0.770" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.000" />
+
+      <param id="99" name="Eye Color" value="0.040" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F A Muscle">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.574" />
+
+      <param id="2" name="Nose_Big_Out" value="0.586" />
+
+      <param id="4" name="Broad_Nostrils" value="-0.500" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="-0.079" />
+
+      <param id="7" name="Weak_Chin" value="0.320" />
+
+      <param id="8" name="Double_Chin" value="0.440" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.105" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.240" />
+
+      <param id="12" name="Jowls" value="0.340" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.880" />
+
+      <param id="15" name="Ears_Out" value="0.340" />
+
+      <param id="17" name="Square_Jaw" value="-0.455" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="0.860" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.350" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.500" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="1.300" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.340" />
+
+      <param id="24" name="Wide_Eyes" value="-0.380" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.327" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.125" />
+
+      <param id="33" name="Height" value="0.194" />
+
+      <param id="34" name="Thickness" value="-0.018" />
+
+      <param id="35" name="Big_Ears" value="0.560" />
+
+      <param id="36" name="Shoulders" value="-0.456" />
+
+      <param id="37" name="Hip Width" value="-1.760" />
+
+      <param id="38" name="Torso Length" value="0.400" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.240" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.134" />
+
+      <param id="155" name="Lip Width" value="-0.900" />
+
+      <param id="157" name="Belly Size" value="0.020" />
+
+      <param id="185" name="Deep_Chin" value="0.500" />
+
+      <param id="193" name="Head Shape" value="0.360" />
+
+      <param id="196" name="Eye Spacing" value="-0.500" />
+
+      <param id="505" name="Lip Thickness" value="0.280" />
+
+      <param id="506" name="Mouth_Height" value="0.080" />
+
+      <param id="507" name="Breast_Gravity" value="-0.520" />
+
+      <param id="515" name="Foot_Size" value="0.280" />
+
+      <param id="517" name="Wide_Nose" value="0.265" />
+
+      <param id="518" name="Eyelashes_Long" value="0.006" />
+
+      <param id="629" name="Forehead Angle" value="0.850" />
+
+      <param id="637" name="Body Fat" value="0.000" />
+
+      <param id="646" name="Egg_Head" value="-0.334" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.395" />
+
+      <param id="649" name="Torso Muscles" value="0.510" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.375" />
+
+      <param id="652" name="Leg Muscles" value="0.750" />
+
+      <param id="653" name="Tall_Lips" value="1.460" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.580" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="-0.080" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="-0.080" />
+
+      <param id="675" name="Hand Size" value="-0.168" />
+
+      <param id="676" name="Love_Handles" value="0.110" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.470" />
+
+      <param id="683" name="Neck Thickness" value="-0.148" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.436" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.620" />
+
+      <param id="692" name="Leg Length" value="0.260" />
+
+      <param id="693" name="Arm Length" value="0.420" />
+
+      <param id="753" name="Saddlebags" value="0.340" />
+
+      <param id="756" name="Neck Length" value="-0.360" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.510" />
+
+      <param id="759" name="Low_Septum_Nose" value="-0.625" />
+
+      <param id="760" name="Jaw_Angle" value="0.816" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="-0.500" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.064" />
+
+      <param id="769" name="Eye Depth" value="0.720" />
+
+      <param id="773" name="Head Length" value="0.330" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.011" />
+
+      <param id="111" name="Pigment" value="0.370" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="1.000" />
+
+      <param id="162" name="Facial Definition" value="0.070" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.610" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.160" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.310" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.260" />
+
+      <param id="130" name="Front Fringe" value="0.650" />
+
+      <param id="131" name="Side Fringe" value="0.990" />
+
+      <param id="132" name="Back Fringe" value="0.960" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.530" />
+
+      <param id="136" name="Hair Sweep" value="0.630" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.590" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.000" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.160" />
+
+      <param id="182" name="Hair_Big_Top" value="0.320" />
+
+      <param id="183" name="Hair_Big_Back" value="0.300" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="-0.100" />
+
+      <param id="750" name="Eyebrow Density" value="1.000" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.020" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.120" />
+
+      <param id="757" name="Lower_Eyebrows" value="0.120" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.000" />
+
+      <param id="763" name="Hair Volume" value="0.770" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.000" />
+
+      <param id="99" name="Eye Color" value="0.040" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F A Chubby">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.482" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.140" />
+
+      <param id="4" name="Broad_Nostrils" value="0.280" />
+
+      <param id="5" name="Cleft_Chin" value="0.164" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.220" />
+
+      <param id="7" name="Weak_Chin" value="-0.040" />
+
+      <param id="8" name="Double_Chin" value="0.200" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.150" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.020" />
+
+      <param id="12" name="Jowls" value="0.550" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.670" />
+
+      <param id="15" name="Ears_Out" value="0.720" />
+
+      <param id="17" name="Square_Jaw" value="0.175" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.420" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.075" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.500" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.640" />
+
+      <param id="22" name="Attached_Earlobes" value="0.570" />
+
+      <param id="23" name="Baggy_Eyes" value="0.020" />
+
+      <param id="24" name="Wide_Eyes" value="-0.555" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.764" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.300" />
+
+      <param id="33" name="Height" value="-0.709" />
+
+      <param id="34" name="Thickness" value="-0.084" />
+
+      <param id="35" name="Big_Ears" value="0.140" />
+
+      <param id="36" name="Shoulders" value="-0.936" />
+
+      <param id="37" name="Hip Width" value="-1.220" />
+
+      <param id="38" name="Torso Length" value="0.860" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.780" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.022" />
+
+      <param id="155" name="Lip Width" value="-0.548" />
+
+      <param id="157" name="Belly Size" value="0.180" />
+
+      <param id="185" name="Deep_Chin" value="-0.120" />
+
+      <param id="193" name="Head Shape" value="0.680" />
+
+      <param id="196" name="Eye Spacing" value="-0.230" />
+
+      <param id="505" name="Lip Thickness" value="0.730" />
+
+      <param id="506" name="Mouth_Height" value="-0.160" />
+
+      <param id="507" name="Breast_Gravity" value="-0.205" />
+
+      <param id="515" name="Foot_Size" value="0.200" />
+
+      <param id="517" name="Wide_Nose" value="0.130" />
+
+      <param id="518" name="Eyelashes_Long" value="0.240" />
+
+      <param id="629" name="Forehead Angle" value="0.670" />
+
+      <param id="637" name="Body Fat" value="0.120" />
+
+      <param id="646" name="Egg_Head" value="0.149" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.005" />
+
+      <param id="649" name="Torso Muscles" value="0.640" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.050" />
+
+      <param id="652" name="Leg Muscles" value="0.570" />
+
+      <param id="653" name="Tall_Lips" value="0.740" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.720" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="-0.080" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="-0.640" />
+
+      <param id="675" name="Hand Size" value="-0.198" />
+
+      <param id="676" name="Love_Handles" value="0.560" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.770" />
+
+      <param id="683" name="Neck Thickness" value="-0.058" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.116" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.530" />
+
+      <param id="692" name="Leg Length" value="0.400" />
+
+      <param id="693" name="Arm Length" value="0.500" />
+
+      <param id="753" name="Saddlebags" value="0.725" />
+
+      <param id="756" name="Neck Length" value="-0.380" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.330" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.200" />
+
+      <param id="760" name="Jaw_Angle" value="0.528" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="-0.228" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="-0.020" />
+
+      <param id="769" name="Eye Depth" value="0.670" />
+
+      <param id="773" name="Head Length" value="0.340" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.390" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.430" />
+
+      <param id="162" name="Facial Definition" value="0.000" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.095" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.610" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.150" />
+
+      <param id="114" name="Blonde Hair" value="0.050" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.110" />
+
+      <param id="130" name="Front Fringe" value="0.300" />
+
+      <param id="131" name="Side Fringe" value="0.630" />
+
+      <param id="132" name="Back Fringe" value="0.690" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.670" />
+
+      <param id="135" name="Hair Back" value="0.730" />
+
+      <param id="136" name="Hair Sweep" value="0.820" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="1.260" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.315" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.000" />
+
+      <param id="181" name="Hair_Big_Front" value="0.260" />
+
+      <param id="182" name="Hair_Big_Top" value="0.260" />
+
+      <param id="183" name="Hair_Big_Back" value="0.000" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="-0.100" />
+
+      <param id="750" name="Eyebrow Density" value="0.580" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.970" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.060" />
+
+      <param id="757" name="Lower_Eyebrows" value="1.760" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.690" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.080" />
+
+      <param id="99" name="Eye Color" value="0.160" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+</linden_genepool>
+
diff --git a/indra/newview/character/glove_length_alpha.tga b/indra/newview/character/glove_length_alpha.tga
new file mode 100644
index 0000000000..db89ad57e7
Binary files /dev/null and b/indra/newview/character/glove_length_alpha.tga differ
diff --git a/indra/newview/character/gloves_fingers_alpha.tga b/indra/newview/character/gloves_fingers_alpha.tga
new file mode 100644
index 0000000000..dba2eec277
Binary files /dev/null and b/indra/newview/character/gloves_fingers_alpha.tga differ
diff --git a/indra/newview/character/head_alpha.tga b/indra/newview/character/head_alpha.tga
new file mode 100644
index 0000000000..8164525353
Binary files /dev/null and b/indra/newview/character/head_alpha.tga differ
diff --git a/indra/newview/character/head_color.tga b/indra/newview/character/head_color.tga
new file mode 100644
index 0000000000..74b1b3078b
Binary files /dev/null and b/indra/newview/character/head_color.tga differ
diff --git a/indra/newview/character/head_hair.tga b/indra/newview/character/head_hair.tga
new file mode 100644
index 0000000000..5321f35204
Binary files /dev/null and b/indra/newview/character/head_hair.tga differ
diff --git a/indra/newview/character/head_highlights_alpha.tga b/indra/newview/character/head_highlights_alpha.tga
new file mode 100644
index 0000000000..8dc5239f97
Binary files /dev/null and b/indra/newview/character/head_highlights_alpha.tga differ
diff --git a/indra/newview/character/head_shading_alpha.tga b/indra/newview/character/head_shading_alpha.tga
new file mode 100644
index 0000000000..e8ea490109
Binary files /dev/null and b/indra/newview/character/head_shading_alpha.tga differ
diff --git a/indra/newview/character/head_skingrain.tga b/indra/newview/character/head_skingrain.tga
new file mode 100644
index 0000000000..b42dee0809
Binary files /dev/null and b/indra/newview/character/head_skingrain.tga differ
diff --git a/indra/newview/character/jacket_length_lower_alpha.tga b/indra/newview/character/jacket_length_lower_alpha.tga
new file mode 100644
index 0000000000..722bc192a8
Binary files /dev/null and b/indra/newview/character/jacket_length_lower_alpha.tga differ
diff --git a/indra/newview/character/jacket_length_upper_alpha.tga b/indra/newview/character/jacket_length_upper_alpha.tga
new file mode 100644
index 0000000000..e9db7e7b1f
Binary files /dev/null and b/indra/newview/character/jacket_length_upper_alpha.tga differ
diff --git a/indra/newview/character/jacket_open_lower_alpha.tga b/indra/newview/character/jacket_open_lower_alpha.tga
new file mode 100644
index 0000000000..db0c2fb0e3
Binary files /dev/null and b/indra/newview/character/jacket_open_lower_alpha.tga differ
diff --git a/indra/newview/character/jacket_open_upper_alpha.tga b/indra/newview/character/jacket_open_upper_alpha.tga
new file mode 100644
index 0000000000..71b8a0b805
Binary files /dev/null and b/indra/newview/character/jacket_open_upper_alpha.tga differ
diff --git a/indra/newview/character/lipgloss_alpha.tga b/indra/newview/character/lipgloss_alpha.tga
new file mode 100644
index 0000000000..78ceecaf85
Binary files /dev/null and b/indra/newview/character/lipgloss_alpha.tga differ
diff --git a/indra/newview/character/lips_mask.tga b/indra/newview/character/lips_mask.tga
new file mode 100644
index 0000000000..ae1401c006
Binary files /dev/null and b/indra/newview/character/lips_mask.tga differ
diff --git a/indra/newview/character/lipstick_alpha.tga b/indra/newview/character/lipstick_alpha.tga
new file mode 100644
index 0000000000..2795f1bd40
Binary files /dev/null and b/indra/newview/character/lipstick_alpha.tga differ
diff --git a/indra/newview/character/lowerbody_color.tga b/indra/newview/character/lowerbody_color.tga
new file mode 100644
index 0000000000..a63aa12fca
Binary files /dev/null and b/indra/newview/character/lowerbody_color.tga differ
diff --git a/indra/newview/character/lowerbody_highlights_alpha.tga b/indra/newview/character/lowerbody_highlights_alpha.tga
new file mode 100644
index 0000000000..ae3413ac8b
Binary files /dev/null and b/indra/newview/character/lowerbody_highlights_alpha.tga differ
diff --git a/indra/newview/character/lowerbody_shading_alpha.tga b/indra/newview/character/lowerbody_shading_alpha.tga
new file mode 100644
index 0000000000..0242663a7d
Binary files /dev/null and b/indra/newview/character/lowerbody_shading_alpha.tga differ
diff --git a/indra/newview/character/nailpolish_alpha.tga b/indra/newview/character/nailpolish_alpha.tga
new file mode 100644
index 0000000000..91af762902
Binary files /dev/null and b/indra/newview/character/nailpolish_alpha.tga differ
diff --git a/indra/newview/character/pants_length_alpha.tga b/indra/newview/character/pants_length_alpha.tga
new file mode 100644
index 0000000000..3c4f21c0f2
Binary files /dev/null and b/indra/newview/character/pants_length_alpha.tga differ
diff --git a/indra/newview/character/pants_waist_alpha.tga b/indra/newview/character/pants_waist_alpha.tga
new file mode 100644
index 0000000000..35658c0896
Binary files /dev/null and b/indra/newview/character/pants_waist_alpha.tga differ
diff --git a/indra/newview/character/rosyface_alpha.tga b/indra/newview/character/rosyface_alpha.tga
new file mode 100644
index 0000000000..a0c8513da2
Binary files /dev/null and b/indra/newview/character/rosyface_alpha.tga differ
diff --git a/indra/newview/character/rouge_alpha.tga b/indra/newview/character/rouge_alpha.tga
new file mode 100644
index 0000000000..a0c8513da2
Binary files /dev/null and b/indra/newview/character/rouge_alpha.tga differ
diff --git a/indra/newview/character/shirt_bottom_alpha.tga b/indra/newview/character/shirt_bottom_alpha.tga
new file mode 100644
index 0000000000..7cce03dbe0
Binary files /dev/null and b/indra/newview/character/shirt_bottom_alpha.tga differ
diff --git a/indra/newview/character/shirt_collar_alpha.tga b/indra/newview/character/shirt_collar_alpha.tga
new file mode 100644
index 0000000000..f55f635473
Binary files /dev/null and b/indra/newview/character/shirt_collar_alpha.tga differ
diff --git a/indra/newview/character/shirt_collar_back_alpha.tga b/indra/newview/character/shirt_collar_back_alpha.tga
new file mode 100644
index 0000000000..43a6453107
Binary files /dev/null and b/indra/newview/character/shirt_collar_back_alpha.tga differ
diff --git a/indra/newview/character/shirt_sleeve_alpha.tga b/indra/newview/character/shirt_sleeve_alpha.tga
new file mode 100644
index 0000000000..e3b18f4fc6
Binary files /dev/null and b/indra/newview/character/shirt_sleeve_alpha.tga differ
diff --git a/indra/newview/character/shoe_height_alpha.tga b/indra/newview/character/shoe_height_alpha.tga
new file mode 100644
index 0000000000..d08dd750f3
Binary files /dev/null and b/indra/newview/character/shoe_height_alpha.tga differ
diff --git a/indra/newview/character/skirt_length_alpha.tga b/indra/newview/character/skirt_length_alpha.tga
new file mode 100644
index 0000000000..c86799469d
Binary files /dev/null and b/indra/newview/character/skirt_length_alpha.tga differ
diff --git a/indra/newview/character/skirt_slit_back_alpha.tga b/indra/newview/character/skirt_slit_back_alpha.tga
new file mode 100644
index 0000000000..0e49688b14
Binary files /dev/null and b/indra/newview/character/skirt_slit_back_alpha.tga differ
diff --git a/indra/newview/character/skirt_slit_front_alpha.tga b/indra/newview/character/skirt_slit_front_alpha.tga
new file mode 100644
index 0000000000..888bbf71a1
Binary files /dev/null and b/indra/newview/character/skirt_slit_front_alpha.tga differ
diff --git a/indra/newview/character/skirt_slit_left_alpha.tga b/indra/newview/character/skirt_slit_left_alpha.tga
new file mode 100644
index 0000000000..210feac1ea
Binary files /dev/null and b/indra/newview/character/skirt_slit_left_alpha.tga differ
diff --git a/indra/newview/character/skirt_slit_right_alpha.tga b/indra/newview/character/skirt_slit_right_alpha.tga
new file mode 100644
index 0000000000..ce11c64bf6
Binary files /dev/null and b/indra/newview/character/skirt_slit_right_alpha.tga differ
diff --git a/indra/newview/character/underpants_trial_female.tga b/indra/newview/character/underpants_trial_female.tga
new file mode 100644
index 0000000000..96bf732351
Binary files /dev/null and b/indra/newview/character/underpants_trial_female.tga differ
diff --git a/indra/newview/character/underpants_trial_male.tga b/indra/newview/character/underpants_trial_male.tga
new file mode 100644
index 0000000000..095695ca1c
Binary files /dev/null and b/indra/newview/character/underpants_trial_male.tga differ
diff --git a/indra/newview/character/undershirt_trial_female.tga b/indra/newview/character/undershirt_trial_female.tga
new file mode 100644
index 0000000000..e17a309531
Binary files /dev/null and b/indra/newview/character/undershirt_trial_female.tga differ
diff --git a/indra/newview/character/upperbody_color.tga b/indra/newview/character/upperbody_color.tga
new file mode 100644
index 0000000000..85fcc41142
Binary files /dev/null and b/indra/newview/character/upperbody_color.tga differ
diff --git a/indra/newview/character/upperbody_highlights_alpha.tga b/indra/newview/character/upperbody_highlights_alpha.tga
new file mode 100644
index 0000000000..2d8102b583
Binary files /dev/null and b/indra/newview/character/upperbody_highlights_alpha.tga differ
diff --git a/indra/newview/character/upperbody_shading_alpha.tga b/indra/newview/character/upperbody_shading_alpha.tga
new file mode 100644
index 0000000000..b420506b3e
Binary files /dev/null and b/indra/newview/character/upperbody_shading_alpha.tga differ
diff --git a/indra/newview/character/upperbodyfreckles_alpha.tga b/indra/newview/character/upperbodyfreckles_alpha.tga
new file mode 100644
index 0000000000..76c7ce8849
Binary files /dev/null and b/indra/newview/character/upperbodyfreckles_alpha.tga differ
-- 
cgit v1.2.3


From 87524528a1fea00139ed42151a920596a880ae82 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Tue, 14 Apr 2009 20:10:56 +0000
Subject: Missed a file.

---
 indra/newview/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 0f796bbdff..f570866489 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1081,8 +1081,6 @@ set_source_files_properties(${viewer_APPSETTINGS_FILES}
 
 list(APPEND viewer_SOURCE_FILES ${viewer_APPSETTINGS_FILES})
 
-use_prebuilt_binary(artwork-common)
-
 set(viewer_CHARACTER_FILES
     character/attentions.xml
     character/attentionsN.xml
-- 
cgit v1.2.3


From 8ed056fde9fe5fc9755158013a5cb8be73066e2c Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Sat, 20 Jun 2009 09:17:56 +0000
Subject: svn merge -r124872:124873
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.threefour-merge-1a

QAR-1592 Merge of changes between 1.23 RC2 and 1.23 Final to trunk
---
 indra/llcommon/llversionviewer.h                   |    2 +-
 indra/llcrashlogger/llcrashlogger.cpp              |    3 +
 indra/llrender/llimagegl.cpp                       |   12 +-
 indra/llrender/llimagegl.h                         |    7 +-
 indra/llui/llview.cpp                              |   27 +-
 indra/newview/app_settings/settings.xml            |   15 +-
 indra/newview/da.lproj/language.txt                |    1 +
 indra/newview/es.lproj/language.txt                |    1 +
 indra/newview/featuretable.txt                     |    3 +-
 indra/newview/featuretable_linux.txt               |    2 +-
 indra/newview/featuretable_mac.txt                 |    2 +-
 indra/newview/fr.lproj/language.txt                |    1 +
 indra/newview/hu.lproj/language.txt                |    1 +
 indra/newview/installers/windows/lang_fr.nsi       |  Bin 8118 -> 8114 bytes
 indra/newview/it.lproj/language.txt                |    1 +
 indra/newview/linux_tools/wrapper.sh               |    4 +-
 indra/newview/llagent.cpp                          |   15 +-
 indra/newview/llappviewer.cpp                      |   35 +-
 indra/newview/llappviewermacosx.cpp                |   47 +-
 indra/newview/llappviewermacosx.h                  |    1 -
 indra/newview/llappviewerwin32.cpp                 |   39 +-
 indra/newview/lldrawable.cpp                       |   16 +-
 indra/newview/lldrawable.h                         |    2 +-
 indra/newview/lldrawpoolsky.cpp                    |   68 +-
 indra/newview/lldrawpoolsky.h                      |    4 -
 indra/newview/llface.cpp                           |   15 +
 indra/newview/llfloaterchat.cpp                    |    3 +
 indra/newview/llfloaterimagepreview.cpp            |   44 +-
 indra/newview/llfloaterlagmeter.cpp                |    2 +-
 indra/newview/llsky.cpp                            |   14 -
 indra/newview/llspatialpartition.h                 |    2 +-
 indra/newview/lltexlayer.cpp                       |    6 +-
 indra/newview/lltextureview.cpp                    |    8 +-
 indra/newview/lltoolcomp.cpp                       |   12 +-
 indra/newview/llviewerobject.cpp                   |   19 +-
 indra/newview/llviewerobject.h                     |    1 +
 indra/newview/llviewerstats.cpp                    |    4 +-
 indra/newview/llviewerwindow.cpp                   |    2 +-
 indra/newview/llvoavatar.cpp                       |    6 +-
 indra/newview/llvosky.cpp                          |    4 +-
 indra/newview/llvovolume.cpp                       |   54 +-
 indra/newview/llvovolume.h                         |    2 +
 indra/newview/nl.lproj/language.txt                |    1 +
 indra/newview/pipeline.cpp                         |   14 +-
 indra/newview/pl.lproj/language.txt                |    1 +
 indra/newview/pt.lproj/language.txt                |    1 +
 indra/newview/ru.lproj/language.txt                |    1 +
 .../newview/skins/default/xui/da/floater_about.xml |    4 +-
 .../skins/default/xui/da/floater_about_land.xml    |  440 ++--
 .../default/xui/da/floater_animation_preview.xml   |   13 +-
 .../skins/default/xui/da/floater_avatar_picker.xml |   47 +-
 .../skins/default/xui/da/floater_build_options.xml |    4 +-
 .../skins/default/xui/da/floater_bulk_perms.xml    |   44 +
 .../skins/default/xui/da/floater_buy_currency.xml  |    2 +-
 .../skins/default/xui/da/floater_buy_land.xml      |   60 +-
 .../skins/default/xui/da/floater_customize.xml     |  508 ++--
 .../skins/default/xui/da/floater_font_test.xml     |    6 +
 .../default/xui/da/floater_hardware_settings.xml   |    2 +-
 .../skins/default/xui/da/floater_inspect.xml       |   18 +-
 .../skins/default/xui/da/floater_joystick.xml      |   38 +-
 .../skins/default/xui/da/floater_lagmeter.xml      |   16 +-
 .../skins/default/xui/da/floater_land_holdings.xml |   19 +-
 .../skins/default/xui/da/floater_lsl_guide.xml     |    2 +-
 .../skins/default/xui/da/floater_perm_prefs.xml    |   16 +
 .../default/xui/da/floater_preview_gesture.xml     |   36 +-
 .../default/xui/da/floater_preview_notecard.xml    |   11 +-
 .../skins/default/xui/da/floater_report_abuse.xml  |   47 +-
 .../skins/default/xui/da/floater_snapshot.xml      |   46 +-
 .../skins/default/xui/da/floater_sound_preview.xml |    2 +-
 .../skins/default/xui/da/floater_statistics.xml    |    2 +
 .../skins/default/xui/da/floater_telehub.xml       |    8 +-
 .../newview/skins/default/xui/da/floater_tools.xml |  387 +--
 indra/newview/skins/default/xui/da/floater_tos.xml |    3 +-
 .../skins/default/xui/da/floater_world_map.xml     |   80 +-
 .../skins/default/xui/da/menu_inventory.xml        |    1 +
 .../newview/skins/default/xui/da/menu_mini_map.xml |    8 +
 indra/newview/skins/default/xui/da/menu_viewer.xml |  364 ++-
 .../newview/skins/default/xui/da/notifications.xml | 2596 ++++++++------------
 .../skins/default/xui/da/panel_group_general.xml   |   55 +-
 .../skins/default/xui/da/panel_group_invite.xml    |    9 +-
 .../default/xui/da/panel_group_land_money.xml      |   46 +-
 .../skins/default/xui/da/panel_group_roles.xml     |   12 +-
 .../newview/skins/default/xui/da/panel_groups.xml  |    4 +-
 .../default/xui/da/panel_preferences_general.xml   |  112 +-
 .../skins/default/xui/da/panel_region_covenant.xml |   71 +-
 .../skins/default/xui/da/panel_region_estate.xml   |    2 +-
 .../skins/default/xui/da/panel_region_general.xml  |   73 +-
 .../skins/default/xui/da/panel_region_terrain.xml  |    4 +-
 indra/newview/skins/default/xui/da/strings.xml     |   89 +-
 .../skins/default/xui/da/teleport_strings.xml      |   25 +-
 .../newview/skins/default/xui/de/floater_about.xml |    4 +-
 .../skins/default/xui/de/floater_buy_land.xml      |    1 +
 .../skins/default/xui/de/floater_mute_object.xml   |    4 +-
 .../newview/skins/default/xui/de/floater_tools.xml |    2 +-
 indra/newview/skins/default/xui/de/menu_viewer.xml |    4 +-
 .../newview/skins/default/xui/de/notifications.xml |    2 +-
 .../newview/skins/default/xui/es/floater_about.xml |    4 +-
 .../skins/default/xui/es/floater_about_land.xml    |   26 +-
 .../default/xui/es/floater_animation_preview.xml   |   25 +-
 .../skins/default/xui/es/floater_avatar_picker.xml |    8 +-
 .../skins/default/xui/es/floater_build_options.xml |    6 +-
 .../skins/default/xui/es/floater_buy_contents.xml  |    2 +-
 .../skins/default/xui/es/floater_buy_currency.xml  |   12 +-
 .../skins/default/xui/es/floater_buy_land.xml      |   11 +-
 .../skins/default/xui/es/floater_color_picker.xml  |    3 +-
 .../skins/default/xui/es/floater_customize.xml     |    6 +-
 .../default/xui/es/floater_day_cycle_options.xml   |   12 +-
 .../skins/default/xui/es/floater_env_settings.xml  |   15 +-
 .../skins/default/xui/es/floater_gesture.xml       |    5 +-
 .../default/xui/es/floater_hardware_settings.xml   |    4 +-
 .../skins/default/xui/es/floater_image_preview.xml |   10 +-
 .../skins/default/xui/es/floater_inspect.xml       |   10 +-
 .../xui/es/floater_inventory_item_properties.xml   |    8 +-
 .../xui/es/floater_inventory_view_finder.xml       |   10 +-
 .../skins/default/xui/es/floater_joystick.xml      |   29 +-
 .../skins/default/xui/es/floater_lagmeter.xml      |   13 +-
 .../skins/default/xui/es/floater_land_holdings.xml |    2 +-
 .../default/xui/es/floater_live_lsleditor.xml      |    4 +-
 .../skins/default/xui/es/floater_lsl_guide.xml     |    4 +-
 .../skins/default/xui/es/floater_media_browser.xml |    9 +-
 .../skins/default/xui/es/floater_mute_object.xml   |    7 +-
 indra/newview/skins/default/xui/es/floater_pay.xml |    9 +-
 .../skins/default/xui/es/floater_pay_object.xml    |   10 +-
 .../skins/default/xui/es/floater_postcard.xml      |   17 +-
 .../skins/default/xui/es/floater_preferences.xml   |    5 +-
 .../default/xui/es/floater_preview_animation.xml   |    4 +-
 .../default/xui/es/floater_preview_gesture.xml     |   16 +-
 .../skins/default/xui/es/floater_report_abuse.xml  |    4 +-
 .../skins/default/xui/es/floater_script_search.xml |   16 +-
 .../skins/default/xui/es/floater_select_key.xml    |    2 +-
 .../default/xui/es/floater_settings_debug.xml      |    6 +-
 .../skins/default/xui/es/floater_snapshot.xml      |   12 +-
 .../skins/default/xui/es/floater_telehub.xml       |   18 +-
 .../skins/default/xui/es/floater_texture_ctrl.xml  |    4 +-
 .../newview/skins/default/xui/es/floater_tools.xml |   68 +-
 .../skins/default/xui/es/floater_top_objects.xml   |   21 +-
 indra/newview/skins/default/xui/es/floater_tos.xml |    4 +-
 .../skins/default/xui/es/floater_url_entry.xml     |    3 +-
 .../newview/skins/default/xui/es/floater_water.xml |   22 +-
 .../default/xui/es/floater_windlight_options.xml   |   20 +-
 indra/newview/skins/default/xui/es/menu_viewer.xml |   12 +-
 .../newview/skins/default/xui/es/notifications.xml |   50 +-
 .../skins/default/xui/es/panel_group_general.xml   |   12 +-
 .../skins/default/xui/es/panel_group_invite.xml    |   17 +-
 .../default/xui/es/panel_group_land_money.xml      |   15 +-
 .../skins/default/xui/es/panel_group_notices.xml   |   17 +-
 .../skins/default/xui/es/panel_group_roles.xml     |   46 +-
 .../newview/skins/default/xui/es/panel_groups.xml  |    8 +-
 .../default/xui/es/panel_preferences_chat.xml      |    5 +-
 .../default/xui/es/panel_preferences_graphics1.xml |   42 +-
 .../skins/default/xui/es/panel_region_covenant.xml |   10 +-
 .../skins/default/xui/es/panel_region_debug.xml    |   16 +-
 .../skins/default/xui/es/panel_region_estate.xml   |   16 +-
 .../skins/default/xui/es/panel_region_general.xml  |   10 +-
 .../skins/default/xui/es/panel_region_terrain.xml  |   16 +-
 .../skins/default/xui/es/panel_region_texture.xml  |    2 +-
 .../newview/skins/default/xui/es/role_actions.xml  |  195 +-
 .../newview/skins/default/xui/fr/floater_about.xml |    4 +-
 .../skins/default/xui/fr/floater_buy_land.xml      |    1 +
 .../skins/default/xui/fr/floater_customize.xml     |   22 +-
 .../skins/default/xui/fr/floater_inventory.xml     |    4 +-
 .../xui/fr/floater_inventory_view_finder.xml       |    8 +-
 .../skins/default/xui/fr/floater_mem_leaking.xml   |    6 +-
 .../default/xui/fr/floater_preview_gesture.xml     |    1 +
 .../newview/skins/default/xui/fr/floater_tools.xml |    2 +-
 indra/newview/skins/default/xui/fr/menu_viewer.xml |    4 +-
 .../newview/skins/default/xui/fr/notifications.xml |    2 +-
 .../newview/skins/default/xui/it/floater_about.xml |    4 +-
 .../skins/default/xui/it/floater_about_land.xml    |    6 +-
 .../default/xui/it/floater_animation_preview.xml   |   19 +-
 .../skins/default/xui/it/floater_avatar_picker.xml |    8 +-
 .../skins/default/xui/it/floater_build_options.xml |    6 +-
 .../skins/default/xui/it/floater_buy_contents.xml  |    6 +-
 .../skins/default/xui/it/floater_buy_currency.xml  |    6 +-
 .../skins/default/xui/it/floater_buy_land.xml      |   11 +-
 .../default/xui/it/floater_day_cycle_options.xml   |   30 +-
 .../skins/default/xui/it/floater_env_settings.xml  |   14 +-
 .../skins/default/xui/it/floater_gesture.xml       |   11 +-
 .../default/xui/it/floater_hardware_settings.xml   |    6 +-
 .../skins/default/xui/it/floater_image_preview.xml |    5 +-
 .../skins/default/xui/it/floater_inspect.xml       |   10 +-
 .../xui/it/floater_inventory_item_properties.xml   |    8 +-
 .../xui/it/floater_inventory_view_finder.xml       |    2 +-
 .../skins/default/xui/it/floater_joystick.xml      |   49 +-
 .../skins/default/xui/it/floater_lagmeter.xml      |   17 +-
 .../skins/default/xui/it/floater_land_holdings.xml |   10 +-
 .../default/xui/it/floater_live_lsleditor.xml      |    4 +-
 .../skins/default/xui/it/floater_lsl_guide.xml     |    4 +-
 .../skins/default/xui/it/floater_media_browser.xml |    9 +-
 .../skins/default/xui/it/floater_mute_object.xml   |    6 +-
 indra/newview/skins/default/xui/it/floater_pay.xml |   21 +-
 .../skins/default/xui/it/floater_pay_object.xml    |   23 +-
 .../skins/default/xui/it/floater_postcard.xml      |    8 +-
 .../skins/default/xui/it/floater_preferences.xml   |    3 +-
 .../default/xui/it/floater_preview_animation.xml   |    4 +-
 .../default/xui/it/floater_preview_gesture.xml     |    9 +-
 .../skins/default/xui/it/floater_report_abuse.xml  |    5 +-
 .../skins/default/xui/it/floater_script_search.xml |   16 +-
 .../default/xui/it/floater_settings_debug.xml      |    2 +-
 .../skins/default/xui/it/floater_snapshot.xml      |   24 +-
 .../skins/default/xui/it/floater_telehub.xml       |   18 +-
 .../newview/skins/default/xui/it/floater_tools.xml |  102 +-
 .../skins/default/xui/it/floater_top_objects.xml   |   31 +-
 indra/newview/skins/default/xui/it/floater_tos.xml |    2 +-
 .../skins/default/xui/it/floater_url_entry.xml     |    4 +-
 .../newview/skins/default/xui/it/floater_water.xml |   44 +-
 .../default/xui/it/floater_windlight_options.xml   |   32 +-
 indra/newview/skins/default/xui/it/menu_viewer.xml |    4 +-
 .../newview/skins/default/xui/it/notifications.xml |  138 +-
 .../newview/skins/default/xui/it/panel_friends.xml |    2 +-
 .../skins/default/xui/it/panel_group_general.xml   |    2 +-
 .../skins/default/xui/it/panel_group_invite.xml    |    4 +-
 .../default/xui/it/panel_group_land_money.xml      |   23 +-
 .../skins/default/xui/it/panel_group_notices.xml   |   31 +-
 .../skins/default/xui/it/panel_group_roles.xml     |   44 +-
 .../newview/skins/default/xui/it/panel_groups.xml  |   10 +-
 .../default/xui/it/panel_preferences_chat.xml      |    2 +-
 .../default/xui/it/panel_preferences_graphics1.xml |   30 +-
 .../skins/default/xui/it/panel_region_covenant.xml |   30 +-
 .../skins/default/xui/it/panel_region_debug.xml    |   12 +-
 .../skins/default/xui/it/panel_region_estate.xml   |   16 +-
 .../skins/default/xui/it/panel_region_general.xml  |   22 +-
 .../skins/default/xui/it/panel_region_terrain.xml  |    8 +-
 .../skins/default/xui/it/panel_region_texture.xml  |    6 +-
 indra/newview/skins/default/xui/it/strings.xml     |    2 +-
 .../skins/default/xui/it/teleport_strings.xml      |   18 +-
 .../newview/skins/default/xui/ja/floater_about.xml |    4 +-
 .../skins/default/xui/ja/floater_buy_contents.xml  |   13 +-
 .../skins/default/xui/ja/floater_buy_land.xml      |    1 +
 .../newview/skins/default/xui/ja/floater_tools.xml |    2 +-
 .../default/xui/ja/floater_wearable_save_as.xml    |    2 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml |    4 +-
 .../newview/skins/default/xui/ja/notifications.xml |    8 +-
 .../default/xui/ja/panel_group_land_money.xml      |    3 +-
 indra/newview/skins/default/xui/ja/panel_login.xml |    2 +-
 .../newview/skins/default/xui/nl/floater_about.xml |    4 +-
 .../skins/default/xui/nl/floater_about_land.xml    |   12 +-
 .../skins/default/xui/nl/floater_buy_contents.xml  |    2 +-
 .../skins/default/xui/nl/floater_buy_land.xml      |    3 +-
 .../skins/default/xui/nl/floater_color_picker.xml  |    5 +-
 .../skins/default/xui/nl/floater_customize.xml     |   24 +-
 .../skins/default/xui/nl/floater_env_settings.xml  |    7 +-
 .../skins/default/xui/nl/floater_inspect.xml       |    8 +-
 .../skins/default/xui/nl/floater_joystick.xml      |   11 +-
 .../skins/default/xui/nl/floater_mute_object.xml   |    8 +-
 .../skins/default/xui/nl/floater_openobject.xml    |    4 +-
 indra/newview/skins/default/xui/nl/floater_pay.xml |    4 +-
 .../skins/default/xui/nl/floater_pay_object.xml    |   12 +-
 .../skins/default/xui/nl/floater_perm_prefs.xml    |    2 +-
 .../skins/default/xui/nl/floater_report_abuse.xml  |   14 +-
 .../skins/default/xui/nl/floater_select_key.xml    |    4 +-
 .../skins/default/xui/nl/floater_snapshot.xml      |   10 +-
 .../skins/default/xui/nl/floater_telehub.xml       |   16 +-
 .../skins/default/xui/nl/floater_texture_ctrl.xml  |    6 +-
 .../newview/skins/default/xui/nl/floater_tools.xml |   86 +-
 .../skins/default/xui/nl/floater_top_objects.xml   |   26 +-
 indra/newview/skins/default/xui/nl/floater_tos.xml |    3 +-
 .../skins/default/xui/nl/floater_url_entry.xml     |    4 +-
 .../newview/skins/default/xui/nl/floater_water.xml |    5 +-
 indra/newview/skins/default/xui/nl/menu_viewer.xml |    4 +-
 .../newview/skins/default/xui/nl/notifications.xml |   30 +-
 .../newview/skins/default/xui/nl/panel_friends.xml |   12 +-
 .../skins/default/xui/nl/panel_group_general.xml   |   19 +-
 .../skins/default/xui/nl/panel_group_invite.xml    |    9 +-
 .../skins/default/xui/nl/panel_group_notices.xml   |   24 +-
 .../skins/default/xui/nl/panel_group_roles.xml     |   34 +-
 .../newview/skins/default/xui/nl/panel_groups.xml  |   14 +-
 indra/newview/skins/default/xui/nl/panel_login.xml |    2 +-
 .../skins/default/xui/nl/panel_region_estate.xml   |   16 +-
 .../skins/default/xui/nl/panel_region_general.xml  |    4 +-
 .../newview/skins/default/xui/pl/floater_about.xml |    7 +-
 .../skins/default/xui/pl/floater_joystick.xml      |   89 +-
 .../skins/default/xui/pl/floater_preview_sound.xml |    2 +-
 .../skins/default/xui/pl/floater_report_abuse.xml  |    2 +-
 .../skins/default/xui/pl/floater_telehub.xml       |    4 +-
 .../newview/skins/default/xui/pl/floater_tools.xml |   30 +-
 indra/newview/skins/default/xui/pl/floater_tos.xml |    2 +-
 indra/newview/skins/default/xui/pl/menu_viewer.xml |    4 +-
 .../newview/skins/default/xui/pl/notifications.xml |    2 +-
 .../newview/skins/default/xui/pt/floater_about.xml |    4 +-
 .../skins/default/xui/pt/floater_about_land.xml    |    6 +-
 .../default/xui/pt/floater_animation_preview.xml   |   25 +-
 .../skins/default/xui/pt/floater_avatar_picker.xml |   12 +-
 .../skins/default/xui/pt/floater_build_options.xml |    6 +-
 .../skins/default/xui/pt/floater_buy_contents.xml  |    6 +-
 .../skins/default/xui/pt/floater_buy_land.xml      |   19 +-
 .../skins/default/xui/pt/floater_color_picker.xml  |    6 +-
 .../default/xui/pt/floater_day_cycle_options.xml   |   28 +-
 .../skins/default/xui/pt/floater_env_settings.xml  |   12 +-
 .../skins/default/xui/pt/floater_image_preview.xml |    5 +-
 .../skins/default/xui/pt/floater_inspect.xml       |   10 +-
 .../xui/pt/floater_inventory_item_properties.xml   |    2 +-
 .../xui/pt/floater_inventory_view_finder.xml       |    6 +-
 .../skins/default/xui/pt/floater_joystick.xml      |   41 +-
 .../skins/default/xui/pt/floater_lagmeter.xml      |   13 +-
 .../skins/default/xui/pt/floater_land_holdings.xml |   10 +-
 .../default/xui/pt/floater_live_lsleditor.xml      |    2 +-
 .../skins/default/xui/pt/floater_lsl_guide.xml     |    4 +-
 .../skins/default/xui/pt/floater_mute_object.xml   |    5 +-
 indra/newview/skins/default/xui/pt/floater_pay.xml |    2 +-
 .../skins/default/xui/pt/floater_postcard.xml      |    2 +-
 .../skins/default/xui/pt/floater_preferences.xml   |    3 +-
 .../default/xui/pt/floater_preview_gesture.xml     |   24 +-
 .../skins/default/xui/pt/floater_preview_sound.xml |    4 +-
 .../skins/default/xui/pt/floater_report_abuse.xml  |    4 +-
 .../skins/default/xui/pt/floater_script_search.xml |   16 +-
 .../skins/default/xui/pt/floater_snapshot.xml      |   12 +-
 .../skins/default/xui/pt/floater_telehub.xml       |   18 +-
 .../newview/skins/default/xui/pt/floater_tools.xml |   61 +-
 .../skins/default/xui/pt/floater_top_objects.xml   |   13 +-
 indra/newview/skins/default/xui/pt/floater_tos.xml |    3 +-
 .../skins/default/xui/pt/floater_url_entry.xml     |    1 +
 .../newview/skins/default/xui/pt/floater_water.xml |   23 +-
 .../default/xui/pt/floater_windlight_options.xml   |   23 +-
 indra/newview/skins/default/xui/pt/menu_viewer.xml |   12 +-
 .../newview/skins/default/xui/pt/notifications.xml |   20 +-
 .../newview/skins/default/xui/pt/panel_friends.xml |   12 +-
 .../skins/default/xui/pt/panel_group_general.xml   |    6 +-
 .../skins/default/xui/pt/panel_group_invite.xml    |   10 +-
 .../default/xui/pt/panel_group_land_money.xml      |   11 +-
 .../skins/default/xui/pt/panel_group_notices.xml   |   21 +-
 .../skins/default/xui/pt/panel_group_roles.xml     |   45 +-
 .../newview/skins/default/xui/pt/panel_groups.xml  |   17 +-
 indra/newview/skins/default/xui/pt/panel_login.xml |    6 +-
 .../default/xui/pt/panel_preferences_chat.xml      |    2 +-
 .../default/xui/pt/panel_preferences_graphics1.xml |   20 +-
 .../skins/default/xui/pt/panel_region_covenant.xml |   20 +-
 .../skins/default/xui/pt/panel_region_debug.xml    |   10 +-
 .../skins/default/xui/pt/panel_region_estate.xml   |    4 +-
 .../skins/default/xui/pt/panel_region_terrain.xml  |   10 +-
 .../skins/default/xui/pt/panel_region_texture.xml  |    2 +-
 indra/newview/tr.lproj/language.txt                |    1 +
 indra/newview/uk.lproj/language.txt                |    1 +
 indra/newview/viewer_manifest.py                   |   12 +
 indra/newview/zh-Hans.lproj/language.txt           |    1 +
 335 files changed, 4675 insertions(+), 4554 deletions(-)
 create mode 100644 indra/newview/da.lproj/language.txt
 create mode 100644 indra/newview/es.lproj/language.txt
 create mode 100644 indra/newview/fr.lproj/language.txt
 create mode 100644 indra/newview/hu.lproj/language.txt
 create mode 100644 indra/newview/it.lproj/language.txt
 create mode 100644 indra/newview/nl.lproj/language.txt
 create mode 100644 indra/newview/pl.lproj/language.txt
 create mode 100644 indra/newview/pt.lproj/language.txt
 create mode 100644 indra/newview/ru.lproj/language.txt
 create mode 100644 indra/newview/skins/default/xui/da/floater_bulk_perms.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_font_test.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_perm_prefs.xml
 create mode 100644 indra/newview/skins/default/xui/da/floater_statistics.xml
 create mode 100644 indra/newview/skins/default/xui/da/menu_mini_map.xml
 create mode 100644 indra/newview/tr.lproj/language.txt
 create mode 100644 indra/newview/uk.lproj/language.txt
 create mode 100644 indra/newview/zh-Hans.lproj/language.txt

(limited to 'indra')

diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index a28d0f7268..7e623d47d6 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 24;
-const S32 LL_VERSION_PATCH = 2;
+const S32 LL_VERSION_PATCH = 4;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 2fd37e848e..d83d9d18bf 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -208,7 +208,10 @@ void LLCrashLogger::gatherFiles()
 		mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml");
 	}
 
+#if !LL_DARWIN
 	if(mCrashInPreviousExec)
+#else
+#endif
 	{
 		// Replace the log file ext with .old, since the 
 		// instance that launched this process has overwritten
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index cdf626e16f..d1efb119c6 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -54,8 +54,8 @@ LLGLuint LLImageGL::sCurrentBoundTextures[MAX_GL_TEXTURE_UNITS] = { 0 };
 
 U32 LLImageGL::sUniqueCount				= 0;
 U32 LLImageGL::sBindCount				= 0;
-S32 LLImageGL::sGlobalTextureMemory		= 0;
-S32 LLImageGL::sBoundTextureMemory		= 0;
+S32 LLImageGL::sGlobalTextureMemoryInBytes		= 0;
+S32 LLImageGL::sBoundTextureMemoryInBytes		= 0;
 S32 LLImageGL::sCurBoundTextureMemory	= 0;
 S32 LLImageGL::sCount					= 0;
 
@@ -174,7 +174,7 @@ S32 LLImageGL::dataFormatComponents(S32 dataformat)
 void LLImageGL::updateStats(F32 current_time)
 {
 	sLastFrameTime = current_time;
-	sBoundTextureMemory = sCurBoundTextureMemory;
+	sBoundTextureMemoryInBytes = sCurBoundTextureMemory;
 	sCurBoundTextureMemory = 0;
 }
 
@@ -1013,13 +1013,13 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const U8* data_in, BOOL data_
 
 	if (old_name != 0)
 	{
-		sGlobalTextureMemory -= mTextureMemory;
+		sGlobalTextureMemoryInBytes -= mTextureMemory;
 		LLImageGL::deleteTextures(1, &old_name);
 		stop_glerror();
 	}
 
 	mTextureMemory = getMipBytes(discard_level);
-	sGlobalTextureMemory += mTextureMemory;
+	sGlobalTextureMemoryInBytes += mTextureMemory;
 	setActive() ;
 
 	// mark this as bound at this point, so we don't throw it out immediately
@@ -1220,7 +1220,7 @@ void LLImageGL::destroyGLTexture()
 			}
 		}
 
-		sGlobalTextureMemory -= mTextureMemory;
+		sGlobalTextureMemoryInBytes -= mTextureMemory;
 		mTextureMemory = 0;
 
 		LLImageGL::deleteTextures(1, &mTexName);
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h
index 4f737bcaae..2f08a5a2cc 100644
--- a/indra/llrender/llimagegl.h
+++ b/indra/llrender/llimagegl.h
@@ -42,6 +42,9 @@
 
 #include "llrender.h"
 
+#define BYTES_TO_MEGA_BYTES(x) ((x) >> 20)
+#define MEGA_BYTES_TO_BYTES(x) ((x) << 20)
+
 //============================================================================
 
 class LLImageGL : public LLRefCount
@@ -238,8 +241,8 @@ public:
 	static LLGLuint sCurrentBoundTextures[MAX_GL_TEXTURE_UNITS]; // Currently bound texture ID
 
 	// Global memory statistics
-	static S32 sGlobalTextureMemory;		// Tracks main memory texmem
-	static S32 sBoundTextureMemory;			// Tracks bound texmem for last completed frame
+	static S32 sGlobalTextureMemoryInBytes;		// Tracks main memory texmem
+	static S32 sBoundTextureMemoryInBytes;	// Tracks bound texmem for last completed frame
 	static S32 sCurBoundTextureMemory;		// Tracks bound texmem for current frame
 	static U32 sBindCount;					// Tracks number of texture binds for current frame
 	static U32 sUniqueCount;				// Tracks number of unique texture binds for current frame
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 8ec681fcaf..31788da117 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -743,23 +743,20 @@ BOOL LLView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_s
 
 	// don't allow any siblings to handle this event
 	// even if we don't have a tooltip
-	if (getMouseOpaque() || show_names_text_box)
+	if (blockMouseEvent(x, y) || show_names_text_box)
 	{
-		handled = TRUE;
-	}
-
-	if(!tool_tip.empty())
-	{
-		msg = tool_tip;
+		if(!tool_tip.empty())
+		{
+			msg = tool_tip;
 
-		// Convert rect local to screen coordinates
-		localPointToScreen(
-			0, 0,
-			&(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
-		localPointToScreen(
-			mRect.getWidth(), mRect.getHeight(),
-			&(sticky_rect_screen->mRight), &(sticky_rect_screen->mTop) );
-		
+			// Convert rect local to screen coordinates
+			localPointToScreen(
+				0, 0,
+				&(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
+			localPointToScreen(
+				mRect.getWidth(), mRect.getHeight(),
+				&(sticky_rect_screen->mRight), &(sticky_rect_screen->mTop) );		
+		}
 		handled = TRUE;
 	}
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7ae92129dc..5ebf14d093 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4804,7 +4804,7 @@
     <key>IMInChatConsole</key>
     <map>
       <key>Comment</key>
-      <string>Copy IM into background chat console</string>
+      <string>Copy IM into chat console</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -4812,6 +4812,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>IMInChatHistory</key>
+    <map>
+      <key>Comment</key>
+      <string>Copy IM into chat history</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>IMShowTimestamps</key>
     <map>
       <key>Comment</key>
@@ -8777,7 +8788,7 @@
       <key>Comment</key>
       <string>Display XUI Names as Tooltips</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
diff --git a/indra/newview/da.lproj/language.txt b/indra/newview/da.lproj/language.txt
new file mode 100644
index 0000000000..316d25d903
--- /dev/null
+++ b/indra/newview/da.lproj/language.txt
@@ -0,0 +1 @@
+da
\ No newline at end of file
diff --git a/indra/newview/es.lproj/language.txt b/indra/newview/es.lproj/language.txt
new file mode 100644
index 0000000000..6c4381495c
--- /dev/null
+++ b/indra/newview/es.lproj/language.txt
@@ -0,0 +1 @@
+es
\ No newline at end of file
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 05bdf64b42..d557df3d92 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 19
+version 20
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -245,6 +245,7 @@ RenderVBOEnable				1	0
 list Intel
 RenderAnisotropic			1	0
 RenderLightingDetail		1	0
+RenderUseImpostors			0	0
 
 list GeForce2
 RenderAnisotropic			1	0
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 09105b8d88..57d712ede7 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -1,4 +1,4 @@
-version 19
+version 20
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index fd2496d8ad..15974c0691 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 19
+version 20
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
diff --git a/indra/newview/fr.lproj/language.txt b/indra/newview/fr.lproj/language.txt
new file mode 100644
index 0000000000..717280ac26
--- /dev/null
+++ b/indra/newview/fr.lproj/language.txt
@@ -0,0 +1 @@
+fr
\ No newline at end of file
diff --git a/indra/newview/hu.lproj/language.txt b/indra/newview/hu.lproj/language.txt
new file mode 100644
index 0000000000..6c604cf2a9
--- /dev/null
+++ b/indra/newview/hu.lproj/language.txt
@@ -0,0 +1 @@
+hu
\ No newline at end of file
diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi
index d23615de91..008c240ed7 100644
Binary files a/indra/newview/installers/windows/lang_fr.nsi and b/indra/newview/installers/windows/lang_fr.nsi differ
diff --git a/indra/newview/it.lproj/language.txt b/indra/newview/it.lproj/language.txt
new file mode 100644
index 0000000000..c91971434c
--- /dev/null
+++ b/indra/newview/it.lproj/language.txt
@@ -0,0 +1 @@
+it
\ No newline at end of file
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index e188abe5d2..dfe19c1232 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -94,9 +94,7 @@ cd "${RUN_PATH}"
 ./register_secondlifeprotocol.sh
 ## Before we mess with LD_LIBRARY_PATH, save the old one to restore for
 ##  subprocesses that care.
-if [ "${LD_LIBRARY_PATH+isset}" = "isset" ]; then
-    export SAVED_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
-fi
+export SAVED_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
 
 if [ -n "$LL_TCMALLOC" ]; then
     tcmalloc_libs='/usr/lib/libtcmalloc.so.0 /usr/lib/libstacktrace.so.0 /lib/libpthread.so.0'
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 07503404dc..cc443d05c0 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1319,14 +1319,19 @@ LLQuaternion LLAgent::getQuat() const
 //-----------------------------------------------------------------------------
 LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, LLVector3 original_focus_point, S32 x, S32 y)
 {
-	// calculate offset based on view direction
-	BOOL is_avatar = object->isAvatar();
-	// since the animation system allows the avatars facing and position to deviate from its nominal LLViewerObject/LLDrawable transform
-	// calculate the focus-specific orientation for avatars based off the pelvis joint
-	// NOTE: pelvis no longer good candidate, removed.  DEV-30589
 	LLMatrix4 obj_matrix = object->getRenderMatrix();
 	LLQuaternion obj_rot = object->getRenderRotation();
 	LLVector3 obj_pos = object->getRenderPosition();
+
+	BOOL is_avatar = object->isAvatar();
+	// if is avatar - don't do any funk heuristics to position the focal point
+	// see DEV-30589
+	if (is_avatar)
+	{
+		return original_focus_point - obj_pos;
+	}
+
+	
 	LLQuaternion inv_obj_rot = ~obj_rot; // get inverse of rotation
 	LLVector3 object_extents = object->getScale();
 	// make sure they object extents are non-zero
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index b66b514597..584ab5e50f 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2053,7 +2053,7 @@ bool LLAppViewer::initConfiguration()
 void LLAppViewer::checkForCrash(void)
 {
     
-#if 1 //*REMOVE:Mani LL_SEND_CRASH_REPORTS
+#if LL_SEND_CRASH_REPORTS
 	//*NOTE:Mani The current state of the crash handler has the MacOSX
 	// sending all crash reports as freezes, in order to let 
 	// the MacOSX CrashRepoter generate stacks before spawning the 
@@ -2063,23 +2063,36 @@ void LLAppViewer::checkForCrash(void)
 #if LL_DARWIN
 	if(gLastExecEvent != LAST_EXEC_NORMAL)
 #else		
-	if (gLastExecEvent == LAST_EXEC_FROZE || gLastExecEvent == LAST_EXEC_OTHER_CRASH)
+	if (gLastExecEvent == LAST_EXEC_FROZE)
 #endif
     {
         llinfos << "Last execution froze, requesting to send crash report." << llendl;
         //
         // Pop up a freeze or crash warning dialog
         //
-        std::ostringstream msg;
-        msg << gSecondLife
-        << " appears to have frozen or crashed on the previous run.\n"
-        << "Would you like to send a crash report?";
-        std::string alert;
-        alert = gSecondLife;
-        alert += " Alert";
-        S32 choice = OSMessageBox(msg.str(),
+        S32 choice;
+        if(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) == CRASH_BEHAVIOR_ASK)
+        {
+            std::ostringstream msg;
+            msg << gSecondLife
+            << " appears to have frozen or crashed on the previous run.\n"
+            << "Would you like to send a crash report?";
+            std::string alert;
+            alert = gSecondLife;
+            alert += " Alert";
+            choice = OSMessageBox(msg.str(),
                                   alert,
                                   OSMB_YESNO);
+        } 
+        else if(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) == CRASH_BEHAVIOR_NEVER_SEND)
+        {
+            choice = OSBTN_NO;
+        }
+        else
+        {
+            choice = OSBTN_YES;
+        }
+
         if (OSBTN_YES == choice)
         {
             llinfos << "Sending crash report." << llendl;
@@ -2353,6 +2366,8 @@ void LLAppViewer::handleViewerCrash()
 	gDebugInfo["SessionLength"] = F32(LLFrameTimer::getElapsedSeconds());
 	gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
 	gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer) getCurrentRSS() >> 10;
+	gDebugInfo["FirstLogin"] = (LLSD::Boolean) gAgent.isFirstLogin();
+	gDebugInfo["FirstRunThisInstall"] = gSavedSettings.getBOOL("FirstRunThisInstall");
 
 	if(gLogoutInProgress)
 	{
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index 7c2e341bed..080bd2edc0 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -135,31 +135,6 @@ bool LLAppViewerMacOSX::init()
 	return LLAppViewer::init();
 }
 
-bool LLAppViewerMacOSX::initLogging()
-{
-	// Remove the crash stack log from previous executions.
-	// Since we've started logging a new instance of the app, we can assume 
-	// The old crash stack is invalid for the next crash report.
-	char path[MAX_PATH];		
-	FSRef folder;
-	if(FSFindFolder(kUserDomain, kLogsFolderType, false, &folder) == noErr)
-	{
-		// folder is an FSRef to ~/Library/Logs/
-		if(FSRefMakePath(&folder, (UInt8*)&path, sizeof(path)) == noErr)
-		{
-			std::string pathname = std::string(path) + std::string("/CrashReporter/");
-			std::string mask = "Second Life*";
-			std::string file_name;
-			while(gDirUtilp->getNextFileInDir(pathname, mask, file_name, false))
-			{
-				LLFile::remove(pathname + file_name);
-			}
-		}
-	}
-
-	return LLAppViewer::initLogging();
-}
-
 // MacOSX may add and addition command line arguement for the process serial number.
 // The option takes a form like '-psn_0_12345'. The following method should be able to recognize
 // and either ignore or return a pair of values for the option.
@@ -416,6 +391,28 @@ void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze)
 	{
 		_exit(1);
 	}
+	
+	// TODO:palmer REMOVE THIS VERY SOON.  THIS WILL NOT BE IN VIEWER 2.0
+	// Remove the crash stack log from previous executions.
+	// Since we've started logging a new instance of the app, we can assume 
+	// The old crash stack is invalid for the next crash report.
+	char path[MAX_PATH];		
+	FSRef folder;
+	if(FSFindFolder(kUserDomain, kLogsFolderType, false, &folder) == noErr)
+	{
+		// folder is an FSRef to ~/Library/Logs/
+		if(FSRefMakePath(&folder, (UInt8*)&path, sizeof(path)) == noErr)
+		{
+			std::string pathname = std::string(path) + std::string("/CrashReporter/");
+			std::string mask = "Second Life*";
+			std::string file_name;
+			while(gDirUtilp->getNextFileInDir(pathname, mask, file_name, false))
+			{
+				LLFile::remove(pathname + file_name);
+			}
+		}
+	}
+	
 }
 
 std::string LLAppViewerMacOSX::generateSerialNumber()
diff --git a/indra/newview/llappviewermacosx.h b/indra/newview/llappviewermacosx.h
index 0928916a57..bc841fc3a7 100644
--- a/indra/newview/llappviewermacosx.h
+++ b/indra/newview/llappviewermacosx.h
@@ -55,7 +55,6 @@ protected:
 	virtual void handleSyncCrashTrace();
 
 	std::string generateSerialNumber();
-	virtual bool initLogging();
 	virtual bool initParseCommandLine(LLCommandLineParser& clp);
 };
 
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 16928923bf..7a8d486b72 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -159,9 +159,31 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
                      int       nCmdShow)
 {
 	LLMemType mt1(LLMemType::MTYPE_STARTUP);
+
+	const S32 MAX_HEAPS = 255;
+	DWORD heap_enable_lfh_error[MAX_HEAPS];
+	S32 num_heaps = 0;
 	
 #if WINDOWS_CRT_MEM_CHECKS && !INCLUDE_VLD
 	_CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); // dump memory leaks on exit
+#elif 1
+	// Experimental - enable the low fragmentation heap
+	// This results in a 2-3x improvement in opening a new Inventory window (which uses a large numebr of allocations)
+	// Note: This won't work when running from the debugger unless the _NO_DEBUG_HEAP environment variable is set to 1
+
+	_CrtSetDbgFlag(0); // default, just making explicit
+	
+	ULONG ulEnableLFH = 2;
+	HANDLE* hHeaps = new HANDLE[MAX_HEAPS];
+	num_heaps = GetProcessHeaps(MAX_HEAPS, hHeaps);
+	for(S32 i = 0; i < num_heaps; i++)
+	{
+		bool success = HeapSetInformation(hHeaps[i], HeapCompatibilityInformation, &ulEnableLFH, sizeof(ulEnableLFH));
+		if (success)
+			heap_enable_lfh_error[i] = 0;
+		else
+			heap_enable_lfh_error[i] = GetLastError();
+	}
 #endif
 	
 	// *FIX: global
@@ -183,8 +205,21 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
 		llwarns << "Application init failed." << llendl;
 		return -1;
 	}
-
-		// Run the application main loop
+	
+	// Have to wait until after logging is initialized to display LFH info
+	if (num_heaps > 0)
+	{
+		llinfos << "Attempted to enable LFH for " << num_heaps << " heaps." << llendl;
+		for(S32 i = 0; i < num_heaps; i++)
+		{
+			if (heap_enable_lfh_error[i])
+			{
+				llinfos << "  Failed to enable LFH for heap: " << i << " Error: " << heap_enable_lfh_error[i] << llendl;
+			}
+		}
+	}
+	
+	// Run the application main loop
 	if(!LLApp::isQuitting()) 
 	{
 		viewer_app_ptr->mainLoop();
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 9f4afc9f17..cb368974ae 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -673,7 +673,7 @@ BOOL LLDrawable::updateMoveDamped()
 	return done_moving;
 }
 
-void LLDrawable::updateDistance(LLCamera& camera)
+void LLDrawable::updateDistance(LLCamera& camera, bool force_update)
 {
 	//switch LOD with the spatial group to avoid artifacts
 	//LLSpatialGroup* sg = getSpatialGroup();
@@ -695,7 +695,7 @@ void LLDrawable::updateDistance(LLCamera& camera)
 			for (S32 i = 0; i < getNumFaces(); i++)
 			{
 				LLFace* facep = getFace(i);
-				if (facep->getPoolType() == LLDrawPool::POOL_ALPHA)
+				if (force_update || facep->getPoolType() == LLDrawPool::POOL_ALPHA)
 				{
 					LLVector3 box = (facep->mExtents[1] - facep->mExtents[0]) * 0.25f;
 					LLVector3 v = (facep->mCenterLocal-camera.getOrigin());
@@ -736,11 +736,7 @@ void LLDrawable::updateTexture()
 
 	if (getVOVolume())
 	{
-		if (!isActive())
-		{
-			//gPipeline.markMoved(this);
-		}
-		else
+		if (isActive())
 		{
 			if (isRoot())
 			{
@@ -1273,7 +1269,7 @@ void LLSpatialBridge::setVisible(LLCamera& camera_in, std::vector<LLDrawable*>*
 	}
 }
 
-void LLSpatialBridge::updateDistance(LLCamera& camera_in)
+void LLSpatialBridge::updateDistance(LLCamera& camera_in, bool force_update)
 {
 	if (mDrawable == NULL)
 	{
@@ -1283,7 +1279,7 @@ void LLSpatialBridge::updateDistance(LLCamera& camera_in)
 
 	LLCamera camera = transformCamera(camera_in);
 	
-	mDrawable->updateDistance(camera);
+	mDrawable->updateDistance(camera, force_update);
 	
 	if (mDrawable->getVObj())
 	{
@@ -1300,7 +1296,7 @@ void LLSpatialBridge::updateDistance(LLCamera& camera_in)
 
 			if (!drawable->isAvatar())
 			{
-				drawable->updateDistance(camera);
+				drawable->updateDistance(camera, force_update);
 			}
 		}
 	}
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h
index f5a66a3a78..6e0b6e81d6 100644
--- a/indra/newview/lldrawable.h
+++ b/indra/newview/lldrawable.h
@@ -151,7 +151,7 @@ public:
 	
 	void updateTexture();
 	void updateMaterial();
-	virtual void updateDistance(LLCamera& camera);
+	virtual void updateDistance(LLCamera& camera, bool force_update);
 	BOOL updateGeometry(BOOL priority);
 	void updateFaceSize(S32 idx);
 		
diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp
index 7f21adcc94..f0ed38057b 100644
--- a/indra/newview/lldrawpoolsky.cpp
+++ b/indra/newview/lldrawpoolsky.cpp
@@ -61,8 +61,8 @@ LLDrawPool *LLDrawPoolSky::instancePool()
 
 void LLDrawPoolSky::prerender()
 {
-	mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_ENVIRONMENT);
-//	gSky.mVOSkyp->updateGeometry(gSky.mVOSkyp->mDrawable);
+	mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_ENVIRONMENT); 
+	gSky.mVOSkyp->updateGeometry(gSky.mVOSkyp->mDrawable);
 }
 
 void LLDrawPoolSky::render(S32 pass)
@@ -97,7 +97,6 @@ void LLDrawPoolSky::render(S32 pass)
 	}
 	
 
-	LLVOSky *voskyp = gSky.mVOSkyp;
 	LLGLSPipelineSkyBox gls_skybox;
 
 	LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
@@ -120,43 +119,9 @@ void LLDrawPoolSky::render(S32 pass)
 	{
 		renderSkyCubeFace(i);
 	}
-	
-	LLFace *hbfaces[3];
-	hbfaces[0] = NULL;
-	hbfaces[1] = NULL;
-	hbfaces[2] = NULL;
-	for (S32 curr_face = 0; curr_face < face_count; curr_face++)
-	{
-		LLFace* facep = mDrawFace[curr_face];
-		if (voskyp->isSameFace(LLVOSky::FACE_SUN, facep))
-		{
-			hbfaces[0] = facep;
-		}
-		if (voskyp->isSameFace(LLVOSky::FACE_MOON, facep))
-		{
-			hbfaces[1] = facep;
-		}
-		if (voskyp->isSameFace(LLVOSky::FACE_BLOOM, facep))
-		{
-			hbfaces[2] = facep;
-		}
-	}
 
 	LLGLEnable blend(GL_BLEND);
 
-	if (hbfaces[2])
-	{
-		// renderSunHalo(hbfaces[2]);
-	}
-	if (hbfaces[0])
-	{
-		// renderHeavenlyBody(0, hbfaces[0]);
-	}
-	if (hbfaces[1])
-	{
-		// renderHeavenlyBody(1, hbfaces[1]);
-	}
-
 	glPopMatrix();
 }
 
@@ -181,35 +146,6 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side)
 	}
 }
 
-void LLDrawPoolSky::renderHeavenlyBody(U8 hb, LLFace* face)
-{
-	if ( !mHB[hb]->getDraw() ) return;
-	if (! face->getGeomCount()) return;
-
-	LLImageGL* tex = face->getTexture();
-	gGL.getTexUnit(0)->bind(tex);
-	LLColor4 color(mHB[hb]->getInterpColor());
-	LLOverrideFaceColor override(this, color);
-	face->renderIndexed();
-}
-
-
-
-void LLDrawPoolSky::renderSunHalo(LLFace* face)
-{
-	if (! mHB[0]->getDraw()) return;
-	if (! face->getGeomCount()) return;
-
-	LLImageGL* tex = face->getTexture();
-	gGL.getTexUnit(0)->bind(tex);
-	LLColor4 color(mHB[0]->getInterpColor());
-	color.mV[3] = llclamp(mHB[0]->getHaloBrighness(), 0.f, 1.f);
-
-	LLOverrideFaceColor override(this, color);
-	face->renderIndexed();
-}
-
-
 void LLDrawPoolSky::renderForSelect()
 {
 }
diff --git a/indra/newview/lldrawpoolsky.h b/indra/newview/lldrawpoolsky.h
index f35b114730..8595d73aee 100644
--- a/indra/newview/lldrawpoolsky.h
+++ b/indra/newview/lldrawpoolsky.h
@@ -36,14 +36,12 @@
 #include "lldrawpool.h"
 
 class LLSkyTex;
-class LLHeavenBody;
 class LLGLSLShader;
 
 class LLDrawPoolSky : public LLFacePool
 {
 private:
 	LLSkyTex			*mSkyTex;
-	LLHeavenBody		*mHB[2]; // Sun and Moon
 	LLGLSLShader		*mShader;
 
 public:
@@ -69,8 +67,6 @@ public:
 	/*virtual*/ void renderForSelect();
 	/*virtual*/ void endRenderPass(S32 pass);
 	void setSkyTex(LLSkyTex* const st) { mSkyTex = st; }
-	void setSun(LLHeavenBody* sun_flag) { mHB[0] = sun_flag; }
-	void setMoon(LLHeavenBody* moon) { mHB[1] = moon; }
 
 	void renderSkyCubeFace(U8 side);
 	void renderHeavenlyBody(U8 hb, LLFace* face);
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 3dfe6a2820..69edccacf0 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1150,6 +1150,21 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 BOOL LLFace::verify(const U32* indices_array) const
 {
 	BOOL ok = TRUE;
+
+	if( mVertexBuffer.isNull() )
+	{
+		if( mGeomCount )
+		{
+			// This happens before teleports as faces are torn down.
+			// Stop the crash in DEV-31893 with a null pointer check,
+			// but present this info.
+			// To clean up the log, the geometry could be cleared, or the
+			// face could otherwise be marked for no ::verify.
+			llinfos << "Face with no vertex buffer and " << mGeomCount << " mGeomCount" << llendl;
+		}
+		return TRUE;
+	}
+	
 	// First, check whether the face data fits within the pool's range.
 	if ((mGeomIndex + mGeomCount) > mVertexBuffer->getNumVerts())
 	{
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index ea529d1883..0e9295f9f8 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -406,6 +406,9 @@ void LLFloaterChat::addChat(const LLChat& chat,
 
 	if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM"))
 		log_chat_text(chat);
+	
+	if(from_instant_message && gSavedSettings.getBOOL("IMInChatHistory")) 	 
+		addChatHistory(chat,false);
 
 	LLTextParser* highlight = LLTextParser::getInstance();
 	highlight->triggerAlerts(gAgent.getID(), gAgent.getPositionGlobal(), chat.mText, gViewerWindow->getWindow());
diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp
index d39824ee05..5ff4f735dd 100644
--- a/indra/newview/llfloaterimagepreview.cpp
+++ b/indra/newview/llfloaterimagepreview.cpp
@@ -214,13 +214,16 @@ void	LLFloaterImagePreview::onPreviewTypeCommit(LLUICtrl* ctrl, void* userdata)
 //-----------------------------------------------------------------------------
 void LLFloaterImagePreview::clearAllPreviewTextures()
 {
-	mAvatarPreview->clearPreviewTexture("mHairMesh0");
-	mAvatarPreview->clearPreviewTexture("mUpperBodyMesh0");
-	mAvatarPreview->clearPreviewTexture("mLowerBodyMesh0");
-	mAvatarPreview->clearPreviewTexture("mHeadMesh0");
-	mAvatarPreview->clearPreviewTexture("mUpperBodyMesh0");
-	mAvatarPreview->clearPreviewTexture("mLowerBodyMesh0");
-	mAvatarPreview->clearPreviewTexture("mSkirtMesh0");
+	if (mAvatarPreview)
+	{
+		mAvatarPreview->clearPreviewTexture("mHairMesh0");
+		mAvatarPreview->clearPreviewTexture("mUpperBodyMesh0");
+		mAvatarPreview->clearPreviewTexture("mLowerBodyMesh0");
+		mAvatarPreview->clearPreviewTexture("mHeadMesh0");
+		mAvatarPreview->clearPreviewTexture("mUpperBodyMesh0");
+		mAvatarPreview->clearPreviewTexture("mLowerBodyMesh0");
+		mAvatarPreview->clearPreviewTexture("mSkirtMesh0");
+	}
 }
 
 //-----------------------------------------------------------------------------
@@ -671,11 +674,14 @@ void LLImagePreviewAvatar::setPreviewTarget(const std::string& joint_name, const
 //-----------------------------------------------------------------------------
 void LLImagePreviewAvatar::clearPreviewTexture(const std::string& mesh_name)
 {
-	LLViewerJointMesh *mesh = (LLViewerJointMesh*)mDummyAvatar->mRoot.findJoint(mesh_name);
-	// clear out existing test mesh
-	if (mesh)
+	if (mDummyAvatar)
 	{
-		mesh->setTestTexture(0);
+		LLViewerJointMesh *mesh = (LLViewerJointMesh*)mDummyAvatar->mRoot.findJoint(mesh_name);
+		// clear out existing test mesh
+		if (mesh)
+		{
+			mesh->setTestTexture(0);
+		}
 	}
 }
 
@@ -796,27 +802,11 @@ LLImagePreviewSculpted::LLImagePreviewSculpted(S32 width, S32 height) : LLDynami
 	
 	F32 const HIGHEST_LOD = 4.0f;
 	mVolume = new LLVolume(volume_params,  HIGHEST_LOD);
-
-	/*
-	mDummyAvatar = new LLVOAvatar(LLUUID::null, LL_PCODE_LEGACY_AVATAR, gAgent.getRegion());
-	mDummyAvatar->createDrawable(&gPipeline);
-	mDummyAvatar->mIsDummy = TRUE;
-	mDummyAvatar->mSpecialRenderMode = 2;
-	mDummyAvatar->setPositionAgent(LLVector3::zero);
-	mDummyAvatar->slamPosition();
-	mDummyAvatar->updateJointLODs();
-	mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable);
-	gPipeline.markVisible(mDummyAvatar->mDrawable, *LLViewerCamera::getInstance());
-	mTextureName = 0;
-	*/
 }
 
 
 LLImagePreviewSculpted::~LLImagePreviewSculpted()
 {
-	/*
-	mDummyAvatar->markDead();
-	*/
 }
 
 
diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp
index 91471ca2d0..8fe455fde4 100644
--- a/indra/newview/llfloaterlagmeter.cpp
+++ b/indra/newview/llfloaterlagmeter.cpp
@@ -180,7 +180,7 @@ void LLFloaterLagMeter::determineClient()
 		{
 			mClientCause->setText( getString("client_texture_loading_cause_msg", mStringArgs) );
 		}
-		else if((LLViewerImage::sBoundTextureMemory >> 20) > LLViewerImage::sMaxBoundTextureMem)
+		else if((BYTES_TO_MEGA_BYTES(LLViewerImage::sBoundTextureMemoryInBytes)) > LLViewerImage::sMaxBoundTextureMemInMegaBytes)
 		{
 			mClientCause->setText( getString("client_texture_memory_cause_msg", mStringArgs) );
 		}
diff --git a/indra/newview/llsky.cpp b/indra/newview/llsky.cpp
index b779aa0f83..ac7e865de0 100644
--- a/indra/newview/llsky.cpp
+++ b/indra/newview/llsky.cpp
@@ -422,20 +422,6 @@ void LLSky::updateFog(const F32 distance)
 
 void LLSky::updateCull()
 {
-	/*if (mVOSkyp.notNull() && mVOSkyp->mDrawable.notNull())
-	{
-		gPipeline.markVisible(mVOSkyp->mDrawable);
-	}
-	else
-	{
-		llinfos << "No sky drawable!" << llendl;
-	}*/
-
-	/*if (mVOGroundp.notNull() && mVOGroundp->mDrawable.notNull())
-	{
-		gPipeline.markVisible(mVOGroundp->mDrawable);
-	}*/
-
 	// *TODO: do culling for wl sky properly -Brad
 }
 
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index 4d67b374c8..df96152dfe 100644
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -399,7 +399,7 @@ public:
 	virtual void updateSpatialExtents();
 	virtual void updateBinRadius();
 	virtual void setVisible(LLCamera& camera_in, std::vector<LLDrawable*>* results = NULL, BOOL for_select = FALSE);
-	virtual void updateDistance(LLCamera& camera_in);
+	virtual void updateDistance(LLCamera& camera_in, bool force_update);
 	virtual void makeActive();
 	virtual void move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL immediate = FALSE);
 	virtual BOOL updateMove();
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index b05da8c6d8..424c525870 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -115,7 +115,7 @@ LLTexLayerSetBuffer::~LLTexLayerSetBuffer()
 	if( mBumpTex.notNull())
 	{
 		mBumpTex = NULL ;
-		LLImageGL::sGlobalTextureMemory -= mWidth * mHeight * 4;
+		LLImageGL::sGlobalTextureMemoryInBytes -= mWidth * mHeight * 4;
 		LLTexLayerSetBuffer::sGLBumpByteCount -= mWidth * mHeight * 4;
 	}
 }
@@ -132,7 +132,7 @@ void LLTexLayerSetBuffer::destroyGLTexture()
 	if( mBumpTex.notNull() )
 	{
 		mBumpTex = NULL ;
-		LLImageGL::sGlobalTextureMemory -= mWidth * mHeight * 4;
+		LLImageGL::sGlobalTextureMemoryInBytes -= mWidth * mHeight * 4;
 		LLTexLayerSetBuffer::sGLBumpByteCount -= mWidth * mHeight * 4;
 	}
 
@@ -163,7 +163,7 @@ void LLTexLayerSetBuffer::createBumpTexture()
 
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
-		LLImageGL::sGlobalTextureMemory += mWidth * mHeight * 4;
+		LLImageGL::sGlobalTextureMemoryInBytes += mWidth * mHeight * 4;
 		LLTexLayerSetBuffer::sGLBumpByteCount += mWidth * mHeight * 4;
 	}
 }
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index f00d5e5b48..d356bf99ae 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -384,10 +384,10 @@ private:
 
 void LLGLTexMemBar::draw()
 {
-	S32 bound_mem = (LLViewerImage::sBoundTextureMemory >> 20);
- 	S32 max_bound_mem = LLViewerImage::sMaxBoundTextureMem;
-	S32 total_mem = (LLViewerImage::sTotalTextureMemory >> 20);
-	S32 max_total_mem = LLViewerImage::sMaxTotalTextureMem;
+	S32 bound_mem = BYTES_TO_MEGA_BYTES(LLViewerImage::sBoundTextureMemoryInBytes);
+ 	S32 max_bound_mem = LLViewerImage::sMaxBoundTextureMemInMegaBytes;
+	S32 total_mem = BYTES_TO_MEGA_BYTES(LLViewerImage::sTotalTextureMemoryInBytes);
+	S32 max_total_mem = LLViewerImage::sMaxTotalTextureMemInMegaBytes;
 	F32 discard_bias = LLViewerImage::sDesiredDiscardBias;
 	S32 line_height = (S32)(LLFontGL::getFontMonospace()->getLineHeight() + .5f);
 	
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index 0b6e01886a..b6090bc986 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -64,6 +64,9 @@ const S32 HPAD = 4;
 extern LLControlGroup gSavedSettings;
 
 
+// we use this in various places instead of NULL
+static LLTool* sNullTool = new LLTool(std::string("null"), NULL); 
+
 //-----------------------------------------------------------------------
 // LLToolComposite
 
@@ -87,7 +90,9 @@ void LLToolComposite::setCurrentTool( LLTool* new_tool )
 
 LLToolComposite::LLToolComposite(const std::string& name)
 	: LLTool(name),
-	  mCur(NULL), mDefault(NULL), mSelected(FALSE),
+	  mCur(sNullTool), 
+	  mDefault(sNullTool), 
+	  mSelected(FALSE),
 	  mMouseDown(FALSE), mManip(NULL), mSelectRect(NULL)
 {
 }
@@ -638,7 +643,7 @@ LLToolCompGun::LLToolCompGun()
 {
 	mGun = new LLToolGun(this);
 	mGrab = new LLToolGrab(this);
-	mNull = new LLTool(std::string("null"), this);
+	mNull = sNullTool;
 
 	setCurrentTool(mGun);
 	mDefault = mGun;
@@ -653,7 +658,8 @@ LLToolCompGun::~LLToolCompGun()
 	delete mGrab;
 	mGrab = NULL;
 
-	delete mNull;
+	// don't delete a static object
+	// delete mNull;
 	mNull = NULL;
 }
 
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index d4e594656b..6591cd3b19 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2748,7 +2748,7 @@ void LLViewerObject::setPixelAreaAndAngle(LLAgent &agent)
 	F32 mid_scale = getMidScale();
 	F32 min_scale = getMinScale();
 
-	// IW: esitmate - when close to large objects, computing range based on distance from center is no good
+	// IW: estimate - when close to large objects, computing range based on distance from center is no good
 	// to try to get a min distance from face, subtract min_scale/2 from the range.
 	// This means we'll load too much detail sometimes, but that's better than not enough
 	// I don't think there's a better way to do this without calculating distance per-poly
@@ -3733,7 +3733,6 @@ S32 LLViewerObject::setTEColor(const U8 te, const LLColor4& color)
 	else if (color != tep->getColor())
 	{
 		retval = LLPrimitive::setTEColor(te, color);
-		//setChanged(TEXTURE);
 		if (mDrawable.notNull() && retval)
 		{
 			// These should only happen on updates which are not the initial update.
@@ -3780,6 +3779,22 @@ S32 LLViewerObject::setTETexGen(const U8 te, const U8 texgen)
 	return retval;
 }
 
+S32 LLViewerObject::setTEMediaTexGen(const U8 te, const U8 media)
+{
+	S32 retval = 0;
+	const LLTextureEntry *tep = getTE(te);
+	if (!tep)
+	{
+		llwarns << "No texture entry for te " << (S32)te << ", object " << mID << llendl;
+	}
+	else if (media != tep->getMediaTexGen())
+	{
+		retval = LLPrimitive::setTEMediaTexGen(te, media);
+		setChanged(TEXTURE);
+	}
+	return retval;
+}
+
 S32 LLViewerObject::setTEShiny(const U8 te, const U8 shiny)
 {
 	S32 retval = 0;
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 16a3b98d12..db69399383 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -305,6 +305,7 @@ public:
 	/*virtual*/ S32		setTERotation(const U8 te, const F32 r);
 	/*virtual*/	S32		setTEBumpmap(const U8 te, const U8 bump );
 	/*virtual*/	S32		setTETexGen(const U8 te, const U8 texgen );
+	/*virtual*/	S32		setTEMediaTexGen(const U8 te, const U8 media ); // *FIXME: this confusingly acts upon a superset of setTETexGen's flags without absorbing its semantics
 	/*virtual*/	S32		setTEShiny(const U8 te, const U8 shiny );
 	/*virtual*/	S32		setTEFullbright(const U8 te, const U8 fullbright );
 	/*virtual*/	S32		setTEMediaFlags(const U8 te, const U8 media_flags );
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 648fbd4714..5f83cddf5b 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -365,8 +365,8 @@ void output_statistics(void*)
 	llinfos << "Number of orphans: " << gObjectList.getOrphanCount() << llendl;
 	llinfos << "Number of dead objects: " << gObjectList.mNumDeadObjects << llendl;
 	llinfos << "Num images: " << gImageList.getNumImages() << llendl;
-	llinfos << "Texture usage: " << LLImageGL::sGlobalTextureMemory << llendl;
-	llinfos << "Texture working set: " << LLImageGL::sBoundTextureMemory << llendl;
+	llinfos << "Texture usage: " << LLImageGL::sGlobalTextureMemoryInBytes << llendl;
+	llinfos << "Texture working set: " << LLImageGL::sBoundTextureMemoryInBytes << llendl;
 	llinfos << "Raw usage: " << LLImageRaw::sGlobalRawMemory << llendl;
 	llinfos << "Formatted usage: " << LLImageFormatted::sGlobalFormattedMemory << llendl;
 	llinfos << "Zombie Viewer Objects: " << LLViewerObject::getNumZombieObjects() << llendl;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index f2fcad8861..cbda0e8a64 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4405,7 +4405,7 @@ void LLViewerWindow::stopGL(BOOL save_state)
 		gGLManager.mIsDisabled = TRUE;
 		stop_glerror();
 		
-		llinfos << "Remaining allocated texture memory: " << LLImageGL::sGlobalTextureMemory << " bytes" << llendl;
+		llinfos << "Remaining allocated texture memory: " << LLImageGL::sGlobalTextureMemoryInBytes << " bytes" << llendl;
 	}
 }
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 168b0056e5..983a580fea 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1276,7 +1276,7 @@ void LLVOAvatar::deleteCachedImages(bool clearAll)
 
 		sScratchTexNames.deleteAllData();
 		LLVOAvatar::sScratchTexLastBindTime.deleteAllData();
-		LLImageGL::sGlobalTextureMemory -= sScratchTexBytes;
+		LLImageGL::sGlobalTextureMemoryInBytes -= sScratchTexBytes;
 		sScratchTexBytes = 0;
 	}
 
@@ -6781,7 +6781,7 @@ LLGLuint LLVOAvatar::getScratchTexName( LLGLenum format, U32* texture_bytes )
 		LLVOAvatar::sScratchTexNames.addData( format, new LLGLuint( name ) );
 
 		LLVOAvatar::sScratchTexBytes += *texture_bytes;
-		LLImageGL::sGlobalTextureMemory += *texture_bytes;
+		LLImageGL::sGlobalTextureMemoryInBytes += *texture_bytes;
 		return name;
 	}
 }
@@ -8317,7 +8317,7 @@ BOOL LLVOAvatar::canGrabLocalTexture(ETextureIndex index)
 		return FALSE;
 	}
 
-	if (gAgent.isGodlike())
+	if (gAgent.isGodlike() && !gAgent.getAdminOverride())
 		return TRUE;
 
 	// Check permissions of textures that show up in the
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index c3366cad90..d4df141477 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -1197,8 +1197,6 @@ LLDrawable *LLVOSky::createDrawable(LLPipeline *pipeline)
 
 	LLDrawPoolSky *poolp = (LLDrawPoolSky*) gPipeline.getPool(LLDrawPool::POOL_SKY);
 	poolp->setSkyTex(mSkyTex);
-	poolp->setSun(&mSun);
-	poolp->setMoon(&mMoon);
 	mDrawable->setRenderType(LLPipeline::RENDER_TYPE_SKY);
 	
 	for (S32 i = 0; i < 6; ++i)
@@ -1215,7 +1213,7 @@ LLDrawable *LLVOSky::createDrawable(LLPipeline *pipeline)
 
 //by bao
 //fake vertex buffer updating
-//to guaranttee at least updating one VBO buffer every frame
+//to guarantee at least updating one VBO buffer every frame
 //to walk around the bug caused by ATI card --> DEV-3855
 //
 void LLVOSky::createDummyVertexBuffer()
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 8f11661b30..dd68733d98 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -653,7 +653,8 @@ LLDrawable *LLVOVolume::createDrawable(LLPipeline *pipeline)
 	}
 	
 	updateRadius();
-	mDrawable->updateDistance(*LLViewerCamera::getInstance());
+	bool force_update = true; // avoid non-alpha mDistance update being optimized away
+	mDrawable->updateDistance(*LLViewerCamera::getInstance(), force_update);
 
 	return mDrawable;
 }
@@ -1271,15 +1272,28 @@ S32 LLVOVolume::setTEColor(const U8 te, const LLColor3& color)
 
 S32 LLVOVolume::setTEColor(const U8 te, const LLColor4& color)
 {
-	S32 res = LLViewerObject::setTEColor(te, color);
-	if (res && mDrawable.notNull())
+	S32 retval = 0;
+	const LLTextureEntry *tep = getTE(te);
+	if (!tep)
 	{
-		//gPipeline.markTextured(mDrawable);
-		mDrawable->setState(LLDrawable::REBUILD_COLOR);
-		dirtyMesh();
-		//mFaceMappingChanged = TRUE;
+		llwarns << "No texture entry for te " << (S32)te << ", object " << mID << llendl;
 	}
-	return  res;
+	else if (color != tep->getColor())
+	{
+		if (color.mV[3] != tep->getColor().mV[3])
+		{
+			gPipeline.markTextured(mDrawable);
+		}
+		retval = LLPrimitive::setTEColor(te, color);
+		if (mDrawable.notNull() && retval)
+		{
+			// These should only happen on updates which are not the initial update.
+			mDrawable->setState(LLDrawable::REBUILD_COLOR);
+			dirtyMesh();
+		}
+	}
+
+	return  retval;
 }
 
 S32 LLVOVolume::setTEBumpmap(const U8 te, const U8 bumpmap)
@@ -1304,6 +1318,17 @@ S32 LLVOVolume::setTETexGen(const U8 te, const U8 texgen)
 	return  res;
 }
 
+S32 LLVOVolume::setTEMediaTexGen(const U8 te, const U8 media)
+{
+	S32 res = LLViewerObject::setTEMediaTexGen(te, media);
+	if (res)
+	{
+		gPipeline.markTextured(mDrawable);
+		mFaceMappingChanged = TRUE;
+	}
+	return  res;
+}
+
 S32 LLVOVolume::setTEShiny(const U8 te, const U8 shiny)
 {
 	S32 res = LLViewerObject::setTEShiny(te, shiny);
@@ -1326,6 +1351,17 @@ S32 LLVOVolume::setTEFullbright(const U8 te, const U8 fullbright)
 	return  res;
 }
 
+S32 LLVOVolume::setTEBumpShinyFullbright(const U8 te, const U8 bump)
+{
+	S32 res = LLViewerObject::setTEBumpShinyFullbright(te, bump);
+	if (res)
+	{
+		gPipeline.markTextured(mDrawable);
+		mFaceMappingChanged = TRUE;
+	}
+	return res;
+}
+
 S32 LLVOVolume::setTEMediaFlags(const U8 te, const U8 media_flags)
 {
 	S32 res = LLViewerObject::setTEMediaFlags(te, media_flags);
@@ -2812,7 +2848,7 @@ LLHUDPartition::LLHUDPartition()
 	mPartitionType = LLViewerRegion::PARTITION_HUD;
 	mDrawableType = LLPipeline::RENDER_TYPE_HUD;
 	mSlopRatio = 0.f;
-	mLODPeriod = 16;
+	mLODPeriod = 1;
 }
 
 void LLHUDPartition::shift(const LLVector3 &offset)
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 155775510e..9b4e715194 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -158,12 +158,14 @@ public:
 	/*virtual*/ S32		setTEBumpmap(const U8 te, const U8 bump);
 	/*virtual*/ S32		setTEShiny(const U8 te, const U8 shiny);
 	/*virtual*/ S32		setTEFullbright(const U8 te, const U8 fullbright);
+	/*virtual*/ S32		setTEBumpShinyFullbright(const U8 te, const U8 bump);
 	/*virtual*/ S32		setTEMediaFlags(const U8 te, const U8 media_flags);
 	/*virtual*/ S32		setTEGlow(const U8 te, const F32 glow);
 	/*virtual*/ S32		setTEScale(const U8 te, const F32 s, const F32 t);
 	/*virtual*/ S32		setTEScaleS(const U8 te, const F32 s);
 	/*virtual*/ S32		setTEScaleT(const U8 te, const F32 t);
 	/*virtual*/ S32		setTETexGen(const U8 te, const U8 texgen);
+	/*virtual*/ S32		setTEMediaTexGen(const U8 te, const U8 media);
 	/*virtual*/ BOOL 	setMaterial(const U8 material);
 
 				void	setTexture(const S32 face);
diff --git a/indra/newview/nl.lproj/language.txt b/indra/newview/nl.lproj/language.txt
new file mode 100644
index 0000000000..d5f5c2a19c
--- /dev/null
+++ b/indra/newview/nl.lproj/language.txt
@@ -0,0 +1 @@
+nl
\ No newline at end of file
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 8dec9b9ba8..ebf2f91aa2 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1945,7 +1945,8 @@ void LLPipeline::stateSort(LLSpatialBridge* bridge, LLCamera& camera)
 	LLMemType mt(LLMemType::MTYPE_PIPELINE);
 	if (!sSkipUpdate && bridge->getSpatialGroup()->changeLOD())
 	{
-		bridge->updateDistance(camera);
+		bool force_update = false;
+		bridge->updateDistance(camera, force_update);
 	}
 }
 
@@ -2006,11 +2007,13 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
 		{
 			if (!drawablep->isActive())
 			{
-				drawablep->updateDistance(camera);
+				bool force_update = false;
+				drawablep->updateDistance(camera, force_update);
 			}
 			else if (drawablep->isAvatar())
 			{
-				drawablep->updateDistance(camera); // calls vobj->updateLOD() which calls LLVOAvatar::updateVisibility()
+				bool force_update = false;
+				drawablep->updateDistance(camera, force_update); // calls vobj->updateLOD() which calls LLVOAvatar::updateVisibility()
 		}
 		}
 	}
@@ -2570,9 +2573,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 	stop_glerror();
 	
 	LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDrawPools");
-	
-		LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderForSelect");
-		LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDeferred");
 	for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
 	{
 		LLDrawPool *poolp = *iter;
@@ -2584,6 +2584,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 
 	if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_PICKING))
 	{
+		LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderForSelect");
 		gObjectList.renderObjectsForSelect(camera, gViewerWindow->getVirtualWindowRect());
 	}
 	else
@@ -2747,6 +2748,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 
 void LLPipeline::renderGeomDeferred(LLCamera& camera)
 {
+	LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderGeomDeferred");
 	LLFastTimer t(LLFastTimer::FTM_RENDER_GEOMETRY);
 
 	LLFastTimer t2(LLFastTimer::FTM_POOLS);
diff --git a/indra/newview/pl.lproj/language.txt b/indra/newview/pl.lproj/language.txt
new file mode 100644
index 0000000000..55239f3c18
--- /dev/null
+++ b/indra/newview/pl.lproj/language.txt
@@ -0,0 +1 @@
+pl
\ No newline at end of file
diff --git a/indra/newview/pt.lproj/language.txt b/indra/newview/pt.lproj/language.txt
new file mode 100644
index 0000000000..9e3340eca2
--- /dev/null
+++ b/indra/newview/pt.lproj/language.txt
@@ -0,0 +1 @@
+pt
\ No newline at end of file
diff --git a/indra/newview/ru.lproj/language.txt b/indra/newview/ru.lproj/language.txt
new file mode 100644
index 0000000000..adc719b423
--- /dev/null
+++ b/indra/newview/ru.lproj/language.txt
@@ -0,0 +1 @@
+ru
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index 5795053a14..9f3a61d0c5 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Om Second Life">
 	<text_editor name="credits_editor">
-		Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
+		Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
 
-Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste version til dato: afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
+Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste version til dato: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
   3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
   APR Copyright (C) 2000-2004 The Apache Software Foundation
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index 8c1ed736a3..df7d5fe8ff 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -1,80 +1,83 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="Om land">
 	<tab_container name="landtab">
 		<panel label="Generelt" name="land_general_panel">
-			<text type="string" length="1" name="Name:">
+			<text length="1" name="Name:" type="string">
 				Navn:
 			</text>
-			<text type="string" length="1" name="Description:">
+			<text length="1" name="Description:" type="string">
 				Beskrivelse:
 			</text>
-			<text type="string" length="1" name="Owner:">
+			<text name="LandType">
+				Type:
+			</text>
+			<text name="LandTypeText">
+				Mainland / Homestead
+			</text>
+			<text name="ContentRating">
+				Rating:
+			</text>
+			<text name="ContentRatingText">
+				Adult
+			</text>
+			<text length="1" name="Owner:" type="string">
 				Ejer:
 			</text>
-			<text type="string" length="1" name="OwnerText">
+			<text length="1" name="OwnerText" type="string">
 				Leyla Linden
 			</text>
-			<button label="Profil..." label_selected="Profil..." name="Profile..." />
-			<text type="string" length="1" name="Group:">
+			<button label="Profil..." label_selected="Profil..." name="Profile..."/>
+			<text length="1" name="Group:" type="string">
 				Gruppe:
 			</text>
-			<button label="Vælg..." label_selected="Vælg..." name="Set..." />
-			<check_box label="Tillad dedikering til gruppe" name="check deed"
-			     tool_tip="En gruppe administrator kan dedikere denne jord til gruppen, så det vil blive støttet af gruppen&apos;s jord tildeling." />
-			<button label="Dedikér..." label_selected="Dedikér..." name="Deed..."
-			     tool_tip="Du kan kun dedikere jord, hvis du er en administrator i den valgte gruppe." />
-			<check_box label="Ejer bidrager ved dedikering" name="check contrib"
-			     tool_tip="Når land dedikeres til gruppe, kan den tidligere bidrage med nok land til at dække krav." />
-			<text type="string" length="1" name="For Sale:">
+			<button label="Vælg..." label_selected="Vælg..." name="Set..."/>
+			<check_box label="Tillad dedikering til gruppe" name="check deed" tool_tip="En gruppe administrator kan dedikere denne jord til gruppen, så det vil blive støttet af gruppen&apos;s jord tildeling."/>
+			<button label="Dedikér..." label_selected="Dedikér..." name="Deed..." tool_tip="Du kan kun dedikere jord, hvis du er en administrator i den valgte gruppe."/>
+			<check_box label="Ejer bidrager ved dedikering" name="check contrib" tool_tip="Når land dedikeres til gruppe, kan den tidligere bidrage med nok land til at dække krav."/>
+			<text length="1" name="For Sale:" type="string">
 				Til salg:
 			</text>
-			<text type="string" length="1" name="Not for sale.">
+			<text length="1" name="Not for sale." type="string">
 				Ikke til salg.
 			</text>
-			<text type="string" length="1" name="For Sale: Price L$[PRICE].">
-				Pris: L$[PRICE].
+			<text length="1" name="For Sale: Price L$[PRICE]." type="string">
+				Pris: L$[PRICE] (L$[PRICE_PER_SQM]/m²).
 			</text>
-			<button label="Sælg land..." label_selected="Sælg land..." name="Sell Land..." />
-			<text type="string" length="1" name="For sale to">
+			<button label="Sælg land..." label_selected="Sælg land..." name="Sell Land..."/>
+			<text length="1" name="For sale to" type="string">
 				Til salg til: [BUYER]
 			</text>
-			<text type="string" length="1" name="Sell with landowners objects in parcel.">
+			<text length="1" name="Sell with landowners objects in parcel." type="string">
 				Objekter er inkluderet i salg.
 			</text>
-			<text type="string" length="1" name="Selling with no objects in parcel.">
+			<text length="1" name="Selling with no objects in parcel." type="string">
 				Objekter er ikke inkluderet i salg.
 			</text>
-			<button label="Annullér salg af land" label_selected="Annullér salg af land"
-			     name="Cancel Land Sale" />
-			<text type="string" length="1" name="Claimed:">
+			<button label="Annullér salg af land" label_selected="Annullér salg af land" name="Cancel Land Sale"/>
+			<text length="1" name="Claimed:" type="string">
 				Købt:
 			</text>
-			<text type="string" length="1" name="DateClaimText">
+			<text length="1" name="DateClaimText" type="string">
 				Tue Aug 15 13:47:25 2006
 			</text>
-			<text type="string" length="1" name="PriceLabel">
+			<text length="1" name="PriceLabel" type="string">
 				Område:
 			</text>
-			<text type="string" length="1" name="PriceText">
+			<text length="1" name="PriceText" type="string">
 				4048 m²
 			</text>
-			<text type="string" length="1" name="Traffic:">
+			<text length="1" name="Traffic:" type="string">
 				Trafik:
 			</text>
-			<text type="string" length="1" name="DwellText">
+			<text length="1" name="DwellText" type="string">
 				0
 			</text>
-			<button label="Køb land..." label_selected="Køb land..." name="Buy Land..." />
-			<button label="Køb til gruppe..." label_selected="Køb til gruppe..."
-			     name="Buy For Group..." />
-			<button label="Køb adgang..." label_selected="Køb adgang..." name="Buy Pass..."
-			     tool_tip="Giver adgang til midlertidig adgang til dette område." />
-			<button label="Efterlad land..." label_selected="Efterlad land..."
-			     name="Abandon Land..." />
-			<button label="Kræv tilbage..." label_selected="Kræv tilbage..."
-			     name="Reclaim Land..." />
-			<button label="Linden lalg..." label_selected="Linden lalg..." name="Linden salg..."
-			     tool_tip="Land skal være ejet og ikke allerede på auktion" />
+			<button label="Køb land..." label_selected="Køb land..." name="Buy Land..."/>
+			<button label="Køb til gruppe..." label_selected="Køb til gruppe..." name="Buy For Group..."/>
+			<button label="Køb adgang..." label_selected="Køb adgang..." name="Buy Pass..." tool_tip="Giver adgang til midlertidig adgang til dette område."/>
+			<button label="Efterlad land..." label_selected="Efterlad land..." name="Abandon Land..."/>
+			<button label="Kræv tilbage..." label_selected="Kræv tilbage..." name="Reclaim Land..."/>
+			<button label="Linden salg..." label_selected="Linden salg..." name="Linden Sale..." tool_tip="Land skal være ejet, indholdsrating sat og ikke allerede på auktion."/>
 			<string name="new users only">
 				Kun nye brugere
 			</string>
@@ -117,36 +120,60 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 			</string>
 		</panel>
 		<panel label="Regler" name="land_covenant_panel">
-			<text type="string" length="1" name="covenant_timestamp_text">
+			<text name="estate_section_lbl">
+				Estate:
+			</text>
+			<text length="1" name="estate_name_lbl" type="string">
+				Navn:
+			</text>
+			<text length="1" name="estate_name_text" type="string">
+				Hovedland
+			</text>
+			<text length="1" name="estate_owner_lbl" type="string">
+				Ejer:
+			</text>
+			<text length="1" name="estate_owner_text" type="string">
+				(ingen)
+			</text>
+			<text_editor length="1" name="covenant_editor" type="string">
+				Der er ikke angivet specielle regler for denne Estate
+			</text_editor>
+			<text length="1" name="covenant_timestamp_text" type="string">
 				Sidst rettet Wed Dec 31 16:00:00 1969
 			</text>
-			<text type="string" length="1" name="region_name_lbl">
+			<text name="region_section_lbl">
 				Region:
 			</text>
-			<text type="string" length="1" name="region_name_text">
+			<text length="1" name="region_name_lbl" type="string">
+				Navn:
+			</text>
+			<text length="1" name="region_name_text" type="string">
 				leyla
 			</text>
-			<text type="string" length="1" name="estate_name_lbl">
-				Estate:
+			<text name="region_landtype_lbl">
+				Type:
 			</text>
-			<text type="string" length="1" name="estate_name_text">
-				Hovedland
+			<text name="region_landtype_text">
+				Mainland / Homestead
 			</text>
-			<text type="string" length="1" name="estate_owner_lbl">
-				Estate ejer:
+			<text name="region_maturity_lbl">
+				Rating:
 			</text>
-			<text type="string" length="1" name="estate_owner_text">
-				(ingen)
+			<text name="region_maturity_text">
+				Adult
 			</text>
-			<text type="string" length="1" name="resellable_clause">
-				Købt jord i denne region må ikke videresælges.
+			<text name="resellable_lbl">
+				Videresalg:
 			</text>
-			<text type="string" length="1" name="changeable_clause">
-				Købt jord i denne region må gerne samles eller opdeles.
+			<text length="1" name="resellable_clause" type="string">
+				Land i denne region må ikke sælges videre.
+			</text>
+			<text name="changeable_lbl">
+				Opdel:
+			</text>
+			<text length="1" name="changeable_clause" type="string">
+				Land i denne region må ikke samles/opdeles.
 			</text>
-			<text_editor type="string" length="1" name="covenant_editor">
-				Der er ikke angivet specielle regler for denne Estate
-			</text_editor>
 			<string name="can_resell">
 				Købt land i denne region må sælges videre
 			</string>
@@ -161,13 +188,13 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 			</string>
 		</panel>
 		<panel label="Objekter" name="land_objects_panel">
-			<text type="string" length="1" name="parcel_object_bonus">
+			<text length="1" name="parcel_object_bonus" type="string">
 				Region objekt bonus faktor: [BONUS]
 			</text>
-			<text type="string" length="1" name="Simulator primitive usage:">
+			<text length="1" name="Simulator primitive usage:" type="string">
 				Prims brugt i denne Sim:
 			</text>
-			<text type="string" length="1" name="objects_available">
+			<text length="1" name="objects_available" type="string">
 				[COUNT] ud af [MAX] ([AVAILABLE] ledige)
 			</text>
 			<string name="objects_available_text">
@@ -176,100 +203,142 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 			<string name="objects_deleted_text">
 				[COUNT] ud af [MAX] ([DELETED] bliver slettet)
 			</string>
-			<text type="string" length="1" name="Primitives parcel supports:">
+			<text length="1" name="Primitives parcel supports:" type="string">
 				Prims til rådighed:
 			</text>
-			<text type="string" length="1" name="object_contrib_text">
+			<text length="1" name="object_contrib_text" type="string">
 				[COUNT]
 			</text>
-			<text type="string" length="1" name="Primitives on parcel:">
+			<text length="1" name="Primitives on parcel:" type="string">
 				Prims brugt på parcel:
 			</text>
-			<text type="string" length="1" name="total_objects_text">
+			<text length="1" name="total_objects_text" type="string">
 				[COUNT]
 			</text>
-			<text type="string" length="1" name="Owned by parcel owner:">
+			<text length="1" name="Owned by parcel owner:" type="string">
 				Ejet af Parcel ejer:
 			</text>
-			<text type="string" length="1" name="owner_objects_text">
+			<text length="1" name="owner_objects_text" type="string">
 				[COUNT]
 			</text>
-			<button label="Vis" label_selected="Vis" name="ShowOwner" />
-			<button label="Returnér..." label_selected="Returnér..." name="ReturnOwner..."
-			     tool_tip="Returnér objekter til deres ejere." />
-			<text type="string" length="1" name="Set to group:">
+			<button label="Vis" label_selected="Vis" name="ShowOwner"/>
+			<button label="Returnér..." label_selected="Returnér..." name="ReturnOwner..." tool_tip="Returnér objekter til deres ejere."/>
+			<text length="1" name="Set to group:" type="string">
 				Sat til gruppe:
 			</text>
-			<text type="string" length="1" name="group_objects_text">
+			<text length="1" name="group_objects_text" type="string">
 				[COUNT]
 			</text>
-			<button label="Vis" label_selected="Vis" name="ShowGroup" />
-			<button label="Returnér..." label_selected="Returnér..." name="ReturnGroup..."
-			     tool_tip="Returnér objekter til deres ejere." />
-			<text type="string" length="1" name="Owned by others:">
+			<button label="Vis" label_selected="Vis" name="ShowGroup"/>
+			<button label="Returnér..." label_selected="Returnér..." name="ReturnGroup..." tool_tip="Returnér objekter til deres ejere."/>
+			<text length="1" name="Owned by others:" type="string">
 				Ejet af andre:
 			</text>
-			<text type="string" length="1" name="other_objects_text">
+			<text length="1" name="other_objects_text" type="string">
 				[COUNT]
 			</text>
-			<button label="Vis" label_selected="Vis" name="ShowOther" />
-			<button label="Returnér..." label_selected="Returnér..." name="ReturnOther..."
-			     tool_tip="Returnér objekter til deres ejere." />
-			<text type="string" length="1" name="Selected / sat upon:">
+			<button label="Vis" label_selected="Vis" name="ShowOther"/>
+			<button label="Returnér..." label_selected="Returnér..." name="ReturnOther..." tool_tip="Returnér objekter til deres ejere."/>
+			<text length="1" name="Selected / sat upon:" type="string">
 				Valgt/siddet på:
 			</text>
-			<text type="string" length="1" name="selected_objects_text">
+			<text length="1" name="selected_objects_text" type="string">
 				[COUNT]
 			</text>
-			<text type="string" length="1" name="Autoreturn">
+			<text length="1" name="Autoreturn" type="string">
 				Autoreturnér andres objekter efter (minutter, 0 = aldrig):
 			</text>
-			<text type="string" length="1" name="Object Owners:">
+			<text length="1" name="Object Owners:" type="string">
 				Objekt ejere:
 			</text>
-			<button label="Gentegn liste" label_selected="Gentegn liste" name="Refresh List" />
-			<button label="Returnér objekter..." label_selected="Returnér objekter..."
-			     name="Return objects..." />
+			<button label="Gentegn liste" label_selected="Gentegn liste" name="Refresh List"/>
+			<button label="Returnér objekter..." label_selected="Returnér objekter..." name="Return objects..."/>
 			<name_list name="owner list">
-				<column label="Type" name="type" />
-				<column label="Navn" name="name" />
-				<column label="Antal" name="count" />
-				<column label="Nyeste" name="mostrecent" />
+				<column label="Type" name="type"/>
+				<column label="Navn" name="name"/>
+				<column label="Antal" name="count"/>
+				<column label="Nyeste" name="mostrecent"/>
 			</name_list>
 		</panel>
 		<panel label="Indstillinger" name="land_options_panel">
-			<text type="string" length="1" name="allow_label">
+			<text length="1" name="allow_label" type="string">
 				Tillad andre beboere at:
 			</text>
-			<check_box label="Redigere terræn" name="edit land check"
-			     tool_tip="Hvis dette er valg, kan enhver redigere dit land. Det er bedst ikke at vælge her, da det altid er muligt for dig som ejer at ændre terræn på dit eget land." />
-			<check_box label="Lave landemærker" name="check landmark" />
-			<check_box label="Flyve" name="check fly"
-			     tool_tip="Hvis valgt, kan beboere flyve på dit land. Hvis ikke valgt kan beboere kun flyve ind på dit land og over dit land." />
-			<text type="string" length="1" name="allow_label2">
+			<check_box label="Redigere terræn" name="edit land check" tool_tip="Hvis dette er valg, kan enhver redigere dit land. Det er bedst ikke at vælge her, da det altid er muligt for dig som ejer at ændre terræn på dit eget land."/>
+			<check_box label="Lave landemærker" name="check landmark"/>
+			<check_box label="Flyve" name="check fly" tool_tip="Hvis valgt, kan beboere flyve på dit land. Hvis ikke valgt kan beboere kun flyve ind på dit land og over dit land."/>
+			<text length="1" name="allow_label2" type="string" left="194">
 				Lave objekter:
 			</text>
-			<check_box label="Alle beboere" name="edit objects check" />
-			<check_box label="Gruppe" name="edit group objects check" />
-			<text type="string" length="1" name="allow_label3">
+			<check_box label="Alle beboere" name="edit objects check"/>
+			<check_box label="Gruppe" name="edit group objects check"/>
+			<text length="1" name="allow_label3" type="string" left="170">
 				Anbringe objekter:
 			</text>
-			<check_box label="Alle beboere" name="all object entry check" />
-			<check_box label="Gruppe" name="group object entry check" />
-			<text type="string" length="1" name="allow_label4">
+			<check_box label="Alle beboere" name="all object entry check"/>
+			<check_box label="Gruppe" name="group object entry check"/>
+			<text length="1" name="allow_label4" type="string" left="200">
 				Køre scripts:
 			</text>
-			<check_box label="Alle beboere" name="check other scripts" />
-			<check_box label="Gruppe" name="check group scripts" />
-			<text type="string" length="1" name="land_options_label">
+			<check_box label="Alle beboere" name="check other scripts"/>
+			<check_box label="Gruppe" name="check group scripts"/>
+			<text length="1" name="land_options_label" type="string">
 				Land instillinger:
 			</text>
-			<check_box label="Sikker (ingen skade)" name="check safe"
-			     tool_tip="Hvis valgt, er det ikke muligt at forårsage skade på andre beboere. Hvis fravalgt er det muligt at få skader (f.eks. ved kamp)." />
-			<check_box label="Skub forbudt" name="PushRestrictCheck"
-			     tool_tip="Forhindrer scripts i at skubbe. Valg af denne mulighed, kan være nyttigt for at forhindre forstyrrende adfærd på dit land." />
-			<check_box label="Vis sted i søgning (L$30/uge) i kategorien:" name="ShowDirectoryCheck"
-			     tool_tip="Lad dit parcel blive vist i søge resultaterne" />
+			<check_box label="Sikker (ingen skade)" name="check safe" tool_tip="Hvis valgt, er det ikke muligt at forårsage skade på andre beboere. Hvis fravalgt er det muligt at få skader (f.eks. ved kamp)."/>
+			<check_box label="Skub forbudt" name="PushRestrictCheck" tool_tip="Forhindrer scripts i at skubbe. Valg af denne mulighed, kan være nyttigt for at forhindre forstyrrende adfærd på dit land."/>
+			<check_box label="Vis sted i søgning (L$30/uge) i kategorien:" name="ShowDirectoryCheck" tool_tip="Lad dit parcel blive vist i søge resultaterne"/>
+			<string name="search_enabled_tooltip">
+				Lad beboere se denne parcel i søgeresultater
+			</string>
+			<string name="search_disabled_small_tooltip">
+				Denne mulighed er ikke til stede da parcellens område er 128 m² eller mindre.
+Kun større parceller kan vises i søgning.
+			</string>
+			<string name="search_disabled_permissions_tooltip">
+				Dette valg er lukket da du ikke kan ændre på denne parcels opsætning.
+			</string>
+			<combo_box name="land category with adult">
+				<combo_item name="AnyCategory">
+					Enhver kategori
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Linden sted
+				</combo_item>
+				<combo_item name="Adult">
+					Adult
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Kunst &amp; kultur
+				</combo_item>
+				<combo_item name="Business">
+					Business
+				</combo_item>
+				<combo_item name="Educational">
+					Uddannelse
+				</combo_item>
+				<combo_item name="Gaming">
+					Spil
+				</combo_item>
+				<combo_item name="Hangout">
+					Opholdssteder
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Nybegynder venligt
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parker &amp; natur
+				</combo_item>
+				<combo_item name="Residential">
+					Beboelse
+				</combo_item>
+				<combo_item name="Shopping">
+					Shopping
+				</combo_item>
+				<combo_item name="Other">
+					Andet
+				</combo_item>
+			</combo_box>
 			<combo_box name="land category">
 				<combo_item name="AnyCategory">
 					Alle kategorier
@@ -277,8 +346,6 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 				<combo_item name="LindenLocation">
 					Linden Location
 				</combo_item>
-
-
 				<combo_item name="Arts&amp;Culture">
 					Kunst &amp; kultur
 				</combo_item>
@@ -310,34 +377,43 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 					Andet
 				</combo_item>
 			</combo_box>
-			<button label="?" label_selected="?" name="?" />
-			<check_box name="MatureCheck" />
-			<text type="string" length="1" name="Snapshot:">
+			<button label="?" label_selected="?" name="?"/>
+			<check_box label="Mature indhold" name="MatureCheck" tool_tip=""/>
+			<string name="mature_check_mature">
+				Mature indhold
+			</string>
+			<string name="mature_check_adult">
+				Adult indhold
+			</string>
+			<string name="mature_check_mature_tooltip">
+				Din parcel information eller indhold anses for at være &apos;adult&apos;.
+			</string>
+			<string name="mature_check_adult_tooltip">
+				Din parcel information eller indhold anses for at være &apos;adult&apos;.
+			</string>
+			<text length="1" name="Snapshot:" type="string">
 				Foto:
 			</text>
-			<texture_picker label="" name="snapshot_ctrl" tool_tip="Klik for at vælge et billede" />
-			<text type="string" length="1" name="landing_point">
+			<texture_picker label="" name="snapshot_ctrl" tool_tip="Klik for at vælge et billede"/>
+			<text length="1" name="landing_point" type="string">
 				Landingspunkt: [LANDING]
 			</text>
 			<string name="landing_point_none">
 				(ingen)
 			</string>
-			<button label="Vælg" label_selected="Vælg" name="Set"
-			     tool_tip="Indstiller landingspunkt, hvor de besøgende ankommer. Sættes til din avatars aktuelle placering i denne parcel." />
-			<button label="Fjern" label_selected="Fjern" name="Clear"
-			     tool_tip="Fjerner oplysning om landingspunkt." />
-			<text type="string" length="1" name="Teleport Routing: ">
+			<button label="Vælg" label_selected="Vælg" name="Set" tool_tip="Indstiller landingspunkt, hvor de besøgende ankommer. Sættes til din avatars aktuelle placering i denne parcel."/>
+			<button label="Fjern" label_selected="Fjern" name="Clear" tool_tip="Fjerner oplysning om landingspunkt."/>
+			<text length="1" name="Teleport Routing: " type="string">
 				Teleport valg:
 			</text>
-			<combo_box name="landing type"
-			     tool_tip="Vælg hvordan du vil håndtere teleporteringer til dit land.">
-				<combo_item type="string" length="1" name="Blocked">
+			<combo_box name="landing type" tool_tip="Vælg hvordan du vil håndtere teleporteringer til dit land.">
+				<combo_item length="1" name="Blocked" type="string">
 					Blokeret
 				</combo_item>
-				<combo_item type="string" length="1" name="LandingPoint">
+				<combo_item length="1" name="LandingPoint" type="string">
 					Landingspunkt
 				</combo_item>
-				<combo_item type="string" length="1" name="Anywhere">
+				<combo_item length="1" name="Anywhere" type="string">
 					Hvor som helst
 				</combo_item>
 			</combo_box>
@@ -349,91 +425,71 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 			</string>
 		</panel>
 		<panel label="Medier" name="land_media_panel">
-			<text type="string" length="1" name="with media:">
+			<text length="1" name="with media:" type="string" left="4">
 				Medie type:
 			</text>
-			<combo_box name="media type"
-			     tool_tip="Specificer om URL-adressen er til en film, hjemmeside eller et andet medie." />
-			<text type="string" length="1" name="at URL:">
+			<combo_box name="media type" tool_tip="Specificer om URL-adressen er til en film, hjemmeside eller et andet medie."/>
+			<text length="1" name="at URL:" type="string" left="4">
 				Medie URL:
 			</text>
-			<button label="Vælg..." label_selected="Vælg..." name="set_media_url" />
-			<text type="string" length="1" name="Description:">
+			<button label="Vælg..." label_selected="Vælg..." name="set_media_url"/>
+			<text length="1" name="Description:" type="string" left="4">
 				Beskrivelse:
 			</text>
-			<line_editor name="url_description" tool_tip="Tekst vist ved siden af Afspil/Hent knappen" />
-			<text type="string" length="1" name="Media texture:">
+			<line_editor name="url_description" tool_tip="Tekst vist ved siden af Afspil/Hent knappen"/>
+			<text length="1" name="Media texture:" type="string" left="4">
 				Erstat tekstur:
 			</text>
-			<texture_picker label="" name="media texture" tool_tip="Klik for at vælge billede" />
-			<text type="string" length="1" name="replace_texture_help">
+			<texture_picker label="" name="media texture" tool_tip="Klik for at vælge billede"/>
+			<text length="1" name="replace_texture_help" type="string">
 				(Objekter der har denne tekstur vil vise filmen eller 
 web-siden, efter du klikker på play knappen.)
 			</text>
-			<text type="string" length="1" name="Options:">
+			<text length="1" name="Options:" type="string">
 				Medie valg:
 			</text>
-			<check_box label="Auto skalér" name="media_auto_scale"
-			     tool_tip="Vælg denne mulighed for at skalere indholdet for dette parcel automatisk. Det kan være lidt langsommere og have lavere kvalitet, men ingen anden tekstur skalering eller tilpasning vil være nødvendigt." />
-			<check_box label="Gentag afspil" name="media_loop"
-			     tool_tip="Gentager automatisk medie, når det er færdigt med at spille starter det automatisk forfra." />
-			<check_box label="Skjul medie URL" name="hide_media_url"
-			     tool_tip="Klik her for at skjule medie adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den." />
-			<check_box label="Skjul musik URL" name="hide_music_url"
-			     tool_tip="Klik her for at skjule musik adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den." />
-			<text type="string" length="1" name="media_size"
-			     tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." width="105">
+			<check_box label="Auto skalér" name="media_auto_scale" tool_tip="Vælg denne mulighed for at skalere indholdet for dette parcel automatisk. Det kan være lidt langsommere og have lavere kvalitet, men ingen anden tekstur skalering eller tilpasning vil være nødvendigt."/>
+			<check_box label="Gentag afspil" name="media_loop" tool_tip="Gentager automatisk medie, når det er færdigt med at spille starter det automatisk forfra."/>
+			<check_box label="Skjul medie URL" name="hide_media_url" tool_tip="Klik her for at skjule medie adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den."/>
+			<check_box label="Skjul musik URL" name="hide_music_url" tool_tip="Klik her for at skjule musik adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den."/>
+			<text length="1" name="media_size" tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." type="string" width="105">
 				Medie Størrelse:
 			</text>
-			<spinner name="media_size_width" left_delta="89"
-			     tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." />
-			<spinner name="media_size_height"
-			     tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." />
-			<text type="string" length="1" name="pixels">
+			<spinner left_delta="89" name="media_size_width" tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard."/>
+			<spinner name="media_size_height" tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard."/>
+			<text length="1" name="pixels" type="string">
 				pixels
 			</text>
-			<text type="string" length="1" name="MusicURL:">
+			<text length="1" name="MusicURL:" type="string">
 				Musik URL:
 			</text>
-			<text type="string" length="1" name="Sound:">
+			<text length="1" name="Sound:" type="string">
 				Lyd:
 			</text>
-			<check_box label="Isolér lyde til denne parcel" name="check sound local" />
-			<text type="string" length="1" name="Voice settings:">
+			<check_box label="Begræns lyde fra bevægelser og objekter til denne parcel" name="check sound local"/>
+			<button label="?" label_selected="?" name="?" left="400"/>
+			<text length="1" name="Voice settings:" type="string">
 				Stemme:
 			</text>
-			<radio_group name="parcel_voice_channel">
-				<radio_item type="string" length="1" name="Estate">
-					Brug Estate kanalen
-				</radio_item>
-				<radio_item type="string" length="1" name="Private">
-					Brug en privat kanal
-				</radio_item>
-				<radio_item type="string" length="1" name="Disabled">
-					Slå stemme chat fra på denne parcel
-				</radio_item>
-			</radio_group>
+			<check_box label="Aktiver stemme chat" name="parcel_enable_voice_channel"/>
+			<check_box label="Aktiver stemme chat (muliggjort via estate opsætning)" name="parcel_enable_voice_channel_is_estate_disabled"/>
+			<check_box label="Begræns stemme chat til denne parcel" name="parcel_enable_voice_channel_parcel"/>
 		</panel>
 		<panel label="Adgang" name="land_access_panel">
-			<text type="string" length="1" name="Limit access to this parcel to:">
+			<text length="1" name="Limit access to this parcel to:" type="string">
 				Adgang til denne parcel
 			</text>
-			<check_box label="Tillad offentlig adgang" name="public_access" />
-			<text type="string" length="1" name="Only Allow">
+			<check_box label="Tillad offentlig adgang" name="public_access"/>
+			<text length="1" name="Only Allow" type="string">
 				Blokér adgang for:
 			</text>
-			<check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab"
-			     name="limit_payment"
-			     tool_tip="Blokér beboere der ikke har afgivet identifikationsoplysninger." />
-			<check_box label="Beboere der ikke er godkendt som voksne" name="limit_age_verified"
-			     tool_tip="Blokér beboere der ikke har verificeret deres alder. Se support.secondlife.com for mere information." />
+			<check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab" name="limit_payment" tool_tip="Blokér beboere der ikke har afgivet identifikationsoplysninger."/>
+			<check_box label="Beboere der ikke er godkendt som voksne" name="limit_age_verified" tool_tip="Blokér beboere der ikke har verificeret deres alder. Se support.secondlife.com for mere information."/>
 			<string name="estate_override">
 				En eller flere af disse valg er indstillet på estate niveau
 			</string>
-			<check_box label="Tillad adgang til gruppen: [GROUP]" name="GroupCheck"
-			     tool_tip="Vælg gruppe under fanen &apos;generelt&apos;." />
-			<check_box label="Sælg adgang til:" name="PassCheck"
-			     tool_tip="Tillader midlertidig adgang til denne parcel" />
+			<check_box label="Tillad adgang til gruppen: [GROUP]" name="GroupCheck" tool_tip="Vælg gruppe under fanen &apos;generelt&apos;."/>
+			<check_box label="Sælg adgang til:" name="PassCheck" tool_tip="Tillader midlertidig adgang til denne parcel"/>
 			<combo_box name="pass_combo">
 				<combo_item name="Anyone">
 					Alle
@@ -442,20 +498,20 @@ web-siden, efter du klikker på play knappen.)
 					Gruppe
 				</combo_item>
 			</combo_box>
-			<spinner label="Pris i L$:" name="PriceSpin" />
-			<spinner label="Timers adgang:" name="HoursSpin" />
+			<spinner label="Pris i L$:" name="PriceSpin"/>
+			<spinner label="Timers adgang:" name="HoursSpin"/>
 			<text label="Tillad altid" name="AllowedText">
 				Altid godkendte beboere
 			</text>
-			<name_list name="AccessList" tool_tip="([LISTED] vist, [MAX] max)" />
-			<button label="Tilføj..." label_selected="Tilføj..." name="add_allowed" />
-			<button label="Fjern" label_selected="Fjern" name="remove_allowed" />
+			<name_list name="AccessList" tool_tip="([LISTED] vist, [MAX] max)"/>
+			<button label="Tilføj..." label_selected="Tilføj..." name="add_allowed"/>
+			<button label="Fjern" label_selected="Fjern" name="remove_allowed"/>
 			<text label="Blokér" name="BanCheck">
 				Blokerede beboere
 			</text>
-			<name_list name="BannedList" tool_tip="([LISTED] vist, [MAX] max)" />
-			<button label="Tilføj..." label_selected="Tilføj..." name="add_banned" />
-			<button label="Fjern" label_selected="Fjern" name="remove_banned" />
+			<name_list name="BannedList" tool_tip="([LISTED] vist, [MAX] max)"/>
+			<button label="Tilføj..." label_selected="Tilføj..." name="add_banned"/>
+			<button label="Fjern" label_selected="Fjern" name="remove_banned"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
index 4ea7753457..92508e36de 100644
--- a/indra/newview/skins/default/xui/da/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
@@ -9,15 +9,14 @@
 	<spinner label="Prioritet" name="priority"
 	     tool_tip="Vælg hvilke andre animationer der har lavere prioritet end denne." />
 	<check_box label="Gentag" name="loop_check" tool_tip="Gentager animationen konstant." />
-	<spinner label="Ind(%)" name="loop_in_point"
-	     tool_tip="Sætter punktet hvor gentagelsen genstarter fra." />
+	<spinner left="76" label_width="40" width="105" label="Ind(%)" name="loop_in_point" tool_tip="Sætter punktet hvor gentagelsen genstarter fra."/>
 	<spinner label="Ud (%)" name="loop_out_point"
 	     tool_tip="Sætter punktet i animationen der afslutter gentagelsen." />
 	<text name="hand_label">
 		HÃ¥nd posering
 	</text>
 	<combo_box label="" name="hand_pose_combo"
-	     tool_tip="Kontrollerer hvad hænderne går i løbet af animationen.">
+	     tool_tip="Kontrollerer hvad hænderne går i løbet af animationen." width="140">
 		<combo_item name="Spread">
 			Spredt
 		</combo_item>
@@ -62,7 +61,7 @@
 		Ansigtsudtryk
 	</text>
 	<combo_box label="" name="emote_combo"
-	     tool_tip="Angiver hvad ansigtet gør under animationen">
+	     tool_tip="Angiver hvad ansigtet gør under animationen" width="140">
 		<combo_item name="[None]">
 			[Intet]
 		</combo_item>
@@ -128,7 +127,7 @@
 		Vis mens
 	</text>
 	<combo_box label="" name="preview_base_anim"
-	     tool_tip="Se hvordan animation ser ud i forskellige typiske avatar-situationer.">
+	     tool_tip="Se hvordan animation ser ud i forskellige typiske avatar-situationer." width="140">
 		<combo_item name="Standing">
 			Står
 		</combo_item>
@@ -151,8 +150,8 @@
 	<slider label="" name="playback_slider" />
 	<text name="bad_animation_text">
 		Kan ikke læse animations fil.
-	
-	Vi anbefaler BVH filer der er exporteret fra Poser 4.
+
+Vi anbefaler BVH filer der er exporteret fra Poser 4.
 	</text>
 	<button label="Annullér" name="cancel_btn" />
 	<button label="Hent (L$[AMOUNT])" name="ok_btn" />
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
index d2c8f3a003..f93f0a3525 100644
--- a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
@@ -1,15 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatarpicker" title="Vælg beboer">
-	<text name="instruct_search_resident_name">
-		Skriv en del eller hele navnet på beboeren:
-	</text>
-	<button label="Find" label_selected="Find" name="Find" />
-	<text name="Or select their calling card:">
-		Eller vælg deres visitkort:
-	</text>
-	<button label="Luk" label_selected="Luk" name="Close" />
-	<button label="Vælg" label_selected="Vælg" name="Select" />
-	<string name="NotFound">
+	<tab_container name="ResidentChooserTabs">
+		<panel label="Søg" name="SearchPanel">
+			<text name="InstructSearchResidentName">
+				Indtast en del af beboerens navn:
+			</text>
+			<button label="Find" label_selected="Find" name="Find"/>
+		</panel>
+		<panel label="Visitkort" name="CallingCardsPanel">
+			<text name="InstructSelectCallingCard">
+				Vælg et visitkort:
+			</text>
+		</panel>
+		<panel label="Nær ved mig" name="NearMePanel">
+			<text name="InstructSelectResident">
+				Vælg beboere i nærheden:
+			</text>
+			<button label="Gentegn liste" label_selected="Gentegn liste" name="Refresh"/>
+			<slider label="Område" name="near_me_range"/>
+			<text name="meters">
+				meter
+			</text>
+		</panel>
+	</tab_container>
+	<button label="Vælg" label_selected="Vælg" name="Select"/>
+	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
+	<string name="not_found">
 		&apos;[TEXT]&apos; ikke fundet
 	</string>
+	<string name="no_one_near">
+		Ingen i nærheden
+	</string>
+	<string name="no_results">
+		Ingen resultater
+	</string>
+	<string name="searching">
+		Søger...
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_build_options.xml b/indra/newview/skins/default/xui/da/floater_build_options.xml
index 7e5b61bd84..3b3e14ad64 100644
--- a/indra/newview/skins/default/xui/da/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/da/floater_build_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="build options floater" title="Gitter indstillinger">
-	<spinner label="Gitter enhed (meter)" name="GridResolution" />
-	<spinner label="Gitter rækkevidde (meter)" name="GridDrawSize" />
+	<spinner label="Gitter enhed (meter)" name="GridResolution" width="200" label_width="136"/>
+	<spinner label="Gitter rækkevidde (meter)" name="GridDrawSize" width="200" label_width="136"/>
 	<check_box label="Aktiver låsning til under-enheder" name="GridSubUnit" />
 	<check_box label="Vis &apos;cross sections&apos;" name="GridCrossSection" />
 	<slider label="Gitter synlighed" name="GridOpacity" />
diff --git a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
new file mode 100644
index 0000000000..77ae7fe060
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterbulkperms" title="Masse-ændring af rettigheder på indhold">
+	<text name="applyto">
+		Indholdstyper
+	</text>
+	<check_box label="Animationer" name="check_animation"/>
+	<check_box label="Kropsdele" name="check_bodypart"/>
+	<check_box label="Tøj" name="check_clothing"/>
+	<check_box label="Bevægelser" name="check_gesture"/>
+	<check_box label="Landemærker" name="check_landmark"/>
+	<check_box label="Noter" name="check_notecard"/>
+	<check_box label="Objekter" name="check_object"/>
+	<check_box label="Scripts" name="check_script"/>
+	<check_box label="Lyde" name="check_sound"/>
+	<check_box label="Teksturer" name="check_texture"/>
+	<button label="Vælg alle" label_selected="Alle" name="check_all"/>
+	<button label="Fravælg alle" label_selected="Ingen" name="check_none"/>
+	<text name="newperms">
+		Nye rettigheder
+	</text>
+	<check_box label="Del med gruppe" name="share_with_group"/>
+	<check_box label="Tillad enhver at kopiere" name="everyone_copy"/>
+	<text name="NextOwnerLabel">
+		Næste ejer kan:
+	</text>
+	<check_box label="Redigere" name="next_owner_modify"/>
+	<check_box label="Kopiére" name="next_owner_copy"/>
+	<check_box label="Sælge/Give væk" name="next_owner_transfer"/>
+	<button label="Hjælp" name="help"/>
+	<button label="Gem" name="apply"/>
+	<button label="Luk" name="close"/>
+	<string name="nothing_to_modify_text">
+		Valgte indeholder ikke noget som kan redigeres.
+	</string>
+	<string name="status_text">
+		Sætter rettigheder på [NAME]
+	</string>
+	<string name="start_text">
+		Påbegynder forespørgsel på rettighedsændringer...
+	</string>
+	<string name="done_text">
+		Afsluttet forespørgsel på rettighedsændringer.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
index da2e7dbd66..1c5876572b 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
@@ -63,6 +63,6 @@ og prøv igen.
 	<button label="Annullér" name="cancel_btn" />
 	<button label="Køb" name="buy_btn" />
 	<string name="buy_currency">
-		Buy L$ [LINDENS] for approx. US$ [USD]
+		Køb L$ [LINDENS] for ca. US$ [USD]
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml
index 9ca0c16bd3..81f66a3276 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy land" title="Køb land">
 	<text name="region_name_label">
 		Region:
@@ -6,6 +6,12 @@
 	<text name="region_name_text">
 		(ukendt)
 	</text>
+	<text name="region_type_label">
+		Type:
+	</text>
+	<text name="region_type_text">
+		(ukendt)
+	</text>
 	<text name="estate_name_label">
 		Estate:
 	</text>
@@ -22,35 +28,38 @@
 		Købt land i denne region:
 	</text>
 	<text name="resellable_clause">
-		Købt land i denne region kan eller kan ikke videresælges.
+		Kan eller kan ikke videresælges.
 	</text>
 	<text name="changeable_clause">
-		kan eller kan ikke samles eller opdeles.
+		Må eller må ikke samles eller opdeles.
 	</text>
 	<text name="covenant_text">
 		Du skal acceptere Estate reglerne:
 	</text>
+	<text left="470" name="covenant_timestamp_text"/>
 	<text_editor name="covenant_editor">
 		Indlæser...
 	</text_editor>
-	<check_box label="Jeg acceptere betingelserne der er beskrevet." name="agree_covenant" />
+	<check_box label="Jeg acceptere betingelserne der er beskrevet." name="agree_covenant"/>
 	<text name="info_parcel_label">
 		Parcel:
 	</text>
-	<text name="info_parcel" left_delta="62">
+	<text left_delta="62" name="info_parcel">
 		Scotopteryx 138,204
 	</text>
 	<text name="info_size_label" width="60">
 		Størrelse:
 	</text>
-	<text name="info_size" left_delta="62">
+	<text left_delta="62" name="info_size">
 		1024 m²
 	</text>
 	<text name="info_price_label">
 		Pris:
 	</text>
-	<text name="info_price" left_delta="62">
-		L$ 1500, objekter inkluderet
+	<text left_delta="62" name="info_price">
+		L$ 1500
+(L$ 1.1/m²)
+sælges med objekter
 	</text>
 	<text name="info_action">
 		Køb af dette land vil:
@@ -58,7 +67,7 @@
 	<text name="error_message">
 		Noget er ikke rigtigt.
 	</text>
-	<button label="Go to website" name="error_web" />
+	<button label="Go to website" name="error_web"/>
 	<text name="account_action">
 		Opgrader dig til premium medlemsskab.
 	</text>
@@ -80,8 +89,8 @@
 		Forøg dine månedlige arealanvendelse gebyrer til US $ 40/måned.
 	</text>
 	<text name="land_use_reason">
-		Du har 1.309 kvadratmeter jord. 
-Dette parcel er på 512 kvadratmeter jord.
+		You hold 1309 m² of land. 
+This parcel is 512 m² of land.
 	</text>
 	<text name="purchase_action">
 		Betal Joe Resident L$ 4000 dette areal
@@ -101,10 +110,9 @@ Dette parcel er på 512 kvadratmeter jord.
 	<text name="currency_balance">
 		Du har L$2,100.
 	</text>
-	<check_box label="Fjern [AMOUNT] kvadratmeter af bidrag fra gruppe."
-	     name="remove_contribution" />
-	<button label="K&#248;b" name="buy_btn" />
-	<button label="Annullér" name="cancel_btn" />
+	<check_box label="Fjern [AMOUNT] kvadratmeter af bidrag fra gruppe." name="remove_contribution"/>
+	<button label="Køb" name="buy_btn"/>
+	<button label="Annullér" name="cancel_btn"/>
 	<string name="can_resell">
 		Kan videresælges.
 	</string>
@@ -161,7 +169,7 @@ Prøv at vælge et mindre område.
 		Køb af dette areal vil:
 	</string>
 	<string name="buying_for_group">
-		Køb jord til gruppe:
+		Køb af dette areal vil:
 	</string>
 	<string name="cannot_buy_now">
 		Kan ikke købe nu:
@@ -179,30 +187,38 @@ Prøv at vælge et mindre område.
 		Din konto kan eje jord.
 	</string>
 	<string name="land_holdings">
-		Du har [BUYER] kvadratmeter jord.
+		Du har [BUYER] m² jord.
 	</string>
 	<string name="pay_to_for_land">
 		Betal L$ [AMOUNT] til [SELLER] for dette stykke jord
 	</string>
 	<string name="buy_for_US">
-		Køb L$ [AMOUNT] for omkring US$ [AMOUNT2] ,
+		Køb L$ [AMOUNT] for ca. US$ [AMOUNT2],
 	</string>
 	<string name="parcel_meters">
-		Dette parcel er [AMOUNT] kvadratmeter.
+		Denne parcel er [AMOUNT] m².
 	</string>
 	<string name="premium_land">
-		Dette stykke jord er premium, og vil tælle som [AMOUNT] kvadratmeter.
+		Dette stykke jord er premium, og vil tælle som [AMOUNT] m².
 	</string>
 	<string name="discounted_land">
-		Dette stykke jord er på tilbud, og vil tælle som [AMOUNT] kvadratmeter.
+		Dette stykke jord er på tilbud, og vil tælle som [AMOUNT] m².
 	</string>
 	<string name="meters_supports_object">
 		[AMOUNT] m²
-indeholder [AMOUNT2] objekter
+kan indeholder [AMOUNT2] objekter
 	</string>
 	<string name="sold_with_objects">
 		solgt med objekter
 	</string>
+	<string name="sold_without_objects">
+		objekter ikke inkluderet
+	</string>
+	<string name="info_price_string">
+		L$ [PRICE]
+(L$ [PRICE_PER_SQM]/m²)
+[SOLD_WITH_OBJECTS]
+	</string>
 	<string name="insufficient_land_credits">
 		Gruppen [GROUP] skal bruge nok tildelt jord brugs 
 kredit for at dække dette parcel før købet vil blive 
diff --git a/indra/newview/skins/default/xui/da/floater_customize.xml b/indra/newview/skins/default/xui/da/floater_customize.xml
index 0f6a59eb4a..3fceddc040 100644
--- a/indra/newview/skins/default/xui/da/floater_customize.xml
+++ b/indra/newview/skins/default/xui/da/floater_customize.xml
@@ -1,447 +1,483 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater customize" title="Appearance">
-	<tab_container name="customize tab container">
-		<panel label="Krops Dele" name="body_parts_placeholder" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater customize" title="Appearance" width="509">
+	<tab_container name="customize tab container" width="507">
+		<panel label="Krops Dele" name="body_parts_placeholder"/>
 		<panel label="Kropsbygning" name="Shape">
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
-			<button label="Krop" label_selected="Krop" name="Body" />
-			<button label="Hoved" label_selected="Hoved" name="Head" />
-			<button label="Øjne" label_selected="Øjne" name="Eyes" />
-			<button label="Ører" label_selected="Ører" name="Ears" />
-			<button label="Næse" label_selected="Næse" name="Nose" />
-			<button label="Mund" label_selected="Mund" name="Mouth" />
-			<button label="Kinder" label_selected="Kinder" name="Chin" />
-			<button label="Overkrop" label_selected="Overkrop" name="Torso" />
-			<button label="Ben" label_selected="Ben" name="Legs" />
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
+			<button label="Krop" label_selected="Krop" name="Body"/>
+			<button label="Hoved" label_selected="Hoved" name="Head"/>
+			<button label="Øjne" label_selected="Øjne" name="Eyes"/>
+			<button label="Ører" label_selected="Ører" name="Ears"/>
+			<button label="Næse" label_selected="Næse" name="Nose"/>
+			<button label="Mund" label_selected="Mund" name="Mouth"/>
+			<button label="Kinder" label_selected="Kinder" name="Chin"/>
+			<button label="Overkrop" label_selected="Overkrop" name="Torso"/>
+			<button label="Ben" label_selected="Ben" name="Legs"/>
 			<radio_group name="sex radio">
-				<radio_item type="string" length="1" name="radio">
+				<radio_item length="1" name="radio" type="string">
 					Kvinde
 				</radio_item>
-				<radio_item type="string" length="1" name="radio2">
+				<radio_item length="1" name="radio2" type="string">
 					Mand
 				</radio_item>
 			</radio_group>
-			<button label="Tilfældig" label_selected="Tilfældig" name="Randomize" />
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Vælg en ny krop ved at trække en sådan fra din beholdning
-over på din avatar. Du kan også oprette en fra bunden og bagefter &apos;tage den på&apos;.
+over på din avatar. Du kan også oprette en fra bunden 
+og bagefter &apos;tage den på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
-			<button label="Lav ny krop" label_selected="Lav ny krop" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
+			<text name="Item Action Label">
+				Figur:
+			</text>
+			<button label="Lav ny krop" label_selected="Lav ny krop" name="Create New"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
 		</panel>
 		<panel label="Hud" name="Skin">
-			<button label="Hudfarve" label_selected="Hudfarve" name="Skin Color" />
-			<button label="Detaljer" label_selected="Detaljer" name="Face Detail" />
-			<button label="Sminke" label_selected="Sminke" name="Makeup" />
-			<button label="Kropsdetaljer" label_selected="Kropsdetaljer" name="Body Detail" />
-			<text type="string" length="1" name="title">
+			<button label="Hudfarve" label_selected="Hudfarve" name="Skin Color"/>
+			<button label="Detaljer" label_selected="Detaljer" name="Face Detail"/>
+			<button label="Sminke" label_selected="Sminke" name="Makeup"/>
+			<button label="Kropsdetaljer" label_selected="Kropsdetaljer" name="Body Detail"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Tag en ny hud på ved at trække en sådan fra din beholdning
-over på din avatar. Du kan også oprette en hud fra bunden og bagefter &apos;tage den på&apos;.
+over på din avatar. Du kan også oprette en hud fra bunden 
+og bagefter &apos;tage den på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
-			<texture_picker label="Tatoveringer hoved" name="Head Tattoos" />
-			<texture_picker label="Tatoveringer overkrop" name="Upper Tattoos" />
-			<texture_picker label="Tatoveringer underkrop" name="Lower Tattoos" />
-			<button label="Tilfældig" label_selected="Tilfældig" name="Randomize" />
-			<button label="Lav ny hud" label_selected="Lav nyt hud" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
+			<text name="Item Action Label">
+				Hud:
+			</text>
+			<texture_picker width="98" label="Tatoveringer hoved" name="Head Tattoos" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker width="98" label="Tatover. overkrop" name="Upper Tattoos" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker width="98" label="Tatover. underkrop" name="Lower Tattoos" tool_tip="Klik for at vælge et billede"/>
+			<button label="Lav ny hud" label_selected="Lav nyt hud" name="Create New"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
 		<panel label="HÃ¥r" name="Hair">
-			<button label="Farve" label_selected="Farve" name="Color" />
-			<button label="Stil" label_selected="Stil" name="Style" />
-			<button label="Øjenbryn" label_selected="Øjenbryn" name="Eyebrows" />
-			<button label="Skæg" label_selected="Skæg" name="Facial" />
-			<text type="string" length="1" name="title">
+			<button label="Farve" label_selected="Farve" name="Color"/>
+			<button label="Stil" label_selected="Stil" name="Style"/>
+			<button label="Øjenbryn" label_selected="Øjenbryn" name="Eyebrows"/>
+			<button label="Skæg" label_selected="Skæg" name="Facial"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Tag et ny hår på ved at trække et fra din beholdning
-over på din avatar. Du kan også oprette et nyt hår fra bunden og bagefter &apos;tage det på&apos;.
+over på din avatar. Du kan også oprette et nyt hår fra bunden 
+og bagefter &apos;tage det på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
-			<texture_picker label="Tekstur" name="Texture" />
-			<button label="Tilfældig" label_selected="Tilfældig" name="Randomize" />
-			<button label="Lav nyt hår" label_selected="Lav nyt hår" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
+			<text name="Item Action Label">
+				HÃ¥r:
+			</text>
+			<texture_picker label="Tekstur" name="Texture" tool_tip="Klik for at vælge et billede"/>
+			<button label="Lav nyt hår" label_selected="Lav nyt hår" name="Create New"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
 		<panel label="Øjne" name="Eyes">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Tag et ny sæt øjne på ved at trække et sæt fra din beholdning
-over på din avatar. Du kan også oprette et nyt sæt øjne fra bunden og bagefter &apos;tage dem på&apos;.
+over på din avatar. Du kan også oprette et nyt sæt øjne fra bunden 
+og bagefter &apos;tage dem på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
-			<texture_picker label="Iris" name="Iris" />
-			<button label="Tilfældig" label_selected="Tilfældig" name="Randomize" />
-			<button label="Lav nye øjne" label_selected="Lav nye øjne" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
+			<text name="Item Action Label">
+				Øjne:
+			</text>
+			<texture_picker label="Iris" name="Iris" tool_tip="Klik for at vælge et billede"/>
+			<button label="Lav nye øjne" label_selected="Lav nye øjne" name="Create New"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
-		<panel label="Tøje" name="clothes_placeholder" />
+		<panel label="Tøje" name="clothes_placeholder"/>
 		<panel label="Trøje" name="Shirt">
-			<texture_picker label="Stof" name="Fabric"  />
-			<color_swatch label="Farve" name="Color/Tint" />
-			<button label="Lav ny trøje" label_selected="Lav ny trøje" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
-			<text type="string" length="1" name="title">
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
+			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+			<button label="Lav ny trøje" label_selected="Lav ny trøje" name="Create New"/>
+			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
-				Tag en ny Tøje på ved at trække en fra din beholdning 
-over på din avatar. 
+			<text length="1" name="not worn instructions" type="string">
+				Tag en ny Tøje på ved at trække en fra din beholdning over på din avatar. 
 Du kan også oprette en ny Tøje fra bunden og bagefter &apos;tage den på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
+			<text name="Item Action Label">
+				Trøje:
+			</text>
 		</panel>
 		<panel label="Bukser" name="Pants">
-			<texture_picker label="Stof" name="Fabric"  />
-			<color_swatch label="Farve" name="Color/Tint"  />
-			<button label="Lav nye bukser" label_selected="Lav nye bukser" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
-			<text type="string" length="1" name="title">
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
+			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+			<button label="Lav nye bukser" label_selected="Lav nye bukser" name="Create New"/>
+			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
-				Tag nyr bukser på ved at trække dem fra din beholdning 
-over på din avatar. 
-Du kan også oprette ny bukser fra bunden og bagefter &apos;tage dem på&apos;.
+			<text length="1" name="not worn instructions" type="string">
+				Tag nyr bukser på ved at trække dem fra din beholdning over på
+din avatar. Du kan også oprette ny bukser fra bunden og bagefter
+&apos;tage dem på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
+			<text name="Item Action Label">
+				Bukser:
+			</text>
 		</panel>
 		<panel label="Sko" name="Shoes">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Tag et ny par sko på ved at trække dem fra din beholdning
-over på din avatar. Du kan også oprette et nyt par sko fra bunden og bagefter &apos;tage dem på&apos;.
+over på din avatar. Du kan også oprette et nyt par sko fra bunden 
+og bagefter &apos;tage dem på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
-			<texture_picker label="Stof" name="Fabric"  />
-			<color_swatch label="Farve" name="Color/Tint"  />
-			<button label="Lav nye sko" label_selected="Lav nye sko" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
+			<text name="Item Action Label">
+				Sko:
+			</text>
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
+			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+			<button label="Lav nye sko" label_selected="Lav nye sko" name="Create New"/>
+			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
 		<panel label="Strømper" name="Socks">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Tag et ny par Strømper på ved at trække dem fra din beholdning
-over på din avatar. Du kan også oprette et nyt par Strømper fra bunden og bagefter &apos;tage dem på&apos;.
+over på din avatar. Du kan også oprette et nyt par Strømper fra bunden 
+og bagefter &apos;tage dem på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
-			<texture_picker label="Stof" name="Fabric" />
-			<color_swatch label="Farve" name="Color/Tint"  />
-			<button label="Lav nye strømper" label_selected="Lav nye strømper" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
+			<text name="Item Action Label">
+				Strømper:
+			</text>
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
+			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+			<button label="Lav nye strømper" label_selected="Lav nye strømper" name="Create New"/>
+			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
 		<panel label="Jakke" name="Jacket">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
-				Tag en ny jakke på ved at trække en fra din beholdning 
-over på din avatar. 
+			<text length="1" name="not worn instructions" type="string">
+				Tag en ny jakke på ved at trække en fra din beholdning over på din avatar. 
 Du kan også oprette en ny jakke fra bunden og bagefter &apos;tage den på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
-			<texture_picker label="Stof øverst" name="Upper Fabric"  />
-			<texture_picker label="Stof nederst" name="Lower Fabric"  />
-			<color_swatch label="Farve" name="Color/Tint" />
-			<button label="Lav ny jakke" label_selected="Lav ny jakke" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
+			<text name="Item Action Label">
+				Jakke:
+			</text>
+			<texture_picker label="Stof øverst" name="Upper Fabric" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Stof nederst" name="Lower Fabric" tool_tip="Klik for at vælge et billede"/>
+			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+			<button label="Lav ny jakke" label_selected="Lav ny jakke" name="Create New"/>
+			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
 		<panel label="Handsker" name="Gloves">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
-				Tag nye handsker på ved at trække et par fra din beholdning 
-over på din avatar. 
-Du kan også oprette nye handsker fra bunden og bagefter &apos;tage dem på&apos;.
+			<text length="1" name="not worn instructions" type="string">
+				Tag nye handsker på ved at trække et par fra din beholdning over på
+din avatar. Du kan også oprette nye handsker fra bunden 
+og bagefter &apos;tage dem på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
-			<texture_picker label="Stof" name="Fabric" />
-			<color_swatch label="Farve" name="Color/Tint"  />
-			<button label="Lav nye handsker" label_selected="Lav nye handsker" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
+			<text name="Item Action Label">
+				Handsker:
+			</text>
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
+			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+			<button label="Lav nye handsker" label_selected="Lav nye handsker" name="Create New"/>
+			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
 		<panel label="Undertrøje" name="Undershirt">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
-				Tag en ny undertrøje på ved at trække en fra din beholdning 
-over på din avatar. 
-Du kan også oprette en ny undertrøje fra bunden og bagefter &apos;tage den på&apos;.
+			<text length="1" name="not worn instructions" type="string">
+				Tag en ny undertrøje på ved at trække en fra din beholdning over på
+din avatar. Du kan også oprette en ny undertrøje fra bunden 
+og bagefter &apos;tage den på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
-			<texture_picker label="Stof" name="Fabric"  />
-			<color_swatch label="Farve" name="Color/Tint"  />
-			<button label="Lav ny undertrøje" label_selected="Lav ny undertrøje" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
+			<text name="Item Action Label">
+				Undertrøje:
+			</text>
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
+			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+			<button label="Lav ny undertrøje" label_selected="Lav ny undertrøje" name="Create New"/>
+			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
 		<panel label="Underbukser" name="Underpants">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
-				Tag nye underbukser på ved at trække dem fra din beholdning 
-over på din avatar. 
-Du kan også oprette en par nye underbukser fra bunden og bagefter &apos;tage dem på&apos;.
+			<text length="1" name="not worn instructions" type="string">
+				Tag nye underbukser på ved at trække dem fra din beholdning over på
+din avatar. Du kan også oprette en par nye underbukser fra bunden 
+og bagefter &apos;tage dem på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
-			<texture_picker label="Stof" name="Fabric" />
-			<color_swatch label="Farve" name="Color/Tint"  />
-			<button label="Lav nye underbukser" label_selected="Lav nye underbukser" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
+			<text name="Item Action Label">
+				Underbukser:
+			</text>
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
+			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+			<button label="Lav nye underbukser" label_selected="Lav nye underbukser" name="Create New"/>
+			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
 		<panel label="Nederdel" name="Skirt">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Kan ikke redigeres
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: indlæser...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: ikke båret
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Fundet i [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
-				Tag en ny nederdel på ved at trække en fra din beholdning 
-over på din avatar. 
-Du kan også oprette en ny nederdel fra bunden og bagefter &apos;tage den på&apos;.
+			<text length="1" name="not worn instructions" type="string">
+				Tag en ny nederdel på ved at trække en fra din beholdning over på
+din avatar. Du kan også oprette en ny nederdel fra bunden 
+og bagefter &apos;tage den på&apos;.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
-			<texture_picker label="Stof" name="Fabric"  />
-			<color_swatch label="Farve" name="Color/Tint"  />
-			<button label="Lav ny nederdel" label_selected="Lav ny nederdel" name="Create New" />
-			<button label="Tag af" label_selected="Tag af" name="Take Off" />
-			<button label="Gem" label_selected="Gem" name="Save" />
-			<button label="Gem som" label_selected="Gem som" name="Save As" />
-			<button label="Annullér" label_selected="Annullér" name="Revert" />
+			<text name="Item Action Label">
+				Nederdel:
+			</text>
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
+			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
+			<button label="Lav ny nederdel" label_selected="Lav ny nederdel" name="Create New"/>
+			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Gem" label_selected="Gem" name="Save"/>
+			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
+			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
 	</tab_container>
-	<button label="Luk" label_selected="Luk" name="Close" />
-	<button label="Gem alt" label_selected="Gem alt" name="Save All" />
-	<button label="Opret sæt" label_selected="Opret sæt" name="Make Outfit" />
+	<scroll_container left="212" name="panel_container"/>
+	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
+	<button label="OK" label_selected="OK" name="Ok"/>
+	<button label="Opret sæt..." label_selected="Opret sæt..." name="Make Outfit"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_font_test.xml b/indra/newview/skins/default/xui/da/floater_font_test.xml
new file mode 100644
index 0000000000..7d8ef1b310
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_font_test.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="contents" title="Font test">
+	<text name="linea">
+		OverrideTest, skal vises her som fonten &apos;Times&apos;. (Fra default/xui/en-us)
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
index f255250389..2f462f7a0c 100644
--- a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
@@ -7,7 +7,7 @@
 	<text type="string" length="1" name="Antialiasing:">
 		Antialiasing:
 	</text>
-	<combo_box label="Antialiasing" name="fsaa">
+	<combo_box label="Antialiasing" name="fsaa" width="100">
 		<combo_item name="FSAADisabled">
 			Slået fra
 		</combo_item>
diff --git a/indra/newview/skins/default/xui/da/floater_inspect.xml b/indra/newview/skins/default/xui/da/floater_inspect.xml
index 8361733e23..56c3f6f784 100644
--- a/indra/newview/skins/default/xui/da/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/da/floater_inspect.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" >
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="inspect" title="Inspecér objekter">
 	<scroll_list name="object_list" tool_tip="Vælg et objekt fra listen for at markere det">
-		<column label="Objekt navn" name="object_name" />
-		<column label="Objekt ejer" name="owner_name" />
-		<column label="Bygget af" name="creator_name" />
-		<column label="Lavet den " name="creation_date" />
+		<column label="Objekt navn" name="object_name"/>
+		<column label="Objekt ejer" name="owner_name"/>
+		<column label="Bygget af" name="creator_name"/>
+		<column label="Lavet den " name="creation_date"/>
 	</scroll_list>
-	<button label="Se profil for ejer..." label_selected="" name="button owner"
-	     tool_tip="Se profilen for ejeren af det markerede objekt på listen" />
-	<button label="Se profil for bygger..." label_selected="" name="button creator"
-	     tool_tip="Se profilen for den beboer der har bygget det markerede objekt på listen" />
+	<button label="Se profil for ejer..." label_selected="" name="button owner" tool_tip="Se profilen for ejeren af det markerede objekt på listen"/>
+	<button label="Se profil for bygger..." label_selected="" name="button creator" tool_tip="Se profilen for den beboer der har bygget det markerede objekt på listen"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml
index 72439ac4e0..7a4d570f85 100644
--- a/indra/newview/skins/default/xui/da/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/da/floater_joystick.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="Joystick opsætning">
 	<check_box name="enable_joystick">
 		Aktiver Joystick:
 	</check_box>
-	<spinner label="X akse mapping" name="JoystickAxis1" />
-	<spinner label="Y akse mapping" name="JoystickAxis2" />
-	<spinner label="Z akse mapping" name="JoystickAxis0" />
-	<spinner label="Hældning mapping" name="JoystickAxis4" />
-	<spinner label="Drejning mapping" name="JoystickAxis5" />
-	<spinner label="Rulning mapping" name="JoystickAxis3" />
-	<spinner label="Zoom mapping" name="JoystickAxis6" />
-	<check_box label="Direkte zoom" name="ZoomDirect" />
-	<check_box label="3D Cursor" name="Cursor3D" />
-	<check_box label="Auto opret" name="AutoLeveling" />
-	<text type="string" length="1" name="Control Modes:">
+	<spinner label="X akse mapping" name="JoystickAxis1"/>
+	<spinner label="Y akse mapping" name="JoystickAxis2"/>
+	<spinner label="Z akse mapping" name="JoystickAxis0"/>
+	<spinner label="Hældning mapping" name="JoystickAxis4"/>
+	<spinner label="Drejning mapping" name="JoystickAxis5"/>
+	<spinner label="Rulning mapping" name="JoystickAxis3"/>
+	<spinner label="Zoom mapping" name="JoystickAxis6"/>
+	<check_box label="Direkte zoom" name="ZoomDirect"/>
+	<check_box label="3D Cursor" name="Cursor3D"/>
+	<check_box label="Auto opret" name="AutoLeveling"/>
+	<text length="1" name="Control Modes:" type="string">
 		Kontrollér:
 	</text>
 	<check_box name="JoystickAvatarEnabled">
@@ -64,18 +64,20 @@
 	<text name="Feathering">
 		Respons
 	</text>
-	<slider label="" name="AvatarFeathering" />
-	<slider label="" name="BuildFeathering" />
-	<slider label="" name="FlycamFeathering" />
+	<slider label="" name="AvatarFeathering"/>
+	<slider label="" name="BuildFeathering"/>
+	<slider label="" name="FlycamFeathering"/>
 	<text name="ZoomScale2">
 		Zoom følsomhed
 	</text>
-	<spinner label="" name="FlycamAxisScale6" />
+	<spinner label="" name="FlycamAxisScale6"/>
 	<text name="ZoomDeadZone">
 		Zoom min. udslag
 	</text>
-	<spinner label="" name="FlycamAxisDeadZone6" />
-	<button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults" />
+	<spinner label="" name="FlycamAxisDeadZone6"/>
+	<button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults"/>
+	<button label="OK" label_selected="OK" name="ok_btn"/>
+	<button label="Annullér" label_selected="Annullér" name="cancel_btn"/>
 	<string name="JoystickMonitor">
 		Joystick Overvågning
 	</string>
diff --git a/indra/newview/skins/default/xui/da/floater_lagmeter.xml b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
index b2cbebfe52..7e7c2dc0d3 100644
--- a/indra/newview/skins/default/xui/da/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
@@ -1,29 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_lagmeter" title="Lag måler">
-	<button label="" label_selected="" name="client_lagmeter" />
+	<button label="" label_selected="" name="client_lagmeter" tool_tip="Status for klient lag"/>
 	<text name="client">
 		Klient:
 	</text>
 	<text name="client_text">
 		Normal
 	</text>
-	<button label="" label_selected="" name="network_lagmeter"
-	     tool_tip="Network lag status" />
+	<button label="" label_selected="" name="network_lagmeter" tool_tip="Network lag status"/>
 	<text name="network">
 		Netværk:
 	</text>
 	<text name="network_text">
 		Normal
 	</text>
-	<button label="" label_selected="" name="server_lagmeter" />
+	<button label="" label_selected="" name="server_lagmeter" tool_tip="Status for server lag"/>
 	<text name="server">
 		Server:
 	</text>
 	<text name="server_text">
 		Normal
 	</text>
-	<button label="?" name="server_help" />
-	<button label="&gt;&gt;" name="minimize" />
+	<button label="?" name="server_help"/>
+	<button label="&gt;&gt;" name="minimize"/>
 	<string name="max_title_msg">
 		Lag måler
 	</string>
@@ -126,9 +125,6 @@
 	<string name="server_frame_time_normal_msg">
 		Normal
 	</string>
-	<string name="server_frame_time_normal_msg">
-		Normal
-	</string>
 	<string name="server_physics_cause_msg">
 		Mulig årsag: For mange fysiske objekter
 	</string>
diff --git a/indra/newview/skins/default/xui/da/floater_land_holdings.xml b/indra/newview/skins/default/xui/da/floater_land_holdings.xml
index fcb159664c..bd623e7b75 100644
--- a/indra/newview/skins/default/xui/da/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/da/floater_land_holdings.xml
@@ -1,19 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="land holdings floater" title="Mit land">
 	<scroll_list name="parcel list">
-		<column label="Navn" name="name" />
-		<column label="Lokation" name="location" />
-		<column label="Område" name="area" />
-		<column label="" name="hidden" />
+		<column label="Navn" name="name"/>
+		<column label="Region" name="location"/>
+		<column label="Type" name="type"/>
+		<column label="Område" name="area"/>
+		<column label="" name="hidden"/>
 	</scroll_list>
-	<button label="Teleport" label_selected="Teleport" name="Teleport"  />
-	<button label="Vis på kort" label_selected="Vis på kort" name="Show on Map"  />
+	<button label="Teleport" label_selected="Teleport" name="Teleport" tool_tip="Teleport til centrum på dette land."/>
+	<button label="Vis på kort" label_selected="Vis på kort" name="Show on Map" tool_tip="Vis dette land på verdenskortet."/>
 	<text name="contrib_label">
 		Bidrag til dine grupper:
 	</text>
 	<scroll_list name="grant list">
-		<column label="Gruppe" name="group" />
-		<column label="Område" name="area" />
+		<column label="Gruppe" name="group"/>
+		<column label="Område" name="area"/>
 	</scroll_list>
 	<text name="allowed_label">
 		Tilladt land ifølge nuværende betalingsaftale:
diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
index 07ea6930ea..d345409859 100644
--- a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="script ed float" title="LSL Wiki">
 	<check_box label="Følg markøreren" name="lock_check" />
-	<combo_box label="LÃ¥s" name="history_combo" />
+	<combo_box label="LÃ¥s" name="history_combo" left_delta="114" width="70"/>
 	<button label="Tilbage" name="back_btn" />
 	<button label="Frem" name="fwd_btn" />
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_perm_prefs.xml b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml
new file mode 100644
index 0000000000..f4b9b0a664
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="perm prefs" title="Standard tilladelser ved hentning">
+	<panel label="Tilladelser" name="permissions">
+		<button label="?" label_selected="?" name="help"/>
+		<check_box label="Del med gruppe" name="share_with_group"/>
+		<check_box label="Tillad enhver at kopiere" name="everyone_copy"/>
+		<text name="NextOwnerLabel">
+			Næste ejer kan:
+		</text>
+		<check_box label="Redigere" name="next_owner_modify"/>
+		<check_box label="Kopiére" name="next_owner_copy"/>
+		<check_box label="Sælge/Give væk" name="next_owner_transfer"/>
+	</panel>
+	<button label="OK" label_selected="OK" name="ok"/>
+	<button label="Annullér" label_selected="Annullér" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
index cf3445e1a6..5a45f7750c 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gesture_preview">
 	<string name="stop_txt">
 		Stop
@@ -15,27 +15,31 @@
 	<text name="trigger_label">
 		Udløser:
 	</text>
-	<text name="replace_text"
-	     tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!">
+	<text name="replace_text" tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!">
 		Erstat med:
 	</text>
-	<line_editor name="replace_editor"
-	     tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture" />
+	<line_editor name="replace_editor" tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"/>
 	<text name="key_label">
 		Genvejstast:
 	</text>
-	<combo_box label="Ingen" name="modifier_combo" />
-	<combo_box label="Ingen" name="key_combo" />
+	<combo_box label="Ingen" name="modifier_combo" width="60"/>
+	<combo_box label="Ingen" name="key_combo" left_delta="70" width="60"/>
 	<text name="library_label">
 		Type:
 	</text>
 	<text name="steps_label">
 		Trin:
 	</text>
-	<button label="Tilføj &gt;&gt;" name="add_btn" />
-	<button label="Flyt op" name="up_btn" />
-	<button label="Flyt ned" name="down_btn" />
-	<button label="Fjern" name="delete_btn" />
+	<scroll_list name="library_list">
+		Animation
+Lyd
+Chat
+Vent
+	</scroll_list>
+	<button label="Tilføj &gt;&gt;" name="add_btn"/>
+	<button label="Flyt op" name="up_btn"/>
+	<button label="Flyt ned" name="down_btn"/>
+	<button label="Fjern" name="delete_btn"/>
 	<text name="help_label">
 		Alle trin vil ske samtidigt,
 medmindre du tilføjer vente trin.
@@ -48,9 +52,9 @@ medmindre du tilføjer vente trin.
 			Stop
 		</radio_item>
 	</radio_group>
-	<check_box label="Indtil animation er færdig" name="wait_anim_check" />
-	<check_box label="tid i sekunder" name="wait_time_check" />
-	<check_box label="Aktiv" name="active_check" />
-	<button label="Vis" name="preview_btn" />
-	<button label="Gem" name="save_btn" />
+	<check_box label="Indtil animation er færdig" name="wait_anim_check"/>
+	<check_box label="tid i sekunder" name="wait_time_check"/>
+	<check_box label="Aktiv" name="active_check" tool_tip="Aktive bevægelser kan blive aktiveret ved at skrive deress udløser tekst eller ved at trykke på genvejstaste. Bevægelser vil normalt være inaktive hvis der allerede findes en tilsvarende genvejstaste."/>
+	<button label="Vis" name="preview_btn"/>
+	<button label="Gem" name="save_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
index c9bee41b6a..169172222f 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview notecard" title="Note:">
-	<button label="Gem" label_selected="Gem" name="Save" />
-	<text type="string" length="1" name="desc txt">
+	<button label="Gem" label_selected="Gem" name="Save"/>
+	<text length="1" name="desc txt" type="string">
 		Beskrivelse:
 	</text>
-	<text_editor type="string" length="1" name="Notecard Editor">
+	<text_editor length="1" name="Notecard Editor" type="string">
 		Indlæser...
 	</text_editor>
+	<string name="no_object">
+		Kunne ikke finde objekt der indeholder denne note.
+	</string>
 	<string name="not_allowed">
 		Du har ikke tilladelse til at læse denne note.
 	</string>
diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
index 64e39da8fe..471222e08d 100644
--- a/indra/newview/skins/default/xui/da/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="Rapportér misbrug">
-	<texture_picker label="" name="screenshot" />
-	<check_box label="Inkludér billede" name="screen_check" />
+	<texture_picker label="" name="screenshot"/>
+	<check_box label="Inkludér billede" name="screen_check"/>
 	<text name="reporter_title">
 		Anmelder:
 	</text>
@@ -23,22 +23,20 @@
 	<text name="select_object_label">
 		Klik på knappen derefter objektet:
 	</text>
-	<button label="" label_selected="" name="pick_btn"
-	     tool_tip="Objekt vælger - Identificér et objekt denne rapport omhandler" />
+	<button label="" label_selected="" name="pick_btn" tool_tip="Objekt vælger - Identificér et objekt denne rapport omhandler"/>
 	<text name="object_name_label">
 		Navn:
 	</text>
-	<text name="object_name">
+	<text name="object_name" left_delta="64" width="140">
 		Consetetur Sadipscing
 	</text>
 	<text name="owner_name_label">
 		Ejer:
 	</text>
-	<text name="owner_name">
+	<text name="owner_name" left_delta="64">
 		Hendrerit Vulputate
 	</text>
-	<combo_box name="category_combo"
-	     tool_tip="Kategori -- Vælg en kategori der passer bedst på denne rapport">
+	<combo_box name="category_combo" tool_tip="Kategori -- Vælg en kategori der passer bedst på denne rapport">
 		<combo_item name="Select_category">
 			Vælg kategori
 		</combo_item>
@@ -48,9 +46,9 @@
 		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
 			Alder &gt; Voksen beboer på Teen Second Life
 		</combo_item>
-		
-		
-		
+		<combo_item name="Age__Underage_resident_outside_of_Teen_Second_Life">
+			Alder &gt; Mindreårig beboer udenfor Teen Second Life
+		</combo_item>
 		<combo_item name="Assault__Combat_sandbox___unsafe_area">
 			Overfald &gt; Kamp sandkasse / Usikkert område
 		</combo_item>
@@ -120,15 +118,15 @@
 		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
 			Uanstændighed &gt; Meget stødende indhold eller adfærd
 		</combo_item>
-		
-		
-		
 		<combo_item name="Indecency__Inappropriate_avatar_name">
 			Uanstændighed &gt; Upassende avatar navn
 		</combo_item>
-		
-		
-		
+		<combo_item name="Indecency__Mature_content_in_PG_region">
+			Usømmelighed &gt; Upassende inhold eller opførsel i en &apos;PG&apos; region
+		</combo_item>
+		<combo_item name="Indecency__Inappropriate_content_in_Mature_region">
+			Usømmelighed &gt; Upassende inhold eller opførsel i en &apos;Mature&apos; region
+		</combo_item>
 		<combo_item name="Intellectual_property_infringement_Content_Removal">
 			Krænkelse af intellektuelle ejendomsrettigheder &gt; Indholds fjernelse
 		</combo_item>
@@ -160,10 +158,8 @@
 	<text name="abuser_name_title">
 		Udøvers navn:
 	</text>
-	<button label="Vælg beboer" label_selected="" name="select_abuser"
-	     tool_tip="Vælg navnet på udøveren fra denne liste" />
-	<check_box label="Kender ikke udøvers navn" name="omit_abuser_name"
-	     tool_tip="Afkryds her, hvis du ikke kender navn på udøvers" />
+	<button label="Vælg beboer" label_selected="" name="select_abuser" tool_tip="Vælg navnet på udøveren fra denne liste"/>
+	<check_box label="Kender ikke udøvers navn" name="omit_abuser_name" tool_tip="Afkryds her, hvis du ikke kender navn på udøvers"/>
 	<text name="abuser_name_title2">
 		Sted for misbrug/overgreb:
 	</text>
@@ -174,11 +170,12 @@
 		Detaljer:
 	</text>
 	<text name="bug_aviso">
-		Vær venligst præcis omkring dato, sted, overgrebets natur, relevant chat/IM og vælg objekt hvis muligt.
+		Vær venligst præcis omkring dato, sted, overgrebets 
+natur, relevant chat/IM og vælg objekt hvis muligt.
 	</text>
 	<text name="incomplete_title">
 		Note: Ufuldstændige rapporter vil ikke blive undersøgt.
 	</text>
-	<button label="Annullér" label_selected="Annullér" name="cancel_btn" />
-	<button label="Rapporter misbrug" label_selected="Rapporter misbrug" name="send_btn" />
+	<button label="Annullér" label_selected="Annullér" name="cancel_btn"/>
+	<button label="Rapporter misbrug" label_selected="Rapporter misbrug" name="send_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml
index 8fc98220db..5b51d5f500 100644
--- a/indra/newview/skins/default/xui/da/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Snapshot" title="Se foto">
 	<text name="type_label">
 		Hvor skal foto hen?
@@ -17,13 +17,20 @@
 	<text name="file_size_label">
 		Fil størrelse: [SIZE] KB
 	</text>
-	<button label="Tag nyt foto" name="new_snapshot_btn" />
-	<button label="Send" name="send_btn" />
-	<button label="Gem (L$[AMOUNT])" name="upload_btn" />
-	<flyout_button label="Gem" name="save_btn"  />
-	<button label="Annullér" name="discard_btn" />
-	<button label="Mere &gt;&gt;" name="more_btn"  />
-	<button label="&lt;&lt; Mindre" name="less_btn"  />
+	<button label="Tag nyt foto" name="new_snapshot_btn"/>
+	<button label="Send" name="send_btn"/>
+	<button label="Gem (L$[AMOUNT])" name="upload_btn"/>
+	<flyout_button label="Gem" name="save_btn" tool_tip="Gem billede i på din computer">
+		<flyout_button_item name="save_item">
+			Gem
+		</flyout_button_item>
+		<flyout_button_item name="saveas_item">
+			Gem som...
+		</flyout_button_item>
+	</flyout_button>
+	<button label="Annullér" name="discard_btn"/>
+	<button label="Mere &gt;&gt;" name="more_btn" tool_tip="Avancerede valg"/>
+	<button label="&lt;&lt; Mindre" name="less_btn" tool_tip="Avancerede valg"/>
 	<text name="type_label2">
 		Størrelse
 	</text>
@@ -90,7 +97,7 @@
 			Manuelt
 		</combo_item>
 	</combo_box>
-	<combo_box label="Fil-format" name="local_format_combo">
+	<combo_box label="Fil-format" name="local_format_combo" width="76">
 		<combo_item name="PNG">
 			PNG
 		</combo_item>
@@ -101,10 +108,10 @@
 			BMP
 		</combo_item>
 	</combo_box>
-	<spinner label="Bredde" name="snapshot_width" />
-	<spinner label="Højde" name="snapshot_height" />
-	<check_box label="Fasthold proportioner" name="keep_aspect_check" />
-	<slider label="Billed-kvalitet" name="image_quality_slider" />
+	<spinner label="Bredde" name="snapshot_width" label_width="41" width="101"/>
+	<spinner label="Højde" name="snapshot_height" label_width="32" width="92" left="117"/>
+	<check_box label="Fasthold proportioner" name="keep_aspect_check"/>
+	<slider label="Billed-kvalitet" name="image_quality_slider"/>
 	<text name="layer_type_label">
 		Benyt:
 	</text>
@@ -119,9 +126,12 @@
 			Materinger
 		</combo_item>
 	</combo_box>
-	<check_box label="Vis brugerflade på foto" name="ui_check" />
-	<check_box label="Vis HUD objekter på foto" name="hud_check" />
-	<check_box label="Luk ikke vindue ved gemning" name="keep_open_check" />
-	<check_box label="Frys billede og vis" name="freeze_frame_check" />
-	<check_box label="Auto-opdater" name="auto_snapshot_check" />
+	<check_box label="Vis brugerflade på foto" name="ui_check"/>
+	<check_box label="Vis HUD objekter på foto" name="hud_check"/>
+	<check_box label="Luk ikke vindue ved gemning" name="keep_open_check"/>
+	<check_box label="Frys billede og vis" name="freeze_frame_check"/>
+	<check_box label="Auto-opdater" name="auto_snapshot_check"/>
+	<string name="unknown">
+		ukendt
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_sound_preview.xml b/indra/newview/skins/default/xui/da/floater_sound_preview.xml
index c0d2f76ea9..606d290e1d 100644
--- a/indra/newview/skins/default/xui/da/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_sound_preview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Name/Description" title="sound.wav">
+<floater name="Sound Preview" title="sound.wav">
 	<text name="name_label">
 		Navn:
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_statistics.xml b/indra/newview/skins/default/xui/da/floater_statistics.xml
new file mode 100644
index 0000000000..0443553d50
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_statistics.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="stats floater" title="Statistik"/>
diff --git a/indra/newview/skins/default/xui/da/floater_telehub.xml b/indra/newview/skins/default/xui/da/floater_telehub.xml
index 32c5448508..cd1fb33831 100644
--- a/indra/newview/skins/default/xui/da/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/da/floater_telehub.xml
@@ -14,15 +14,15 @@
 	</text>
 	<button label="Forbind telehub" name="connect_btn" />
 	<button label="Afslut" name="disconnect_btn" />
-	<text name="spawn_points_text">
+	<text name="spawn_points_text" width="300">
 		Ankomst punkter (positioner, ikke objekter):
 	</text>
 	<button label="Tilføj punkt" name="add_spawn_point_btn" />
 	<button label="Fjern punkt" name="remove_spawn_point_btn" />
 	<text name="spawn_point_help">
-		Vælg objekt og klik på &apos;Tilføj punkt&apos;for at angive position.
-Du kan derefter flytte eller slette objektet.
-Positioner er i forhold til telehub center.
+		Vælg objekt og klik på &apos;Tilføj punkt&apos;for at angive 
+position. Du kan derefter flytte eller slette 
+objektet. Positioner er i forhold til telehub center.
 Vælg emne i listen for at vise position i verden.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
index bc15db0e25..0cd5f682fa 100644
--- a/indra/newview/skins/default/xui/da/floater_tools.xml
+++ b/indra/newview/skins/default/xui/da/floater_tools.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="toolbox floater" title="">
-	<button label="" label_selected="" name="button focus" tool_tip="Fokus" />
-	<button label="" label_selected="" name="button move" tool_tip="Flyt" />
-	<button label="" label_selected="" name="button edit" tool_tip="Redigér" />
-	<button label="" label_selected="" name="button create" tool_tip="Opret" />
-	<button label="" label_selected="" name="button land" tool_tip="Land" />
-	<check_box label="Zoom" name="radio zoom" />
-	<check_box label="Kredsløb (Ctrl)" name="radio orbit" />
-	<check_box label="Panorér (Ctrl-Shift)" name="radio pan" />
-	<check_box label="Flyt" name="radio move" />
-	<check_box label="Løft (Ctrl)" name="radio lift" />
-	<check_box label="Spin (Ctrl-Shift)" name="radio spin" />
-	<check_box label="Position" name="radio position" />
-	<check_box label="Rotér (Ctrl)" name="radio rotate" />
-	<check_box label="Stræk (Ctrl-Shift)" name="radio stretch" />
-	<check_box label="Vælg tekstur" name="radio select face" />
-	<check_box label="Redigér sammenlænkede dele" name="checkbox edit linked parts" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="toolbox floater" title="" short_title="Byg">
+	<button label="" label_selected="" name="button focus" tool_tip="Fokus"/>
+	<button label="" label_selected="" name="button move" tool_tip="Flyt"/>
+	<button label="" label_selected="" name="button edit" tool_tip="Redigér"/>
+	<button label="" label_selected="" name="button create" tool_tip="Opret"/>
+	<button label="" label_selected="" name="button land" tool_tip="Land"/>
+	<check_box label="Zoom" name="radio zoom"/>
+	<check_box label="Kredsløb (Ctrl)" name="radio orbit"/>
+	<check_box label="Panorér (Ctrl-Shift)" name="radio pan"/>
+	<check_box label="Flyt" name="radio move"/>
+	<check_box label="Løft (Ctrl)" name="radio lift"/>
+	<check_box label="Spin (Ctrl-Shift)" name="radio spin"/>
+	<check_box label="Position" name="radio position"/>
+	<check_box label="Rotér (Ctrl)" name="radio rotate"/>
+	<check_box label="Stræk (Ctrl-Shift)" name="radio stretch"/>
+	<check_box label="Vælg tekstur" name="radio select face"/>
+	<check_box label="Redigér sammenlænkede dele" name="checkbox edit linked parts"/>
 	<text name="text ruler mode">
 		Lineal:
 	</text>
@@ -30,58 +30,55 @@
 			Reference
 		</combo_item>
 	</combo_box>
-	<check_box label="Stræk begge sider" name="checkbox uniform" />
-	<check_box label="Stræk teksturer" name="checkbox stretch textures" />
-	<check_box label="Benyt gitter" name="checkbox snap to grid" />
-	<button label="Valg..." label_selected="Valg..." name="Options..." />
+	<check_box label="Stræk begge sider" name="checkbox uniform"/>
+	<check_box label="Stræk teksturer" name="checkbox stretch textures"/>
+	<check_box label="Benyt gitter" name="checkbox snap to grid"/>
+	<button label="Valg..." label_selected="Valg..." name="Options..." height="18" bottom_delta="-15"/>
 	<text name="text status">
 		Træk for at flytte, shift+træk for at kopiere
 	</text>
-	<button label="" label_selected="" name="ToolCube" tool_tip="Terning" />
-	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisme" />
-	<button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide" />
-	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraed" />
-	<button label="" label_selected="" name="ToolCylinder" tool_tip="Cylinder" />
-	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Hemicylinder" />
-	<button label="" label_selected="" name="ToolCone" tool_tip="Kegle" />
-	<button label="" label_selected="" name="ToolHemiCone" tool_tip="Hemikegle" />
-	<button label="" label_selected="" name="ToolSphere" tool_tip="Sfære" />
-	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="Hemisfære" />
-	<button label="" label_selected="" name="ToolTorus" tool_tip="Kuglering" />
-	<button label="" label_selected="" name="ToolTube" tool_tip="Rør" />
-	<button label="" label_selected="" name="ToolRing" tool_tip="Ring" />
-	<button label="" label_selected="" name="ToolTree" tool_tip="Træ" />
-	<button label="" label_selected="" name="ToolGrass" tool_tip="Græs" />
-	<check_box label="Hold værktøjet valgt" name="checkbox sticky" />
-	<check_box label="Kopiér valgte" name="checkbox copy selection" />
-	<check_box label="Centréret kopi" name="checkbox copy centers" />
-	<check_box label="Rotér kopi" name="checkbox copy rotates" />
-	<check_box label="Vælg land" name="radio select land" />
-	<check_box label="Udflad land" name="radio flatten" />
-	<check_box label="Hæv land" name="radio raise" />
-	<check_box label="Sænk land" name="radio lower" />
-	<check_box label="Udjævn land" name="radio smooth" />
-	<check_box label="Gør land ujævnt" name="radio noise" />
-	<check_box label="Tilbagefør" name="radio revert" />
-	<combo_box name="combobox brush size">
-		<combo_item name="Small">
-			Lille
-		</combo_item>
-		<combo_item name="Medium">
-			Mellem
-		</combo_item>
-		<combo_item name="Large">
-			Stor
-		</combo_item>
-	</combo_box>
-	<text type="string" length="1" name="Strength:">
-		Styrke:
+	<button label="" label_selected="" name="ToolCube" tool_tip="Terning"/>
+	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisme"/>
+	<button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/>
+	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraed"/>
+	<button label="" label_selected="" name="ToolCylinder" tool_tip="Cylinder"/>
+	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Hemicylinder"/>
+	<button label="" label_selected="" name="ToolCone" tool_tip="Kegle"/>
+	<button label="" label_selected="" name="ToolHemiCone" tool_tip="Hemikegle"/>
+	<button label="" label_selected="" name="ToolSphere" tool_tip="Sfære"/>
+	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="Hemisfære"/>
+	<button label="" label_selected="" name="ToolTorus" tool_tip="Kuglering"/>
+	<button label="" label_selected="" name="ToolTube" tool_tip="Rør"/>
+	<button label="" label_selected="" name="ToolRing" tool_tip="Ring"/>
+	<button label="" label_selected="" name="ToolTree" tool_tip="Træ"/>
+	<button label="" label_selected="" name="ToolGrass" tool_tip="Græs"/>
+	<check_box label="Hold værktøjet valgt" name="checkbox sticky"/>
+	<check_box label="Kopiér valgte" name="checkbox copy selection"/>
+	<check_box label="Centreret kopi" name="checkbox copy centers"/>
+	<check_box label="Rotér" name="checkbox copy rotates"/>
+	<check_box label="Vælg land" name="radio select land"/>
+	<check_box label="Udflad" name="radio flatten"/>
+	<check_box label="Hæv" name="radio raise"/>
+	<check_box label="Sænk" name="radio lower"/>
+	<check_box label="Udjævn" name="radio smooth"/>
+	<check_box label="Gør ujævn" name="radio noise"/>
+	<check_box label="Tilbagefør" name="radio revert"/>
+	<button label="Gem" label_selected="Gem" name="button apply to selection" tool_tip="Redigér valgt land"/>
+	<text name="Bulldozer:">
+		Bulldozer:
+	</text>
+	<text name="Dozer Size:">
+		Størrelse
+	</text>
+	<text length="1" name="Strength:" type="string">
+		Styrke
+	</text>
+	<text name="obj_count">
+		Valgte objekter: [COUNT]
+	</text>
+	<text name="prim_count">
+		prims: [COUNT]
 	</text>
-	<button label="Anvend på valgte" label_selected="Anvend på valgte"
-	     name="button apply to selection" tool_tip="Redigér valgt land" />
-	<check_box label="Vis ejere" name="checkbox show owners" />
-	<button label="Mere &gt;&gt;" name="button more" tool_tip="Adancerede valgmuligheder" />
-	<button label="&lt;&lt; Mindre" name="button less" tool_tip="Adancerede valgmuligheder" />
 	<tab_container name="Object Info Tabs">
 		<panel label="Generelt" name="General">
 			<text name="Name:">
@@ -96,45 +93,39 @@
 			<text name="Creator Name">
 				Thrax Linden
 			</text>
-			<button label="Profil..." label_selected="Profil..." name="button creator profile" />
+			<button label="Profil..." label_selected="Profil..." name="button creator profile"/>
 			<text name="Owner:">
 				Ejer:
 			</text>
 			<text name="Owner Name">
 				Thrax Linden
 			</text>
-			<button label="Profil..." label_selected="Profil..." name="button owner profile" />
+			<button label="Profil..." label_selected="Profil..." name="button owner profile"/>
 			<text name="Group:">
 				Gruppe:
 			</text>
 			<text name="Group Name Proxy">
 				The Lindens
 			</text>
-			<button label="Sæt..." label_selected="Sæt..." name="button set group" />
-			<text name="prim info">
-				1 Objekt, 1 Prim
-			</text>
+			<button label="Sæt..." label_selected="Sæt..." name="button set group"/>
 			<text name="Permissions:">
 				Tilladelser:
 			</text>
 			<text name="perm_modify">
 				Du kan redigére dette objekt.
 			</text>
-			<check_box label="Del med gruppe" name="checkbox share with group"
-			     tool_tip="Tillad gruppemedlemmer at flytte, ændre, kopiere og slette." />
+			<check_box label="Del med gruppe" name="checkbox share with group" tool_tip="Tillad gruppemedlemmer at flytte, ændre, kopiere og slette."/>
 			<string name="text deed continued">
 				Deed...
 			</string>
 			<string name="text deed">
 				Deed
 			</string>
-			<button label="Dedikér..." label_selected="Dedikér..." name="button deed"
-			     tool_tip="Gruppedelte genstande kan dedikeres af en gruppeadministrator." />
-			<check_box label="Tillad enhver at flytte" name="checkbox allow everyone move" />
-			<check_box label="Tillad enhver at kopiére" name="checkbox allow everyone copy" />
-			<check_box label="Vis i søgning" name="search_check"
-			     tool_tip="Lad folk se dette objekt i søgeresultater" />
-			<check_box label="Til salg" name="checkbox for sale" />
+			<button label="Dedikér..." label_selected="Dedikér..." name="button deed" tool_tip="Gruppedelte genstande kan dedikeres af en gruppeadministrator."/>
+			<check_box label="Tillad enhver at flytte" name="checkbox allow everyone move"/>
+			<check_box label="Tillad enhver at kopiére" name="checkbox allow everyone copy"/>
+			<check_box label="Vis i søgning" name="search_check" tool_tip="Lad folk se dette objekt i søgeresultater"/>
+			<check_box label="Til salg" name="checkbox for sale"/>
 			<text name="Cost">
 				Pris:  L$
 			</text>
@@ -152,9 +143,9 @@
 			<text name="Next owner can:">
 				Næste ejer kan:
 			</text>
-			<check_box label="Redigére" name="checkbox next owner can modify" />
-			<check_box label="Kopiére" name="checkbox next owner can copy" />
-			<check_box label="Sælge/Give væk" name="checkbox next owner can transfer" />
+			<check_box label="Redigére" name="checkbox next owner can modify"/>
+			<check_box label="Kopiére" name="checkbox next owner can copy" left_delta="80"/>
+			<check_box label="Sælge/Give væk" name="checkbox next owner can transfer" left_delta="67"/>
 			<text name="label click action">
 				NÃ¥r der venstreklikkes:
 			</text>
@@ -199,6 +190,36 @@
 			<text name="F:">
 				F:
 			</text>
+			<string name="text modify info 1">
+				Du kan redigere dette objekt
+			</string>
+			<string name="text modify info 2">
+				Du kan redigere disse objekter
+			</string>
+			<string name="text modify info 3">
+				Du kan ikke redigere dette objekt.
+			</string>
+			<string name="text modify info 4">
+				Du kan ikke redigere disse objekter.
+			</string>
+			<string name="text modify warning">
+				Du skal vælge hele objektet for at sætte rettigheder.
+			</string>
+			<string name="Cost Default">
+				Pris:            L$
+			</string>
+			<string name="Cost Total">
+				Total pris:   L$
+			</string>
+			<string name="Cost Per Unit">
+				Pris Pr:       L$
+			</string>
+			<string name="Cost Mixed">
+				Blandet pris
+			</string>
+			<string name="Sale Mixed">
+				Blandet salg
+			</string>
 		</panel>
 		<panel label="Objekt" name="Object">
 			<text name="select_single">
@@ -207,32 +228,28 @@
 			<text name="edit_object">
 				Ret objektets indstillinger:
 			</text>
-			<check_box label="LÃ¥st" name="checkbox locked"
-			     tool_tip="Forhindrer objektet i at blive flyttet eller slettet. Ofte brugbar under byggeri for at forhindre utilsigtet ændring." />
-			<check_box label="Fysisk" name="Physical Checkbox Ctrl"
-			     tool_tip="Tillader objekter at blive skubbet og at være påvirkelig af tyngdekraften" />
-			<check_box label="Temporær" name="Temporary Checkbox Ctrl"
-			     tool_tip="Medfårer at objekter bliver slettet 1 minut efter de er skabt." />
-			<check_box label="Uden masse" name="Phantom Checkbox Ctrl"
-			     tool_tip="FÃ¥r objektet til ikke at kollidere med andre objekter eller personer" />
+			<check_box label="Låst" name="checkbox locked" tool_tip="Forhindrer objektet i at blive flyttet eller slettet. Ofte brugbar under byggeri for at forhindre utilsigtet ændring."/>
+			<check_box label="Fysisk" name="Physical Checkbox Ctrl" tool_tip="Tillader objekter at blive skubbet og at være påvirkelig af tyngdekraften"/>
+			<check_box label="Temporær" name="Temporary Checkbox Ctrl" tool_tip="Medfårer at objekter bliver slettet 1 minut efter de er skabt."/>
+			<check_box label="Uden masse" name="Phantom Checkbox Ctrl" tool_tip="FÃ¥r objektet til ikke at kollidere med andre objekter eller personer"/>
 			<text name="label position">
 				Position (meter)
 			</text>
-			<spinner label="X" name="Pos X" />
-			<spinner label="Y" name="Pos Y" />
-			<spinner label="Z" name="Pos Z" />
+			<spinner label="X" name="Pos X"/>
+			<spinner label="Y" name="Pos Y"/>
+			<spinner label="Z" name="Pos Z"/>
 			<text name="label size">
 				Størrelse (meter)
 			</text>
-			<spinner label="X" name="Scale X" />
-			<spinner label="Y" name="Scale Y" />
-			<spinner label="Z" name="Scale Z" />
+			<spinner label="X" name="Scale X"/>
+			<spinner label="Y" name="Scale Y"/>
+			<spinner label="Z" name="Scale Z"/>
 			<text name="label rotation">
 				Rotation (grader)
 			</text>
-			<spinner label="X" name="Rot X" />
-			<spinner label="Y" name="Rot Y" />
-			<spinner label="Z" name="Rot Z" />
+			<spinner label="X" name="Rot X"/>
+			<spinner label="Y" name="Rot Y"/>
+			<spinner label="Z" name="Rot Z"/>
 			<text name="label material">
 				Materiale
 			</text>
@@ -291,8 +308,8 @@
 			<text name="text cut">
 				Snit begynd og slut
 			</text>
-			<spinner label="B" name="cut begin" />
-			<spinner label="E" name="cut end" />
+			<spinner label="B" name="cut begin"/>
+			<spinner label="S" name="cut end"/>
 			<text name="text hollow">
 				Hul
 			</text>
@@ -317,48 +334,48 @@
 				</combo_item>
 			</combo_box>
 			<text name="text twist">
-				Vrid - start og slut
+				Vrid begynd og slut
 			</text>
-			<spinner label="B" name="Twist Begin" />
-			<spinner label="E" name="Twist End" />
+			<spinner label="B" name="Twist Begin"/>
+			<spinner label="S" name="Twist End"/>
 			<text name="scale_taper">
 				Konus
 			</text>
 			<text name="scale_hole">
 				Hulstørrelse
 			</text>
-			<spinner label="X" name="Taper Scale X" />
-			<spinner label="Y" name="Taper Scale Y" />
+			<spinner label="X" name="Taper Scale X"/>
+			<spinner label="Y" name="Taper Scale Y"/>
 			<text name="text topshear">
 				Topforskydning
 			</text>
-			<spinner label="X" name="Shear X" />
-			<spinner label="Y" name="Shear Y" />
+			<spinner label="X" name="Shear X"/>
+			<spinner label="Y" name="Shear Y"/>
 			<text name="advanced_cut">
-				Profilsnit - begynd og slut
+				Profilsnit begynd og slut
 			</text>
 			<text name="advanced_dimple">
-				Fordybning - begynd og slut
+				Fordybning begynd og slut
+			</text>
+			<text name="advanced_slice">
+				Snit begynd og slut
 			</text>
-			<spinner label="B" name="Path Limit Begin" />
-			<spinner label="E" name="Path Limit End" />
+			<spinner label="B" name="Path Limit Begin"/>
+			<spinner label="S" name="Path Limit End"/>
 			<text name="text taper2">
 				Konus
 			</text>
-			<spinner label="X" name="Taper X" />
-			<spinner label="Y" name="Taper Y" />
+			<spinner label="X" name="Taper X"/>
+			<spinner label="Y" name="Taper Y"/>
 			<text name="text radius delta">
 				Radius
 			</text>
 			<text name="text revolutions">
 				Omdrejninger
 			</text>
-			<texture_picker label="Sculpt tekstur" name="sculpt texture control"
-			     tool_tip="Klik her for at vælge billede" />
-			<check_box label="Spejlet" name="sculpt mirror control"
-			     tool_tip="Spejler sculpted prim omkring X aksen." />
-			<check_box label="Vrangen ud" name="sculpt invert control"
-			     tool_tip="Vender &apos;vrangen&apos; ud på sculpted prim." />
+			<texture_picker label="Sculpt tekstur" name="sculpt texture control" tool_tip="Klik her for at vælge billede"/>
+			<check_box label="Spejlet" name="sculpt mirror control" tool_tip="Spejler sculpted prim omkring X aksen."/>
+			<check_box label="Vrangen ud" name="sculpt invert control" tool_tip="Vender &apos;vrangen&apos; ud på sculpted prim."/>
 			<text name="label sculpt type">
 				Sting type
 			</text>
@@ -387,36 +404,36 @@
 			<text name="edit_object">
 				Redigér objektets egenskaber:
 			</text>
-			<check_box label="Fleksibel/blød" name="Flexible1D Checkbox Ctrl"
-			     tool_tip="Tillader objektet at ændre form omkring Z-aksen. (Kun på klient-siden)" />
-			<spinner label="Blødhed" name="FlexNumSections" />
-			<spinner label="Tyngdekraft" name="FlexGravity" />
-			<spinner label="Træk" name="FlexFriction" />
-			<spinner label="Vind" name="FlexWind" />
-			<spinner label="Spændstighed" name="FlexTension" />
-			<spinner label="Kraft X" name="FlexForceX" />
-			<spinner label="Kraft Y" name="FlexForceY" />
-			<spinner label="Kraft Z" name="FlexForceZ" />
-			<check_box label="Lys" name="Light Checkbox Ctrl"
-			     tool_tip="Medfårer at objektet afgiver lys" />
+			<check_box label="Fleksibel/blød" name="Flexible1D Checkbox Ctrl" tool_tip="Tillader objektet at ændre form omkring Z-aksen. (Kun på klient-siden)"/>
+			<spinner label_width="78" width="141" label="Blødhed" name="FlexNumSections"/>
+			<spinner label_width="78" width="141" label="Tyngdekraft" name="FlexGravity"/>
+			<spinner label_width="78" width="141" label="Træk" name="FlexFriction"/>
+			<spinner label_width="78" width="141" label="Vind" name="FlexWind"/>
+			<spinner label_width="78" width="141" label="Spændstighed" name="FlexTension"/>
+			<spinner label_width="78" width="141" label="Kraft X" name="FlexForceX"/>
+			<spinner label_width="78" width="141" label="Kraft Y" name="FlexForceY"/>
+			<spinner label_width="78" width="141" label="Kraft Z" name="FlexForceZ"/>
+			<check_box label="Lys" name="Light Checkbox Ctrl" tool_tip="Medfårer at objektet afgiver lys"/>
 			<text name="label color">
 				Farve
 			</text>
-			<color_swatch label="" name="colorswatch" tool_tip="Klik for at åbne farvevælger" />
-			<spinner label="Intensitet" name="Light Intensity" />
-			<spinner label="Radius" name="Light Radius" />
-			<spinner label="Udfasning" name="Light Falloff" />
+			<color_swatch label="" name="colorswatch" tool_tip="Klik for at åbne farvevælger"/>
+			<spinner label="Intensitet" name="Light Intensity"/>
+			<spinner label="Radius" name="Light Radius"/>
+			<spinner label="Udfasning" name="Light Falloff"/>
 		</panel>
 		<panel label="Tekstur" name="Texture">
-			<texture_picker label="Tekstur" name="texture control" tool_tip="Klik for at vælge billede" />
-			<color_swatch label="Farve" name="colorswatch" tool_tip="Klik for at åbne farvevælger" />
-			<text name="color trans">
-				Gennemsigtighed %
+			<texture_picker label="Tekstur" name="texture control" tool_tip="Klik for at vælge billede"/>
+			<color_swatch label="Farve" name="colorswatch" tool_tip="Klik for at åbne farvevælger"/>
+			<text name="color trans" left="170" width="105">
+				Gennemsigtighed%
 			</text>
-			<text name="glow label">
+			<spinner left="171" name="ColorTrans"/>
+			<text name="glow label" left="170">
 				Glød
 			</text>
-			<check_box label="Selvlysende" name="checkbox fullbright" />
+			<spinner left="170" name="glow"/>
+			<check_box label="Selvlysende" name="checkbox fullbright" left="170"/>
 			<text name="tex gen">
 				Afbildning
 			</text>
@@ -507,10 +524,10 @@
 			<text name="tex scale">
 				Gentagelser pr. overflade
 			</text>
-			<spinner label="Vandret (U)" name="TexScaleU" />
-			<check_box label="Vend" name="checkbox flip s" />
-			<spinner label="Lodret (V)" name="TexScaleV" />
-			<check_box label="Vend" name="checkbox flip t" />
+			<spinner label="Vandret (U)" name="TexScaleU"/>
+			<check_box label="Vend" name="checkbox flip s"/>
+			<spinner label="Lodret (V)" name="TexScaleV"/>
+			<check_box label="Vend" name="checkbox flip t"/>
 			<text name="tex rotate">
 				Rotation (grader)
 			</text>
@@ -523,34 +540,86 @@
 			<text name="rpt">
 				Gentagelser pr. meter
 			</text>
-			<button label="Gem" label_selected="Gem" name="button apply" />
+			<spinner left="125" name="TexRot" width="55" />
+			<spinner left="125" name="rptctrl" width="55" />
+			<button label="Gem" label_selected="Gem" name="button apply" left_delta="62"/>
 			<text name="tex offset">
 				Offset
 			</text>
-			<spinner label="Vandret (U)" name="TexOffsetU" />
-			<spinner label="Lodret (V)" name="TexOffsetV" />
+			<spinner label="Vandret (U)" name="TexOffsetU"/>
+			<spinner label="Lodret (V)" name="TexOffsetV"/>
 			<text name="textbox autofix">
 				Rette medie tekstur ind
 (skal indlæses først)
 			</text>
-			<button label="Ret ind" label_selected="Ret ind" name="button align" />
+			<button label="Ret ind" label_selected="Ret ind" name="button align" left="160"/>
 		</panel>
 		<panel label="Indhold" name="Contents">
-			<button label="Nyt script..." label_selected="Nyt script..." name="button new script" />
+			<button label="Nyt script" label_selected="Nyt script..." name="button new script"/>
+			<button label="Rettigheder..." name="button permissions"/>
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
+		<text name="label_parcel_info">
+			Parcel information
+		</text>
 		<text name="label_area_price">
 			Pris: L$[PRICE] for [AREA] m².
 		</text>
 		<text name="label_area">
 			Område: [AREA] m².
 		</text>
-		<button label="Køb land..." label_selected="Køb land..." name="button buy land" />
-		<button label="Flyt fra land..." label_selected="Flyt fra land..."
-		     name="button abandon land" />
-		<button label="Opdel..." label_selected="Opdel..." name="button subdivide land" />
-		<button label="Saml..." label_selected="Saml..." name="button join land" />
-		<button label="Om land..." label_selected="Om land..." name="button about land" />
+		<button label="Om land..." label_selected="Om land..." name="button about land"/>
+		<check_box label="Vis ejere" name="checkbox show owners" tool_tip="Farver grunde afhængigt af ejerskab"/>
+		<button label="?" label_selected="?" name="button show owners help"/>
+		<text name="label_parcel_modify">
+			Redigere grund
+		</text>
+		<button label="Opdel..." label_selected="Opdel..." name="button subdivide land"/>
+		<button label="Saml..." label_selected="Saml..." name="button join land"/>
+		<text name="label_parcel_trans">
+			Transaktioner for land
+		</text>
+		<button label="Køb land..." label_selected="Køb land..." name="button buy land"/>
+		<button label="Flyt fra land..." label_selected="Flyt fra land..." name="button abandon land"/>
 	</panel>
+	<string name="status_rotate">
+		Træk i de farvede bånd for at rotere objekt
+	</string>
+	<string name="status_scale">
+		Klik og træk for at strække valgte side
+	</string>
+	<string name="status_move">
+		Træk for at flytte, hold shift nede for at kopiere
+	</string>
+	<string name="status_modifyland">
+		Klik og hold for at redigere land
+	</string>
+	<string name="status_camera">
+		Klik og træk for at ændre synsvinkel
+	</string>
+	<string name="status_grab">
+		Træk for at flytte objekter, Ctrl for at løfte, Ctrl-Shift for at rotere
+	</string>
+	<string name="status_place">
+		Klik et sted i verden for at bygge
+	</string>
+	<string name="status_selectland">
+		Klik og træk for at vælge land
+	</string>
+	<string name="grid_screen_text">
+		Skærm
+	</string>
+	<string name="grid_local_text">
+		Lokalt
+	</string>
+	<string name="grid_world_text">
+		Verden
+	</string>
+	<string name="grid_reference_text">
+		Reference
+	</string>
+	<string name="grid_attachment_text">
+		Vedhæng
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml
index 8d341f6a12..91a45afd18 100644
--- a/indra/newview/skins/default/xui/da/floater_tos.xml
+++ b/indra/newview/skins/default/xui/da/floater_tos.xml
@@ -4,7 +4,8 @@
 	<button label="Annullér" label_selected="Annullér" name="Cancel" />
 	<check_box label="Jeg accepterer vilkårene for brug af tjenesten" name="agree_chk" />
 	<text name="tos_heading">
-		Læs venligst de almindelige bestemmelser og vilkår igennem, for at fortsætte til Second Life skal du acceptere vilkårene.
+		Læs venligst de almindelige bestemmelser og vilkår igennem, for at fortsætte til Second Life 
+skal du acceptere vilkårene.
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml
index 20dfe55406..7b951b0b52 100644
--- a/indra/newview/skins/default/xui/da/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_world_map.xml
@@ -1,81 +1,61 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="worldmap" title="Verdenskort">
 	<tab_container name="maptab">
-		<panel label="Objekter" name="objects_mapview" />
-		<panel label="Terræn" name="terrain_mapview" />
+		<panel label="Objekter" name="objects_mapview"/>
+		<panel label="Terræn" name="terrain_mapview"/>
 	</tab_container>
-	<text name="land_for_sale_label">
-		Land til salg
-	</text>
-	<text name="auction_label">
-		Auktion
-	</text>
 	<text name="you_label">
 		Dig
 	</text>
 	<text name="home_label">
 		Hjem
 	</text>
-	<button label="Tag hjem" label_selected="Tag hjem" name="Go Home"
-	     tool_tip="Teleporter til dit hjem" />
-	<text name="person_label">
-		Person
-	</text>
-	<check_box label=" " name="people_chk" />
-	<text name="infohub_label">
-		Infohub
-	</text>
-	<check_box label="" name="infohub_chk" />
-	<text name="telehub_label">
-		Telehub
+	<text name="auction_label">
+		Auktion
 	</text>
-	<check_box label="" name="telehubchk" />
-	<text name="land_for_sale_label2">
+	<text name="land_for_sale_label">
 		Land til salg
 	</text>
-	<check_box label="" name="land_for_sale_chk" />
+	<button label="Tag hjem" label_selected="Tag hjem" name="Go Home" tool_tip="Teleporter til dit hjem"/>
+	<check_box label="Beboer" name="people_chk"/>
+	<check_box label="Infohub" name="infohub_chk"/>
+	<check_box label="Telehub" name="telehubchk"/>
+	<check_box label="Land til salg" name="land_for_sale_chk"/>
 	<text name="events_label">
-		Events
+		Events:
 	</text>
-	<check_box label="" name="event_chk" />
-	<text name="events_mature_label" />
-	<check_box label="" name="event_mature_chk" />
-	<combo_box label="Venner online" name="friend combo"
-	     tool_tip="Ven der skal vises på kortet">
+	<check_box label="PG" name="event_chk"/>
+	<check_box label="Mature" name="event_mature_chk"/>
+	<check_box label="Adult" name="event_adult_chk"/>
+	<combo_box label="Venner online" name="friend combo" tool_tip="Ven der skal vises på kortet">
 		<combo_item name="none_selected">
 			Venner online
 		</combo_item>
 	</combo_box>
-	<combo_box label="Landemærker" name="landmark combo"
-	     tool_tip="Landemærke der skal vises på kortet">
+	<combo_box label="Landemærker" name="landmark combo" tool_tip="Landemærke der skal vises på kortet">
 		<combo_item name="none_selected">
 			Landemærker
 		</combo_item>
 	</combo_box>
-	<line_editor label="Søg på region navn" name="location"
-	     tool_tip="Skriv navnet på en region" />
-	<button label="Søg" name="DoSearch" tool_tip="Søg efter en region" />
+	<line_editor label="Søg på region navn" name="location" tool_tip="Skriv navnet på en region"/>
+	<button label="Søg" name="DoSearch" tool_tip="Søg efter en region"/>
 	<text name="search_label">
 		Søgeresultater:
 	</text>
 	<scroll_list name="search_results">
-		<column label="" name="icon" />
-		<column label="" name="sim_name" />
+		<column label="" name="icon"/>
+		<column label="" name="sim_name"/>
 	</scroll_list>
 	<text name="location_label">
 		Lokation:
 	</text>
-	<spinner name="spin x" tool_tip="X koordinat for lokation der skal vises på kortet" />
-	<spinner name="spin y" tool_tip="Y koordinat for lokation der skal vises på kortet" />
-	<spinner name="spin z" tool_tip="Z koordinat for lokation der skal vises på kortet" />
-	<button label="Teleport" label_selected="Teleport" name="Teleport"
-	     tool_tip="Teleportér til den valgte lokation" />
-	<button label="Vis destination" label_selected="Vis destination"
-	     name="Show Destination" tool_tip="Centrér kortet på valgte lokation" />
-	<button label="Slet" label_selected="Slet" name="Clear" tool_tip="Stop søg" />
-	<button label="Vis min position" label_selected="Vis min position"
-	     name="Show My Location" tool_tip="Centrer kortet på din avatars lokation" />
-	<button label="Kopiér SLURL til udklipsholder" name="copy_slurl"
-	     tool_tip="Kopierer den nuværende lokation som et SLURL, så det kan bruges på nettet." />
-	<slider label="Zoom" name="zoom slider" />
+	<spinner name="spin x" tool_tip="X koordinat for lokation der skal vises på kortet"/>
+	<spinner name="spin y" tool_tip="Y koordinat for lokation der skal vises på kortet"/>
+	<spinner name="spin z" tool_tip="Z koordinat for lokation der skal vises på kortet"/>
+	<button label="Teleport" label_selected="Teleport" name="Teleport" tool_tip="Teleportér til den valgte lokation"/>
+	<button label="Vis destination" label_selected="Vis destination" name="Show Destination" tool_tip="Centrér kortet på valgte lokation"/>
+	<button label="Slet" label_selected="Slet" name="Clear" tool_tip="Stop søg"/>
+	<button label="Vis min position" label_selected="Vis min position" name="Show My Location" tool_tip="Centrer kortet på din avatars lokation"/>
+	<button label="Kopiér SLURL til udklipsholder" name="copy_slurl" tool_tip="Kopierer den nuværende lokation som et SLURL, så det kan bruges på nettet."/>
+	<slider label="Zoom" name="zoom slider"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
index 2c47703ef2..fd5ebe5c82 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory.xml
@@ -55,6 +55,7 @@
 	<menu_item_call label="Aktivér" name="Activate" />
 	<menu_item_call label="Deaktivér" name="Deactivate" />
 	<menu_item_call label="Tag af dig selv" name="Detach From Yourself" />
+	<menu_item_call label="Tilbage til sidste position" name="Restore to Last Position"/>
 	<menu_item_call label="Tag på" name="Object Wear" />
 	<menu label="Vedhæft" name="Attach To" />
 	<menu label="Vedhæft til HUD" name="Attach To HUD" />
diff --git a/indra/newview/skins/default/xui/da/menu_mini_map.xml b/indra/newview/skins/default/xui/da/menu_mini_map.xml
new file mode 100644
index 0000000000..2a711dc5be
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_mini_map.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="popup">
+	<menu_item_call label="Zoom tæt" name="Zoom Close"/>
+	<menu_item_call label="Zoom mellem" name="Zoom Medium"/>
+	<menu_item_call label="Zoom langt" name="Zoom Far"/>
+	<menu_item_call label="Stop Tracking" name="Stop Tracking"/>
+	<menu_item_call label="Profil..." name="Profile"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index 8ac2718353..8bc99f27bf 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -1,211 +1,207 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
 	<menu label="Filer" name="File">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
 		<menu label="Hent" name="upload">
-		<menu_item_call label="Hent billede (L$[COST])..." name="Upload Image" />
-		<menu_item_call label="Hent lyd (L$[COST])..." name="Upload Sound" />
-		<menu_item_call label="Hent animation (L$[COST])..." name="Upload Animation" />
-		<menu_item_call label="Hent mange (L$[COST] per file)..." name="Bulk Upload" />
+			<menu_item_call label="Billede (L$[COST])..." name="Upload Image"/>
+			<menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/>
+			<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/>
+			<menu_item_call label="Hent mange (L$[COST] per file)..." name="Bulk Upload"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_call label="Sæt standard rettigheder..." name="perm prefs"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Luk vindue" name="Close Window" />
-		<menu_item_call label="Luk alle vinduer" name="Close All Windows" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Gem tekstur som..." name="Save Texture As..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Tag foto" name="Take Snapshot" />
-		<menu_item_call label="Tag foto til disk" name="Snapshot to Disk" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Afslut" name="Quit" />
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Luk vindue" name="Close Window"/>
+		<menu_item_call label="Luk alle vinduer" name="Close All Windows"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Gem tekstur som..." name="Save Texture As..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Tag foto" name="Take Snapshot"/>
+		<menu_item_call label="Tag foto til disk" name="Snapshot to Disk"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Afslut" name="Quit"/>
 	</menu>
 	<menu label="Redigér" name="Edit">
-		<menu_item_call label="Annullér" name="Undo" />
-		<menu_item_call label="Gentag" name="Redo" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Klip" name="Cut" />
-		<menu_item_call label="Kopier" name="Copy" />
-		<menu_item_call label="Sæt ind" name="Paste" />
-		<menu_item_call label="Slet" name="Delete" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Søg..." name="Search..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Vælg alt" name="Select All" />
-		<menu_item_call label="Vælg intet" name="Deselect" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Duplikér" name="Duplicate" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu label="Vedhæft objekt" name="Attach Object" />
-		<menu label="Tag objekt af" name="Detach Object" />
+		<menu_item_call label="Annullér" name="Undo"/>
+		<menu_item_call label="Gentag" name="Redo"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Klip" name="Cut"/>
+		<menu_item_call label="Kopier" name="Copy"/>
+		<menu_item_call label="Sæt ind" name="Paste"/>
+		<menu_item_call label="Slet" name="Delete"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Søg..." name="Search..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Vælg alt" name="Select All"/>
+		<menu_item_call label="Vælg intet" name="Deselect"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Duplikér" name="Duplicate"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu label="Vedhæft objekt" name="Attach Object"/>
+		<menu label="Tag objekt af" name="Detach Object"/>
 		<menu label="Tag tøj af" name="Take Off Clothing">
-			<menu_item_call label="Trøje" name="Shirt" />
-			<menu_item_call label="Bukser" name="Pants" />
-			<menu_item_call label="Sko" name="Shoes" />
-			<menu_item_call label="Strømper" name="Socks" />
-			<menu_item_call label="Jakke" name="Jacket" />
-			<menu_item_call label="Handsker" name="Gloves" />
-			<menu_item_call label="Undertrøje" name="Menu Undershirt" />
-			<menu_item_call label="Underbukser" name="Menu Underpants" />
-			<menu_item_call label="Nederdel" name="Skirt" />
-			<menu_item_call label="Alt tøj" name="All Clothes" />
+			<menu_item_call label="Trøje" name="Shirt"/>
+			<menu_item_call label="Bukser" name="Pants"/>
+			<menu_item_call label="Sko" name="Shoes"/>
+			<menu_item_call label="Strømper" name="Socks"/>
+			<menu_item_call label="Jakke" name="Jacket"/>
+			<menu_item_call label="Handsker" name="Gloves"/>
+			<menu_item_call label="Undertrøje" name="Menu Undershirt"/>
+			<menu_item_call label="Underbukser" name="Menu Underpants"/>
+			<menu_item_call label="Nederdel" name="Skirt"/>
+			<menu_item_call label="Alt tøj" name="All Clothes"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Bevægelser..." name="Gestures..." />
-		<menu_item_call label="Profil..." name="Profile..." />
-		<menu_item_call label="Udseende..." name="Appearance..." />
-		<menu_item_separator label="-----------" name="separator7" />
-		<menu_item_check label="Venner..." name="Friends..." />
-		<menu_item_call label="Grupper..." name="Groups..." />
-		<menu_item_separator label="-----------" name="separator8" />
-		<menu_item_call label="Indstillinger..." name="Preferences..." />
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Bevægelser..." name="Gestures..."/>
+		<menu_item_call label="Profil..." name="Profile..."/>
+		<menu_item_call label="Udseende..." name="Appearance..."/>
+		<menu_item_separator label="-----------" name="separator7"/>
+		<menu_item_check label="Venner..." name="Friends..."/>
+		<menu_item_call label="Grupper..." name="Groups..."/>
+		<menu_item_separator label="-----------" name="separator8"/>
+		<menu_item_call label="Indstillinger..." name="Preferences..."/>
 	</menu>
 	<menu label="Vis" name="View">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="Første person" name="Mouselook" />
-		<menu_item_check label="Byg" name="Build" />
-		<menu_item_check label="Flyv via joystick" name="Joystick Flycam" />
-		<menu_item_call label="Nulstil kamera" name="Reset View" />
-		<menu_item_call label="Se på sidste chatter" name="Look at Last Chatter" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_check label="Værktøjslinie" name="Toolbar" />
-		<menu_item_check label="Local chat" name="Chat History" />
-		<menu_item_check label="Kommunikér" name="Instant Message" />
-		<menu_item_check label="Beholdning" name="Inventory" />
-		<menu_item_check label="Aktive talere" name="Active Speakers" />
-		<menu_item_check label="Vis blokerede avatarer" name="Mute List" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_check label="Kamera kontrol" name="Camera Controls" />
-		<menu_item_check label="Bevægelses kontrol" name="Movement Controls" />
-		<menu_item_check label="Verdenskort" name="World Map" />
-		<menu_item_check label="Lokalt kort" name="Mini-Map" />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_check label="Teknisk info" name="Statistics Bar" />
-		<menu_item_check label="Parcel skel" name="Property Lines" />
-		<menu_item_check label="Grundejere" name="Land Owners" />
-		<menu_item_separator label="-----------" name="separator4" />
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="Første person" name="Mouselook"/>
+		<menu_item_check label="Byg" name="Build"/>
+		<menu_item_check label="Flyv via joystick" name="Joystick Flycam"/>
+		<menu_item_call label="Nulstil kamera" name="Reset View"/>
+		<menu_item_call label="Se på sidste chatter" name="Look at Last Chatter"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="Værktøjslinie" name="Toolbar"/>
+		<menu_item_check label="Local chat" name="Chat History"/>
+		<menu_item_check label="Kommunikér" name="Instant Message"/>
+		<menu_item_check label="Beholdning" name="Inventory"/>
+		<menu_item_check label="Aktive talere" name="Active Speakers"/>
+		<menu_item_check label="Vis blokerede avatarer" name="Mute List"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="Kamera kontrol" name="Camera Controls"/>
+		<menu_item_check label="Bevægelses kontrol" name="Movement Controls"/>
+		<menu_item_check label="Verdenskort" name="World Map"/>
+		<menu_item_check label="Lokalt kort" name="Mini-Map"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="Teknisk info" name="Statistics Bar"/>
+		<menu_item_check label="Parcel skel" name="Property Lines"/>
+		<menu_item_check label="Visning af ingen adgang" name="Banlines"/>
+		<menu_item_check label="Grundejere" name="Land Owners"/>
+		<menu_item_separator label="-----------" name="separator4"/>
 		<menu label="Tips visning" name="Hover Tips">
-			<menu_item_check label="Vis tips" name="Show Tips" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_check label="Tips om land" name="Land Tips" />
-			<menu_item_check label="Tips på alle objekter" name="Tips On All Objects" />
+			<menu_item_check label="Vis tips" name="Show Tips"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_check label="Tips om land" name="Land Tips"/>
+			<menu_item_check label="Tips på alle objekter" name="Tips On All Objects"/>
 		</menu>
-		<menu_item_check label="Fremhæv gennemsigtigt" name="Highlight Transparent" />
-		<menu_item_check label="Pejlelys" name="beacons" />
-		<menu_item_check label="Skjul partikler" name="Hide Particles" />
-		<menu_item_check label="Vis HUD vedhæftninger" name="Show HUD Attachments" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Zoom ind" name="Zoom In" />
-		<menu_item_call label="Zoom standard" name="Zoom Default" />
-		<menu_item_call label="Zoom ud" name="Zoom Out" />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Skift fuld skærm/vindue" name="Toggle Fullscreen" />
-		<menu_item_call label="Sæt brugerfladestørrelse til normal" name="Set UI Size to Default" />
+		<menu_item_check label="Fremhæv gennemsigtigt" name="Highlight Transparent"/>
+		<menu_item_check label="Pejlelys" name="beacons"/>
+		<menu_item_check label="Skjul partikler" name="Hide Particles"/>
+		<menu_item_check label="Vis HUD vedhæftninger" name="Show HUD Attachments"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Zoom ind" name="Zoom In"/>
+		<menu_item_call label="Zoom standard" name="Zoom Default"/>
+		<menu_item_call label="Zoom ud" name="Zoom Out"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Skift fuld skærm/vindue" name="Toggle Fullscreen"/>
+		<menu_item_call label="Sæt brugerfladestørrelse til normal" name="Set UI Size to Default"/>
 	</menu>
 	<menu label="Verden" name="World">
-		<menu_item_call label="Chat" name="Chat" />
-		<menu_item_check label="Løb" name="Always Run" />
-		<menu_item_check label="Flyv" name="Fly" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Opret landemærke her" name="Create Landmark Here" />
-		<menu_item_call label="Sæt hjem til her" name="Set Home to Here" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Teleporter hjem" name="Teleport Home" />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Sæt &apos;ikke til stede&apos;" name="Set Away" />
-		<menu_item_call label="Sæt &apos;optaget&apos;" name="Set Busy" />
-		<menu_item_call label="Stop all animationer" name="Stop All Animations" />
-		<menu_item_call label="Frigiv taster" name="Release Keys" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Konto historik..." name="Account History..." />
-		<menu_item_call label="Vedligehold konto..." name="Manage My Account..." />
-		<menu_item_call label="Køb L$..." name="Buy and Sell L$..." />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Mit land..." name="My Land..." />
-		<menu_item_call label="Om land..." name="About Land..." />
-		<menu_item_call label="Køb land..." name="Buy Land..." />
-		<menu_item_call label="Region/Estate..." name="Region/Estate..." />
-		<menu_item_separator label="-----------" name="separator6" />
+		<menu_item_call label="Chat" name="Chat"/>
+		<menu_item_check label="Løb" name="Always Run"/>
+		<menu_item_check label="Flyv" name="Fly"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Opret landemærke her" name="Create Landmark Here"/>
+		<menu_item_call label="Sæt hjem til her" name="Set Home to Here"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Teleporter hjem" name="Teleport Home"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Sæt &apos;ikke til stede&apos;" name="Set Away"/>
+		<menu_item_call label="Sæt &apos;optaget&apos;" name="Set Busy"/>
+		<menu_item_call label="Stop animering af min avatar" name="Stop Animating My Avatar"/>
+		<menu_item_call label="Frigiv taster" name="Release Keys"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Konto historik..." name="Account History..."/>
+		<menu_item_call label="Vedligehold konto..." name="Manage My Account..."/>
+		<menu_item_call label="Køb L$..." name="Buy and Sell L$..."/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Mit land..." name="My Land..."/>
+		<menu_item_call label="Om land..." name="About Land..."/>
+		<menu_item_call label="Køb land..." name="Buy Land..."/>
+		<menu_item_call label="Region/Estate..." name="Region/Estate..."/>
+		<menu_item_separator label="-----------" name="separator6"/>
 		<menu label="Indstillinger for omgivelser" name="Environment Settings">
-			<menu_item_call label="Solopgang" name="Sunrise" />
-			<menu_item_call label="Middag" name="Noon" />
-			<menu_item_call label="Solnedgang" name="Sunset" />
-			<menu_item_call label="Midnat" name="Midnight" />
-			<menu_item_call label="Gendan til standard for region" name="Revert to Region Default" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_call label="Redigering af omgivelser" name="Environment Editor" />
+			<menu_item_call label="Solopgang" name="Sunrise"/>
+			<menu_item_call label="Middag" name="Noon"/>
+			<menu_item_call label="Solnedgang" name="Sunset"/>
+			<menu_item_call label="Midnat" name="Midnight"/>
+			<menu_item_call label="Gendan til standard for region" name="Revert to Region Default"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_call label="Redigering af omgivelser" name="Environment Editor"/>
 		</menu>
 	</menu>
 	<menu label="Funktioner" name="Tools">
 		<menu label="Vælg værktøj" name="Select Tool">
-			<menu_item_call label="Fokus" name="Focus" />
-			<menu_item_call label="Flyt" name="Move" />
-			<menu_item_call label="Rediger" name="Edit" />
-			<menu_item_call label="Byg" name="Create" />
-			<menu_item_call label="Land" name="Land" />
+			<menu_item_call label="Fokus" name="Focus"/>
+			<menu_item_call label="Flyt" name="Move"/>
+			<menu_item_call label="Rediger" name="Edit"/>
+			<menu_item_call label="Byg" name="Create"/>
+			<menu_item_call label="Land" name="Land"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects" />
-		<menu_item_check label="Vælg kun flytbare objekter" name="Select Only Movable Objects" />
-		<menu_item_check label="Vælg ved at omkrandse" name="Select By Surrounding" />
-		<menu_item_check label="Vis skjulte objekter" name="Show Hidden Selection" />
-		<menu_item_check label="Vis lys-radius for valgte" name="Show Light Radius for Selection" />
-		<menu_item_check label="Vis guidelys for valgte" name="Show Selection Beam" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_check label="Ret ind til gitter" name="Snap to Grid" />
-		<menu_item_call label="Ret XY for objekt ind til gitter" name="Snap Object XY to Grid" />
-		<menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid" />
-		<menu_item_call label="Gitter indstillinger..." name="Grid Options..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_check label="Rediger sammekædede objekter" name="Edit Linked Parts" />
-		<menu_item_call label="Sammenkæd" name="Link" />
-		<menu_item_call label="Adskil" name="Unlink" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Fokusér på valgte" name="Focus on Selection" />
-		<menu_item_call label="Zoom på valgte" name="Zoom to Selection" />
-		<menu_item_call label="Køb objekt" name="Menu Object Take" />
-		<menu_item_call label="Tag kopi" name="Take Copy" />
-		<menu_item_call label="Opdatér objekt i beholdning med ændringer"
-		     name="Save Object Back to My Inventory" />
-		<menu_item_call label="Opdatér ændringer i indhold på objekt"
-		     name="Save Object Back to Object Contents" />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Vis vindue med advarsler/fejl fra scripts"
-		     name="Show Script Warning/Error Window" />
-		<menu label="Rekompilér scripts i valgte objekter"
-		     name="Recompile Scripts in Selection">
-			<menu_item_call label="Mono" name="Mono" />
-			<menu_item_call label="LSL" name="LSL" />
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects"/>
+		<menu_item_check label="Vælg kun flytbare objekter" name="Select Only Movable Objects"/>
+		<menu_item_check label="Vælg ved at omkrandse" name="Select By Surrounding"/>
+		<menu_item_check label="Vis skjulte objekter" name="Show Hidden Selection"/>
+		<menu_item_check label="Vis lys-radius for valgte" name="Show Light Radius for Selection"/>
+		<menu_item_check label="Vis guidelys for valgte" name="Show Selection Beam"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="Ret ind til gitter" name="Snap to Grid"/>
+		<menu_item_call label="Ret XY for objekt ind til gitter" name="Snap Object XY to Grid"/>
+		<menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid"/>
+		<menu_item_call label="Gitter indstillinger..." name="Grid Options..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="Rediger sammekædede objekter" name="Edit Linked Parts"/>
+		<menu_item_call label="Sammenkæd" name="Link"/>
+		<menu_item_call label="Adskil" name="Unlink"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Fokusér på valgte" name="Focus on Selection"/>
+		<menu_item_call label="Zoom på valgte" name="Zoom to Selection"/>
+		<menu_item_call label="Køb objekt" name="Menu Object Take">
+			<on_enable userdata="Køb,Tag" name="EnableBuyOrTake"/>
+		</menu_item_call>
+		<menu_item_call label="Tag kopi" name="Take Copy"/>
+		<menu_item_call label="Opdatér ændringer i indhold på objekt" name="Save Object Back to Object Contents"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Vis vindue med advarsler/fejl fra scripts" name="Show Script Warning/Error Window"/>
+		<menu label="Rekompilér scripts i valgte objekter" name="Recompile Scripts in Selection">
+			<menu_item_call label="Mono" name="Mono"/>
+			<menu_item_call label="LSL" name="LSL"/>
 		</menu>
-		<menu_item_call label="Genstart scripts i valgte objekter" name="Reset Scripts in Selection" />
-		<menu_item_call label="Sæt scripts til &apos;Running&apos; i valgte objekter"
-		     name="Set Scripts to Running in Selection" />
-		<menu_item_call label="Sæt scripts til &apos; Not running&apos; i valgte objekter"
-		     name="Set Scripts to Not Running in Selection" />
+		<menu_item_call label="Genstart scripts i valgte objekter" name="Reset Scripts in Selection"/>
+		<menu_item_call label="Sæt scripts til &apos;Running&apos; i valgte objekter" name="Set Scripts to Running in Selection"/>
+		<menu_item_call label="Sæt scripts til &apos; Not running&apos; i valgte objekter" name="Set Scripts to Not Running in Selection"/>
 	</menu>
 	<menu label="Hjælp" name="Help">
-		<menu_item_call label="Second Life Hjælp" name="Second Life Help" />
-		<menu_item_call label="Tutorial" name="Tutorial" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Officiel Linden Blog..." name="Official Linden Blog..." />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Portal om scripts..." name="Scripting Portal..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Rapporter misbrug..." name="Report Abuse..." />
-		<menu_item_call label="Stød, skub &amp; slag..." name="Bumps, Pushes &amp;amp; Hits..." />
-		<menu_item_call label="Lag meter" name="Lag Meter" />
-		<menu_item_separator label="-----------" name="separator7" />
+		<menu_item_call label="Second Life Hjælp" name="Second Life Help"/>
+		<menu_item_call label="Tutorial" name="Tutorial"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Officiel Linden Blog..." name="Official Linden Blog..."/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Portal om scripts..." name="Scripting Portal..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Rapporter misbrug..." name="Report Abuse..."/>
+		<menu_item_call label="Stød, skub &amp; slag..." name="Bumps, Pushes &amp;amp; Hits..."/>
+		<menu_item_call label="Lag meter" name="Lag Meter"/>
+		<menu_item_separator label="-----------" name="separator7"/>
 		<menu label="Fejlrapport" name="Bug Reporting">
-			<menu_item_call label="Second Life sagsstyring..." name="Public Issue Tracker..." />
-			<menu_item_call label="Hjælp til Second Life sagsstyring..."
-			     name="Publc Issue Tracker Help..." />
-			<menu_item_separator label="-----------" name="separator7" />
-			<menu_item_call label="Om fejlrapportering..." name="Bug Reporing 101..." />
-			<menu_item_call label="Anmeld sikkerhedshændelser..." name="Security Issues..." />
-			<menu_item_call label="QA Wiki..." name="QA Wiki..." />
-			<menu_item_separator label="-----------" name="separator9" />
-			<menu_item_call label="Anmeld fejl..." name="Report Bug..." />
+			<menu_item_call label="Second Life sagsstyring..." name="Public Issue Tracker..."/>
+			<menu_item_call label="Hjælp til Second Life sagsstyring..." name="Publc Issue Tracker Help..."/>
+			<menu_item_separator label="-----------" name="separator7"/>
+			<menu_item_call label="Om fejlrapportering..." name="Bug Reporing 101..."/>
+			<menu_item_call label="Anmeld sikkerhedshændelser..." name="Security Issues..."/>
+			<menu_item_call label="QA Wiki..." name="QA Wiki..."/>
+			<menu_item_separator label="-----------" name="separator9"/>
+			<menu_item_call label="Anmeld fejl..." name="Report Bug..."/>
 		</menu>
-		<menu_item_call label="Om Second Life..." name="About Second Life..." />
-		,
+		<menu_item_call label="Om Second Life..." name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index eedc588449..4963e8862d 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -1,15 +1,11 @@
-<?xml version="1.0" ?><notifications>
-
-  <global name="skipnexttime">
-
+<?xml version="1.0" encoding="utf-8"?>
+<notifications>
+	<global name="skipnexttime">
 		Vis ikke dette igen
-  </global>
-
-  <global name="alwayschoose">
-
+	</global>
+	<global name="alwayschoose">
 		Vælg altid dette
-  </global>
-
+	</global>
   <template name="okbutton">
     <form>
       <button
@@ -74,421 +70,438 @@
        text="$canceltext"/>
     </form>
   </template>
+	<notification functor="GenericAcknowledge" label="Ukendt advarsels-besked" name="MissingAlert">
+		Din version af Second Life kan ikke vise den advarselsbesked den modtog.
 
-  <notification
-   functor="GenericAcknowledge"
-   
-   name="MissingAlert"
-   >
-&apos;[_NAME]&apos; mangler fra notifications.xml.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="FloaterNotFound"
-   >
-Floater error: Kunne ikke finde følgende kontrol:
+Fejl detaljer: Advarslen &apos;[_NAME]&apos; blev ikke fundet i notifications.xml.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="FloaterNotFound">
+		Floater error: Kunne ikke finde følgende kontrol:
 
 [CONTROLS]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TutorialNotFound">
+		Der er i øjeblikket ingen tilgængelig guide.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GenericAlert">
+		[MESSAGE]
+	</notification>
+	<notification name="GenericAlertYesCancel">
+		[MESSAGE]
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="Ja"/>
+	</notification>
+	<notification name="BadInstallation">
+		Der opstod en fejl ved opdatering af Second Life. Hent venligst den nyeste version fra secondlife.com.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="TutorialNotFound"
-   >
-Der er i øjeblikket ingen tilgængelig guide.
-    <usetemplate
+	</notification>
+	<notification name="LoginFailedNoNetwork">
+		Netværksfejl: Kunne ikke oprette forbindelse.
+&apos;[DIAGNOSTIC]&apos;
+Check venligst din netværksforbindelse.
+	<usetemplate
      name="okbutton"
      yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="GenericAlert"
-   >
-[MESSAGE]
-  </notification>
-
-  <notification
-   
-   name="GenericAlertYesCancel"
-   >
-[MESSAGE]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Annullér"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="WearableSave"
-   >
-Gem ændringer til nuværende tøj/krops del?
-    <usetemplate
-     canceltext="Annullér"
-     name="yesnocancelbuttons"
-     notext="Gem ikke"
-     yestext="Gem"/>
-  </notification>
-
-  <notification
-   
-   name="CompileQueueSaveText"
-   >
-Der var problemer med upload af teksten til et script af følgende årsager: [REASON]. Prøv igen senere.
-  </notification>
-
-  <notification
-   
-   name="CompileQueueSaveBytecode"
-   >
-Der var problemer med at uploade den kompileret script af følgende årsager: [REASON]. Prøv igen senere.
-  </notification>
-
-  <notification
-   
-   name="WriteAnimationFail"
-   >
-Der var et problem med skrivning af animations data. Prøv igen senere.
-  </notification>
-
-  <notification
-   
-   name="UploadAuctionSnapshotFail"
-   >
-Der var problemer med at uploade billedet til auktionen af følgende årsager: [REASON]
-  </notification>
-
-  <notification
-   
-   name="UnableToViewContentsMoreThanOne"
-   >
-Ude af stand til at se indholdet af mere end ét element ad gangen.
+	</notification>
+	<notification name="MessageTemplateNotFound">
+		Besked template [PATH] kunne ikke findes.
+	<usetemplate
+     name="okbutton"
+     yestext="OK"/>
+	</notification>
+	<notification name="WearableSave">
+		Gem ændringer til nuværende tøj/krops del?
+		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Gem ikke" yestext="Gem"/>
+	</notification>
+	<notification name="CompileQueueSaveText">
+		Der var problemer med upload af teksten til et script af følgende årsager: [REASON]. Prøv igen senere.
+	</notification>
+	<notification name="CompileQueueSaveBytecode">
+		Der var problemer med at uploade den kompileret script af følgende årsager: [REASON]. Prøv igen senere.
+	</notification>
+	<notification name="WriteAnimationFail">
+		Der var et problem med skrivning af animations data. Prøv igen senere.
+	</notification>
+	<notification name="UploadAuctionSnapshotFail">
+		Der var problemer med at uploade billedet til auktionen af følgende årsager: [REASON]
+	</notification>
+	<notification name="UnableToViewContentsMoreThanOne">
+		Ude af stand til at se indholdet af mere end ét element ad gangen.
 Vælg kun en genstand, og prøv igen.
-  </notification>
-
-  <notification
-   
-   name="SaveClothingBodyChanges"
-   >
-Gem alle ændringer til tøj/krops dele?
-    <usetemplate
-     canceltext="Annullér"
-     name="yesnocancelbuttons"
-     notext="Gem Ikke"
-     yestext="Gem Alt"/>
-  </notification>
-
-  <notification
-   
-   name="GrantModifyRights"
-   >
-At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse.
+	</notification>
+	<notification name="SaveClothingBodyChanges">
+		Gem alle ændringer til tøj/krops dele?
+		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Gem Ikke" yestext="Gem Alt"/>
+	</notification>
+	<notification name="GrantModifyRights">
+		At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse.
 Ønsker du at ændre rettigheder for [FIRST_NAME] [LAST_NAME]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Nej"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="GrantModifyRightsMultiple"
-   >
-At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse.
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="GrantModifyRightsMultiple">
+		At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse.
 Ønsker du at ændre rettigheder for de valgte beboere?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Nej"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="RevokeModifyRights"
-   >
-Vil du tilbagekalde rettighederne for [FIRST_NAME] [LAST_NAME]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Nej"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="RevokeModifyRightsMultiple"
-   >
-Vil du tilbagekalde rettighederne for de valgte beboere?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Nej"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="UnableToCreateGroup"
-   >
-Kunne ikke oprette gruppe.
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="RevokeModifyRights">
+		Vil du tilbagekalde rettighederne for [FIRST_NAME] [LAST_NAME]?
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="RevokeModifyRightsMultiple">
+		Vil du tilbagekalde rettighederne for de valgte beboere?
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="UnableToCreateGroup">
+		Kunne ikke oprette gruppe.
 [MESSAGE]
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="PanelGroupApply"
-   >
-[NEEDS_APPLY_MESSAGE]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PanelGroupApply">
+		[NEEDS_APPLY_MESSAGE]
 [WANT_APPLY_MESSAGE]
-    <usetemplate
-     canceltext="Annullér"
-     name="yesnocancelbuttons"
-     notext="Ignorer Ændringer"
-     yestext="Godkend Ændringer"/>
-  </notification>
-
-  <notification
-   
-   name="MustSpecifyGroupNoticeSubject"
-   >
-Du skal angive et emne for at sende en gruppe besked.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="AddGroupOwnerWarning"
-   >
-Du er ved at tilføje medlemmer til rollen som [ROLE_NAME].
+		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Ignorer Ændringer" yestext="Godkend Ændringer"/>
+	</notification>
+	<notification name="MustSpecifyGroupNoticeSubject">
+		Du skal angive et emne for at sende en gruppe besked.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="AddGroupOwnerWarning">
+		Du er ved at tilføje medlemmer til rollen som [ROLE_NAME].
 Medlemmer ikke kan fjernes fra denne rolle.
 Medlemmerne skal fratræde sin rolle selv.
 Er du sikker på du vil fortsætte?
-    <usetemplate
-     ignoretext="Når du tilføjer medlemmer til ejer rollen"
-     name="okcancelignore"
-     notext="Nej"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="AssignDangerousActionWarning"
-   >
-Du er ved at tilføje muligheden for &apos;[ACTION_NAME]&apos; til
+		<usetemplate ignoretext="Når du tilføjer medlemmer til ejer rollen" name="okcancelignore" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="AssignDangerousActionWarning">
+		Du er ved at tilføje muligheden for &apos;[ACTION_NAME]&apos; til
 rollen &apos;[ROLE_NAME]&apos;.
 
 *ADVARSEL*
 Ethvert medlem i en rolle med denne evne kan tildele sig selv -- og et andet medlem - roller med flere beføjelser, end de har i øjeblikket, potentielt kan de ophøje sig selv til nær-Ejer magt. Være sikker på, at du ved, hvad du laver, før tildeling af denne evne.
 
 Add this Ability to &apos;[ROLE_NAME]&apos;?
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="ClickSoundHelpLand">
+		Media og musik kan kun ses og høres indenfor parcellen. Lyd og stemme valg muligheder kan begrænses til parcellen eller de kan høres af beboere udenfor parcellen, afhængigt af deres indholdsrating. Gå til &apos;Knowledge Base&apos; for at lære hvordan disse valg opsættes.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=5046
+		</url>
     <usetemplate
      name="okcancelbuttons"
-     notext="Nej"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="ClickPublishHelpAvatar"
-   >
-Hvis du vælger &quot;Vis i Søgning&quot; Vises:
+     yestext="GÃ¥ til &apos;Knowledge Base&apos;"
+	 notext="Luk" />
+	</notification>
+	<notification name="ClickSearchHelpAll">
+		Søgeresultater er organiseret baseret på den fane du står på, din indholdsrating, den valgte kategori og andre faktorer. for yderligere detaljer se i &apos;Knowledge Base&apos;.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=4722
+		</url>
+    <usetemplate
+     name="okcancelbuttons"
+     yestext="GÃ¥ til &apos;Knowledge Base&apos;"
+	 notext="Luk" />
+	</notification>
+	<notification name="ClickPublishHelpAvatar">
+		Hvis du vælger &quot;Vis i Søgning&quot; Vises:
 - Din profil i søgeresultater
 - Et link til din profile i de offentlige gruppe sider
-  </notification>
-
-  <notification
-   
-   name="ClickWebProfileHelpAvatar"
-   >
-Hvis en beboer har en hjemmeside adresse kan du:
+	</notification>
+	<notification name="ClickUploadHelpPermissions">
+		Dinne standard rettigheder virker muligvis ikke i ældre regioner.
+	</notification>
+	<notification name="ClickWebProfileHelpAvatar">
+		Hvis en beboer har en hjemmeside adresse kan du:
  * Klikke &apos;Load&apos; for at side deres side her.
  * Klikke Load &gt; &apos;I ekstern browser&apos; for at se siden i din standard browser.
  * Klikke Load &gt; &apos;Hjemme URL&apos; for at returnere til denne beboers side hvis du har navigeret væk.
 
 Når du ser din egen profil, kan du skrive hvilken som helst adresse og klikke ok for at få den vist i din egen profil.
 Andre beboere kan besøge den adresse du har sat, når de besøger din profil.
-  </notification>
-
-  <notification
-   
-   name="JoinGroupCannotAfford"
-   >
-Tilmelding til denne gruppe koster L$[COST].
+	</notification>
+	<notification name="JoinGroupCannotAfford">
+		Tilmelding til denne gruppe koster L$[COST].
 Du har ikke nok L$ til denne tilmelding.
-  </notification>
-
-  <notification
-   
-   name="PromptMissingSubjMsg"
-   >
-E-mail dette billede med standard emne eller besked?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Annullér"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="ErrorUploadingPostcard"
-   >
-Der var et problem med at sende billedet på grund af følgende: [REASON]
-  </notification>
-
-  <notification
-   
-   name="MustHaveAccountToLogIn"
-   >
-Ups! Noget var tomt.
+	</notification>
+	<notification name="PromptMissingSubjMsg">
+		E-mail dette billede med standard emne eller besked?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="ErrorUploadingPostcard">
+		Der var et problem med at sende billedet på grund af følgende: [REASON]
+	</notification>
+	<notification name="MustHaveAccountToLogIn">
+		Ups! Noget var tomt.
 Du skal skrive både fornavn og efternavn på din figur.
 
 Du har brug for en konto for at logge ind i [SECOND_LIFE]. Vil du oprette en nu?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Prøv igen"
-     yestext="Lav ny konto"/>
-  </notification>
-
-  <notification
-   
-   name="ResetShowNextTimeDialogs"
-   >
-Vil du gerne genaktivere alle disse popups, som du tidligere har bedt om ikke at få vist?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Annullér"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="SkipShowNextTimeDialogs"
-   >
-Vil du deaktivere alle popups som kan undværes?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Annullér"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="ChangeSkin"
-   >
-Det nye udseende vil vises efter du har genstartet [SECOND_LIFE].
-  </notification>
-
-  <notification
-   
-   name="UnsupportedHardware"
-   >
-    <form name="form">
-      <ignore name="ignore"
-       text="Ved opdagelse af ikke supporteret hardware"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="UnknownGPU"
-   >
-    <form name="form">
-      <ignore name="ignore"
-       text="Ved opdagelse af et ukendt grafikkort"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="CannotGiveCategory"
-   >
-Du har ikke tilladelse til at videreføre den valgte mappe.
-  </notification>
-
-  <notification
-   
-   name="CannotBuyLandNoRegion"
-   >
-Ikke i stand til at købe land:
+		<usetemplate name="okcancelbuttons" notext="Prøv igen" yestext="Lav ny konto"/>
+	</notification>
+	<notification name="ResetShowNextTimeDialogs">
+		Vil du gerne genaktivere alle disse popups, som du tidligere har bedt om ikke at få vist?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="SkipShowNextTimeDialogs">
+		Vil du deaktivere alle popups som kan undværes?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="ChangeSkin">
+		Det nye udseende vil vises efter du har genstartet [SECOND_LIFE].
+	</notification>
+	<notification name="UnsupportedHardware"/>
+	<notification name="UnknownGPU">
+		<form name="form">
+			<ignore name="ignore" text="Ved opdagelse af et ukendt grafikkort"/>
+		</form>
+	</notification>
+
+  <notification name="invalid_tport">
+Der er problemer med at håndtere din teleport. Det kan være nødvendigt at logge ud og ind for at kunne skifte teleportere.
+Hvis du bliver ved med at have problemet kan du checke teknisk support på:
+www.secondlife.com/support
+  </notification>
+  <notification name="invalid_region_handoff">
+Problem registreret i forbindelse med skift til ny region. Det kan være nødvendigt at logge ud og ind for at kunne skifte regioner.
+Hvis du bliver ved med at have problemet kan du checke teknisk support på:
+www.secondlife.com/support
+  </notification>
+  <notification name="blocked_tport">
+Beklager, teleport er blokeret lige nu. Prøv igen senere.
+Hvis du stadig ikke kan teleporte, prøv venligst at logge ud og ligge ind for at løse dette problem.
+  </notification>
+  <notification name="nolandmark_tport">
+Beklager, systemet kunne ikke finde landmærke destinationen.
+  </notification>
+  <notification name="timeout_tport">
+Beklager, systemet kunne ikke fuldføre teleport forbindelse.
+Prøv igen om lidt.
+  </notification>
+  <notification name="noaccess_tport">
+Beklager, du har ikke adgang til denne teleport destination.
+  </notification>
+  <notification name="missing_attach_tport">
+Dine vedhæng er ikke ankommet endnu. Prøv at vente lidt endnu eller log ud og ind igen før du prøver at teleporte igen.
+  </notification>
+  <notification name="too_many_uploads_tport">
+Tekniske problemer hindrer at din teleport kan gennemføres.
+Prøv venligst igen om lidt eller vælg et mindre travlt område.
+  </notification>
+  <notification name="expired_tport">
+Beklager, men systemet kunne ikke fuldføre din teleport i rimelig tid. Prøv venligst igen om lidt.
+  </notification>
+  <notification name="expired_region_handoff">
+Beklager, men systemet kunne ikke fuldføre skift til anden region i rimelig tid. Prøv venligst igen om lidt.
+  </notification>
+  <notification name="no_host">
+Ikke muligt at fine teleport destination. Destinationen kan være midlertidig utilgængelig eller findes ikke mere. 
+Prøv evt. igen om lidt.
+  </notification>
+  <notification name="no_inventory_host">
+Beholdningssystemet er ikke tilgængelig lige nu.
+  </notification>
+
+	<notification name="CannotGiveCategory">
+		Du har ikke tilladelse til at videreføre den valgte mappe.
+	</notification>
+	<notification name="CannotEncodeFile">
+		Kunne ikke &apos;forstå&apos; filen: [FILE]
+	</notification>
+	<notification name="CannotBuyLandNoRegion">
+		Ikke i stand til at købe land:
 Kan ikke finde region som dette land er i.
-  </notification>
-
-  <notification
-   
-   name="YouHaveBeenLoggedOut"
-   >
-Du er blevet logget ud af [SECOND_LIFE]:
+	</notification>
+	<notification name="ShowOwnersHelp">
+		Vis ejere:
+Farver på parceller viser ejer-type.
+
+Grøn = Dit land
+Turkis = Din gruppes land
+Rød = Ejet af andre
+Gul = Til salg
+Lilla = PÃ¥ auktion
+Grå = Offentligt ejet
+	</notification>
+	<notification name="YouHaveBeenLoggedOut">
+		Du er blevet logget ud af [SECOND_LIFE]:
             [MESSAGE]
 Du kan stadig se eksiterende PB&apos;er og chat ved at klikke&apos;Se PB &amp; Chat&apos;. Ellers, klik &apos;Afslut&apos; for at afslutte [SECOND_LIFE] nu.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Quit"
-     yestext="Se IM &amp; Chat"/>
-  </notification>
-
-  <notification
-   
-   label="Add Friend"
-   name="AddFriend"
-   >
-Venner kan give tilladelse til at følge hinanden
+		<usetemplate name="okcancelbuttons" notext="Afslut" yestext="Se PB &amp; Chat"/>
+	</notification>
+	<notification label="Tilføj ven" name="AddFriend">
+		Venner kan give tilladelse til at følge hinanden
 på Verdenskortet eller modtage status opdateringer.
 
 Tilbyd venskab til [NAME]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Annullér"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   label="Add Friend"
-   name="AddFriendWithMessage"
-   >
-Venner kan give tilladelse til at følge hinanden
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification label="Tilføj ven" name="AddFriendWithMessage">
+		Venner kan give tilladelse til at følge hinanden
 på Verdenskortet eller modtage status opdateringer.
 
 Tilbyd venskab til [NAME]?
-    <form name="form">
-      <input name="message" type="text">
-Vil du være min ven?
-      </input>
+		<form name="form">
+			<input name="message" type="text">
+				Vil du være min ven?
+			</input>
+			<button name="Offer" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="NotEnoughCurrency">
+		[NAME] L$ [PRICE] Du har ikke nok L$ til dette.
+	</notification>
+	<notification name="BuyOneObjectOnly">
+		Ikke muligt at købe mere end et objekt ad gangen. Vælg kun ét objekt og prøv igen.
+	</notification>
+	<notification name="CannotStartAuctionAlreadyForSale">
+		Du kan ikke starte en auktion på en parcel som allerede er sat til salg. Fjern &apos;til salg&apos; muligheden hvis du ønsker at starte en auktion.
+	</notification>
+	<notification name="OfferTeleport">
+		<form name="form">
+			<input name="message" type="text">
+				Mød mig i [REGION]
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked">
+		Du har ikke adgang til denne region på grund af din valgte indholdsrating. Dette kan skyldes manglende validering af din alder.
+
+Undersøg venligst om du har installeret den nyeste Second Life klient, og gå til &apos;Knowledge Base&apos; for yderligere detaljer om adgang til områder med denne indholdsrating.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_KB">
+		Du har ikke adgang til denne region på grund af din valgte indholdsrating.
+
+GÃ¥ til &apos;Knowledge Base&apos; for mere information om indholdsratings.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+		</url>
+    <usetemplate
+     name="okcancelignore"
+     yestext="GÃ¥ til &apos;Knowledge Base&apos;"
+	 notext="Luk"
+	 ignoretext="Når regionen er blokeret på grund af indholdsrating"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_Notify">
+		Du har ikke adgang til denne region på grund af din valgte indholdsrating.
+	</notification>
+	<notification name="RegionEntryAccessBlocked_Change">
+		Du har ikke adgang til denne region på grund af din nuværende indholdsrating opsætning.
+
+Du kan vælge &apos;Indstillinger&apos; for at hæve din indholdsrating nu og dermed få adgang. Du vil så få mulighed for at søge og få adgang til områder med indhold af typen [REGIONMATURITY]. Hvis du senere ønsker at skifte tilbage, kan du skifte tilbage i &apos;Indstillinger&apos;.
+	<form name="form">
       <button
-       
-       
-       name="Offer"
-       text="OK"/>
+       name="OK"
+       text="Ændre præferencer"/>
       <button
-       
        name="Cancel"
-       text="Annullér"/>
+       text="Luk"/>
+       <ignore name="ignore" text="Når regionen er blokeret på grund af indholdsrating"/>
     </form>
-  </notification>
+	</notification>
+	<notification name="LandClaimAccessBlocked">
+		Du kan ikke kræve dette land på grund af din nuværende indholdsrating indstillinge . Dette kan skyldes manglende validering af din alder.
 
-  <notification
-   
-   name="NotEnoughCurrency"
-   >
-[NAME] L$ [PRICE] Du har ikke nok L$ til dette.
-  </notification>
+Undersøg om du har den nyeste Second Life klient og gå venligst til &apos;Knowledge Base&apos; for yderligere detaljer om adgang til områder med denne indholdsrating.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked_KB">
+		Du kan ikke kræve dette land på grund af din nuværende indholdsrating indstilling..
+
+GÃ¥ venligst til &apos;Knowledge Base&apos; for yderligere information om indholdsrating.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+		</url>
+    <usetemplate
+     name="okcancelignore"
+     yestext="GÃ¥ til &apos;Knowledge Base&apos;"
+	 notext="Luk"
+	 ignoretext="Når land ikke kan kræves på grund af indholdsrating"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked_Notify">
+		Du kan ikke kræve dette land på grund af din indholdsrating.
+	</notification>
+	<notification name="LandClaimAccessBlocked_Change">
+		Du kan ikke kræve dette land på grund af din nuværende indholdsrating indstilling..
+
+Du kan vælge &apos;Indstillinger&apos; for at hæve din indholdsrating nu og dermed få adgang. Du vil så få mulighed for at søge og få adgang til områder med indhold af typen [REGIONMATURITY]. Hvis du senere ønsker at skifte tilbage, kan du skifte tilbage i &apos;Indstillinger&apos;.
+    <usetemplate
+     name="okcancelignore"
+     yestext="Ændre præferencer"
+	 notext="Luk"
+	 ignoretext="Når land ikke kan kræves på grund af indholdsrating"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked">
+		Du kan ikke købe dette land på grund af din nuværende indholdsrating indstillinge . Dette kan skyldes manglende validering af din alder.
+
+Undersøg om du har den nyeste Second Life klient og gå venligst til &apos;Knowledge Base&apos; for yderligere detaljer om adgang til områder med denne indholdsrating.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked_KB">
+		Du kan ikke købe dette land på grund af din nuværende indholdsrating. 
+
+GÃ¥ til &apos;Knowledge Base&apos; for yderligere detaljer om indholdsrating.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+		</url>
+    <usetemplate
+     name="okcancelignore"
+     yestext="GÃ¥ til &apos;Knowledge Base&apos;"
+	 notext="Luk"
+	 ignoretext="Når land ikke kan købes på grund af indholdsrating"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked_Notify">
+		Du kan ikke købe dette land på grund af din nuværende indholdsrating indstilling.
+	</notification>
+	<notification name="LandBuyAccessBlocked_Change">
+		Du kan ikke købe dette land på grund af din valgte inholdsrating.
+
+Du kan vælge &apos;Indstillinger&apos; for at hæve din indholdsrating nu og dermed få adgang. Du vil så få mulighed for at søge og få adgang til områder med indhold af typen [REGIONMATURITY]. Hvis du senere ønsker at skifte tilbage, kan du skifte tilbage i &apos;Indstillinger&apos;.
+    <usetemplate
+     name="okcancelignore"
+     yestext="Ændre præferencer"
+	 notext="Luk"
+	 ignoretext="Når land ikke kan købes på grund af indholdsrating"/>
+	</notification>
+	<notification name="UnableToLoadNotecardAsset">
+		Kunne ikke hente notecard indhold.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SetClassifiedMature">
+		Indeholder denne annonce &apos;Mature&apos; indhold?
+    <usetemplate
+     canceltext="Annullér"
+     name="yesnocancelbuttons"
+     notext="Nej"
+     yestext="Ja"/>
+	</notification>
+	<notification name="SetGroupMature">
+		Indeholder denne gruppe &apos;Mature&apos; indhold?
+    <usetemplate
+     canceltext="Annullér"
+     name="yesnocancelbuttons"
+     notext="Nej"
+     yestext="Ja"/>
+	</notification>
+	<notification label="Indholdsrating" name="HelpRegionMaturity">
+		Sætter indholdsrating for regionen, som den vises øverst på menu-bjælken i beboernes klient, og i tooltips på verdenskortet når cursoren placeres over denne region. Denne indstilling har også betydning for adgangen til regionen og for søgeresultater. Andre beboere må kun få adgang til regionen eller se regionen i søgeresultater hvis de har valgt samme eller højere indholdsrating i deres opsætning.
 
-  <notification
-   
-   name="HelpReportAbuseEmailLL"
-   >
-Brug dette værktøj for at rapportere brud på de almindelige bestemmelser og fællesskabs Standarder. Se:
+Det kan tage noget tid inden en ændring af indholdsrating er synligt på kortet.
+	</notification>
+	<notification name="HelpReportAbuseEmailLL">
+		Brug dette værktøj for at rapportere brud på de almindelige bestemmelser og fællesskabs Standarder. Se:
 
 http://secondlife.com/corporate/tos.php
 http://secondlife.com/corporate/cs.php
@@ -496,13 +509,9 @@ http://secondlife.com/corporate/cs.php
 Alle rapporterede brud på almindelige bestemmelser og fællesskabs Standarder bliver undersøgt og løst. Du kan følge løsningen på din anmeldselse på:
 
 http://secondlife.com/support/incidentreport.php
-  </notification>
-
-  <notification
-   
-   name="HelpReportAbuseContainsCopyright"
-   >
-Dear Resident,
+	</notification>
+	<notification name="HelpReportAbuseContainsCopyright">
+		Dear Resident,
 
 Du ser ud til at være ved at rapportere noget vedr. krænkelse af intellektuelle ejendomsrettigheder. Sørg for, at du rapporterer dette korrekt:
 
@@ -515,1268 +524,659 @@ Hvis du stadig ønsker at fortsætte med misbrugs processen, luk da venligst det
 Mange tak,
 
 Linden Lab
-  </notification>
-
-  <notification
-   
-   name="ConfirmClearCookies"
-   >
-Er du sikker på du vil slette alle cookies?
-  </notification>
-
-  <notification
-   
-   name="ChatterBoxSessionStartError"
-   >
-Ikke i stand til at start chat med [RECIPIENT].
+	</notification>
+	<notification name="ConfirmClearCookies">
+		Er du sikker på du vil slette alle cookies?
+	</notification>
+	<notification name="NewSkyPreset">
+		<form name="form">
+			<input name="message" type="text">
+				Ny forudindstilling
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="NewWaterPreset">
+		<form name="form">
+			<input name="message" type="text">
+				Ny forudindstilling
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="ChatterBoxSessionStartError">
+		Ikke i stand til at start chat med [RECIPIENT].
 [REASON]
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="Cannot_Purchase_an_Attachment"
-   >
-Ting kan ikke købes imens de er en del af tilbehør.
-  </notification>
-
-  <notification
-   
-   name="NewWaterPreset"
-   >
-    <form name="form">
-      <input name="message" type="text">
-Ny forudindstilling
-      </input>
-      <button
-       
-       
-       name="OK"
-       text="OK"/>
-      <button
-       
-       name="Cancel"
-       text="Annullér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="NewSkyPreset"
-   >
-    <form name="form">
-      <input name="message" type="text">
-Ny forudindstilling
-      </input>
-      <button
-       
-       
-       name="OK"
-       text="OK"/>
-      <button
-       
-       name="Cancel"
-       text="Annullér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="OfferTeleport"
-   >
-    <form name="form">
-      <input name="message" type="text">
-Mød mig i [REGION]
-      </input>
-      <button
-       
-       
-       name="OK"
-       text="OK"/>
-      <button
-       
-       name="Cancel"
-       text="Annullér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="SystemMessageTip"
-   >
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="Cannot_Purchase_an_Attachment">
+		Ting kan ikke købes imens de er en del af tilbehør.
+	</notification>
+	<notification name="SystemMessageTip">
+		[MESSAGE]
+	</notification>
+	<notification name="Cancelled">
+		Annulléret
+	</notification>
+	<notification name="CancelledSit">
+		Annulléret sid
+	</notification>
+	<notification name="CancelledAttach">
+		Annulléreret vedhæft
+	</notification>
+	<notification name="ReplacedMissingWearable">
+		Erstattet manglende tøj/kropsdele med standard.
+	</notification>
+	<notification name="FriendOnline">
+		[FIRST] [LAST] er Online
+	</notification>
+	<notification name="FriendOffline">
+		[FIRST] [LAST] er Offline
+	</notification>
+	<notification name="AddSelfFriend">
+		Du kan ikke tilføje dig selv som ven.
+	</notification>
+	<notification name="UploadingAuctionSnapshot">
+		Uploader billeder fra verdenen og www...
+(Tager omkring 5 minutter.)
+	</notification>
+	<notification name="UploadPayment">
+		Du betalte L$[AMOUNT] for at uploade.
+	</notification>
+	<notification name="UploadWebSnapshotDone">
+		Billeder fra www er uploadet.
+	</notification>
+	<notification name="UploadSnapshotDone">
+		Billeder fra verdenen er uploadet
+	</notification>
+	<notification name="TerrainDownloaded">
+		Terrain.raw downloadet
+	</notification>
+	<notification name="GestureMissing">
+		Gestus [NAME] mangler i databasen.
+	</notification>
+	<notification name="UnableToLoadGesture">
+		Ikke muligt at indlæse gestus [NAME].
+Prøv venligst igen.
+	</notification>
+	<notification name="LandmarkMissing">
+		Landmærke mangler i databasen.
+	</notification>
+	<notification name="UnableToLoadLandmark">
+		Ikke muligt at indlæse landmærke.  Prøv venligst igen.
+	</notification>
+	<notification name="CapsKeyOn">
+		Du har slået store bogstaver til.
+Da det vil have betydning når du indtaster kodeordet, vil du højest sandsynlig slå dem fra.
+	</notification>
+	<notification name="NotecardMissing">
+		Note mangler i databasen.
+	</notification>
+	<notification name="NotecardNoPermissions">
+		Utilstrækkelige tilladelser til at se note.
+	</notification>
+	<notification name="RezItemNoPermissions">
+		Utilstrækkelige tilladelser til at danne genstanden.
+	</notification>
+	<notification name="UnableToLoadNotecard">
+		Ikke muligt at indlæse note.
+Prøv venligst igen.
+	</notification>
+	<notification name="ScriptMissing">
+		Script mangler i databasen.
+	</notification>
+	<notification name="ScriptNoPermissions">
+		Utilstrækkelige tilladelser til at se script.
+	</notification>
+	<notification name="UnableToLoadScript">
+		Ikke muligt at indlæse script.  Prøv venligst igen.
+	</notification>
+	<notification name="IncompleteInventory">
+		Det komplette indhold, du tilbyder, er ikke endnu tilgængelig lokalt. Prøv venligst at tilbyde tingene igen om lidt.
+	</notification>
+	<notification name="CannotModifyProtectedCategories">
+		Du kan ikke ændre beskyttede kategorier.
+	</notification>
+	<notification name="CannotRemoveProtectedCategories">
+		Du kan ikke fjerne beskyttede kategorier.
+	</notification>
+	<notification name="OfferedCard">
+		Du har tilbudt et visitkort til [FIRST] [LAST]
+	</notification>
+	<notification name="UnableToBuyWhileDownloading">
+		Ikke muligt at købe, imens genstandens data hentes.
+Prøv venligst igen.
+	</notification>
+	<notification name="UnableToLinkWhileDownloading">
+		Ikke muligt at lænke imens genstandens data hentes.
+Prøv venligst igen.
+	</notification>
+	<notification name="CannotBuyObjectsFromDifferentOwners">
+		Kan ikke købe genstande fra forskellige ejere på samme tid.
+Prøv venligst at vælge en enkelt genstand.
+	</notification>
+	<notification name="ObjectNotForSale">
+		Genstanden ser ikke ud til at være til salg.
+	</notification>
+	<notification name="EnteringGodMode">
+		Starter gud-tilstand, niveau [LEVEL]
+	</notification>
+	<notification name="LeavingGodMode">
+		Stopper gud-tilstand, niveau [LEVEL]
+	</notification>
+	<notification name="CopyFailed">
+		Kopiering lykkedes ikke fordi du ikke har nok tilladelser til at kopiere
+	</notification>
+	<notification name="InventoryAccepted">
+		[NAME] accepterede det du tilbød fra din beholdning.
+	</notification>
+	<notification name="InventoryDeclined">
+		[NAME] afviste det du tilbød fra din beholdning.
+	</notification>
+	<notification name="ObjectMessage">
+		[NAME]: [MESSAGE]
+	</notification>
+	<notification name="CallingCardAccepted">
+		Dit visitkort blev accepteret.
+	</notification>
+	<notification name="CallingCardDeclined">
+		Dit visitkort blev afvist.
+	</notification>
+	<notification name="TeleportToLandmark">
+		Nu hvor du er nået frem til hovedlandet, kan du teleportere til steder som &apos;[NAME]&apos; ved at klikke på Beholdning-knappen i nederste højre side af skærmen hvorefter du vælger Landmærke-mappen.
+Dobbeltklik på landmærket og klik på Teleportér, for at rejse derhen.
+	</notification>
+	<notification name="TeleportToPerson">
+		Nu hvor du har nået frem til hovedlandet, kan du kontakte indbyggere som &apos;[NAME]&apos; ved at klikke på Beholdning-knappen i nederste højre side af skærmen, hvorefter du vælger Visitkort-mappen.
+Dobbeltklik på kortet, klik på IM og skriv beskeden.
+	</notification>
+	<notification name="CantSelectLandFromMultipleRegions">
+		Kan ikke vælge land på tværs af grænser.
+Prøv at vælge mindre stykker land.
+	</notification>
+	<notification name="SearchWordBanned">
+		Visse ord er fjernet fra din søge-sætning på grund af at disse strider mod de generelle &apos;Community Standards&apos;.
+	</notification>
+	<notification name="NoContentToSearch">
+		Vælg venligst mindst en indholdstype for at søge (PG, Mature, or Adult).
+	</notification>
+	<notification name="GroupVote">
+		[NAME] har forslået at stemme for:
 [MESSAGE]
-  </notification>
-
-  <notification
-   
-   name="Cancelled"
-   >
-Annulléret
-  </notification>
+		<form name="form">
+			<button name="VoteNow" text="Stem nu"/>
+			<button name="Later" text="Senere"/>
+		</form>
+	</notification>
+	<notification name="SystemMessage">
+		[MESSAGE]
+	</notification>
+	<notification name="EventNotification">
+		Besked om begivenhed:
 
-  <notification
-   
-   name="CancelledSit"
-   >
-Annulléret sid
-  </notification>
+[NAME]
+[DATE]
+		<form name="form">
+			<button name="Teleport" text="Teleportér"/>
+			<button name="Description" text="Beskrivelse"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="TransferObjectsHighlighted">
+		Alle genstande på denne grund, som vil blive overført til køberen af denne grund, er nu oplyst.
 
-  <notification
-   
-   name="CancelledAttach"
-   >
-Annulléreret vedhæft
-  </notification>
+* Træer og græs, der vil blive overført, er ikke fremhævet.
+		<form name="form">
+			<button name="Done" text="Færdig"/>
+		</form>
+	</notification>
+	<notification name="DeactivatedGesturesTrigger">
+		Deaktiverede bevægelser med samme udløser: [NAMES]
+	</notification>
+	<notification name="NoQuickTime">
+		Apple&apos;s QuickTime ser ikke ud til at være installeret på computeren.
+Hvis du vil se live transmitteret medie på grunde, der understøtter det, skal du gå ind på QuickTime-siden (http://www.apple.dk/quicktime) og installere QuickTime afspilleren.
+	</notification>
+	<notification name="OwnedObjectsReturned">
+		De genstande du ejer på det valgte stykke land er blevet returneret til din beholdning.
+	</notification>
+	<notification name="OtherObjectsReturned">
+		Genstandene på det valgte stykke land der er ejet af [FIRST] [LAST] er blevet returneret til hans eller hendes beholdning.
+	</notification>
+	<notification name="OtherObjectsReturned2">
+		Genstandene på det valgte stykke land der er ejet af beboeren &apos;[NAME]&apos; er blevet returneret til deres ejere.
+	</notification>
+	<notification name="GroupObjectsReturned">
+		Genstandene på det valgte stykke land, delt med gruppen [GROUPNAME], er blevet returneret til deres ejeres beholdninger.
+Genstande, som er dedikerede og som kan overføres, er blevet returneret til deres forrige ejere.
+Genstande, der ikke kan overføres og som er dedikeret til gruppen, er blevet slettet.
+	</notification>
+	<notification name="UnOwnedObjectsReturned">
+		Genstandene på det valgte stykke land, der IKKE er ejet af dig, er blevet returneret til deres ejere.
+	</notification>
+	<notification name="NotSafe">
+		Dette land har sat skade til (&apos;ikke sikker&apos;).
+Du kan komme til skade her. Hvis du dør, vil du blive teleporteret til din hjem-lokalitet.
+	</notification>
+	<notification name="NoFly">
+		Dette land har slået flyvning fra (&apos;ingen flyvning&apos;).
+Du kan ikke flyve her.
+	</notification>
+	<notification name="PushRestricted">
+		Dette land giver ikke mulighed for at &apos;skubbe&apos; andre, med mindre du ejer landet.
+	</notification>
+	<notification name="NoVoice">
+		Dette land har ikke mulighed for at bruge stemme.
+	</notification>
+	<notification name="NoBuild">
+		Dette land giver ikke mulighed for at bygge (&apos;byggeri forbudt&apos;).
+Du kan ikke skabe genstande her.
+	</notification>
+	<notification name="ScriptsStopped">
+		En administrator har midlertidig stoppet scripts i denne region.
+	</notification>
+	<notification name="ScriptsNotRunning">
+		Denne region kører ikke nogen scripts.
+	</notification>
+	<notification name="NoOutsideScripts">
+		Dette land har eksterne scripts slået fra
+(&apos;ingen eksterne scripts&apos;).
+Ingen scripts vil køre på nær dem, som tilhører ejeren af landet.
+	</notification>
+	<notification name="ClaimPublicLand">
+		Du kan kun gøre krav på offentlig land i den region, du befinder dig i.
+	</notification>
+	<notification name="RegionTPAccessBlocked">
+		Du har ikke adgang til denne region på grund af din valgte indholdsrating. Dette kan skyldes manglende validering af din alder eller at du ikke benytter den nyeste Second Life klient.
+
+Gå venligst til &apos;Knowledge Base&apos; for yderligere detaljer om adgang til områder med denne indholdsrating.
+	</notification>
+	<notification name="URBannedFromRegion">
+		Du er blokeret i denne region.
+	</notification>
+	<notification name="NoTeenGridAccess">
+		Du kan ikke tilslutte dig denne &apos;Teen&apos; region.
+	</notification>
+	<notification name="NoHelpIslandTP">
+		Du kan ikke teleportere tilbage til Help Island.
+Gå til &apos;Help Island Puclic&apos; for at prøve tutorial igen.
+	</notification>
+	<notification name="ImproperPaymentStatus">
+		Du har ikke de rette betalingsoplysninger til at komme ind i denne region.
+	</notification>
+	<notification name="MustGetAgeRegion">
+		Du skal være aldersgodkendt for at komme ind i denne region.
+	</notification>
+	<notification name="MustGetAgeParcel">
+		Du skal være aldersgodkendt for at komme ind på denne parcel.
+	</notification>
+	<notification name="NoDestRegion">
+		Destinations region ikke fundet.
+	</notification>
+	<notification name="NotAllowedInDest">
+		Du har ikke adgang til denne destination.
+	</notification>
+	<notification name="RegionParcelBan">
+		Kan ikke skifte til ny region via en blokeret parcel. Prøv en anden vej ind.
+	</notification>
+	<notification name="TelehubRedirect">
+		Du er blevet omdirigeret til en telehub.
+	</notification>
+	<notification name="CouldntTPCloser">
+		Kunne ikke teleportere nærmere til destination.
+	</notification>
+	<notification name="TPCancelled">
+		Teleport afbrudt.
+	</notification>
+	<notification name="FullRegionTryAgain">
+		Den region du prøver at komme ind i er fuld for øjeblikket.
+Prøv igen om lidt.
+	</notification>
+	<notification name="GeneralFailure">
+		Generel fejl.
+	</notification>
+	<notification name="RoutedWrongRegion">
+		Du blev sendt til en forkert region. Prøv igen.
+	</notification>
+	<notification name="NoValidAgentID">
+		Ikke en gyldig agent ID.
+	</notification>
+	<notification name="NoValidSession">
+		Ikke noget gyldig sessions-ID
+	</notification>
+	<notification name="NoValidCircuit">
+		Ingen gyldig kode for kredsløb.
+	</notification>
+	<notification name="NoValidTimestamp">
+		Ikke et gyldigt klokkeslæt.
+	</notification>
+	<notification name="NoPendingConnection">
+		Kunne ikke skabe fast forbindelse.
+	</notification>
+	<notification name="InternalUsherError">
+		Der opstod en intern fejl ved teleportering til din teleport destination.. Der kan være generelle problemer med Second Life lige nu.
+	</notification>
+	<notification name="NoGoodTPDestination">
+		Kunne ikke finde et egnet teleport sted i denne region.
+	</notification>
+	<notification name="InternalErrorRegionResolver">
+		Der opstod en intern fejl ved beregning af globale koordinater for din teleport forespørgsel. Der kan være generelle problemer med Second Life lige nu.
+	</notification>
+	<notification name="NoValidLanding">
+		Kunne ikke finde et gyldigt landingspunkt.
+	</notification>
+	<notification name="NoValidParcel">
+		No valid parcel could be found.
+	</notification>
+	<notification name="ObjectGiveItem">
+		En genstand med navnet [OBJECTFROMNAME], ejet af [FIRST] [LAST], har givet dig en/et [OBJECTTYPE] med navnet [OBJECTNAME].
+		<form name="form">
+			<button name="Keep" text="Behold"/>
+			<button name="Discard" text="Smid væk"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="ObjectGiveItemUnknownUser">
+		En genstand med navnet [OBJECTFROMNAME], ejet af (en ukendt bruger), har givet dig en/et [OBJECTTYPE] med navnet [OBJECTNAME].
+		<form name="form">
+			<button name="Keep" text="Behold"/>
+			<button name="Discard" text="Smid væk"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="UserGiveItem">
+		[NAME] har givet dig en/et [OBJECTTYPE] med navnet &apos;[OBJECTNAME]&apos;.
+		<form name="form">
+			<button name="Keep" text="Behold"/>
+			<button name="Discard" text="Smid væk"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="GodMessage">
+		[NAME]
+[MESSAGE]
+	</notification>
+	<notification name="JoinGroup">
+		[MESSAGE]
+		<form name="form">
+			<button name="Join" text="Indmeld"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Info" text="Information"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered">
+		[NAME] har tilbudt at teleportere dig til hans eller hendes lokalitet:
 
-  <notification
-   
-   name="ReplacedMissingWearable"
-   >
-Erstattet manglende tøj/kropsdele med standard.
-  </notification>
+[MESSAGE]
+		<form name="form">
+			<button name="Teleport" text="Teleportér"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="GotoURL">
+		[MESSAGE]
+[URL]
+		<form name="form">
+			<button name="Later" text="Senere"/>
+			<button name="GoNow..." text="GÃ¥ nu..."/>
+		</form>
+	</notification>
+	<notification name="OfferFriendship">
+		[NAME] tilbyder venskab.
 
-  <notification
-   
-   name="FriendOnline"
-   >
-[FIRST] [LAST] er Online
-  </notification>
+Som standard vil du kunne se andres onlinestatus.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+		</form>
+	</notification>
+	<notification name="FriendshipAccepted">
+		[NAME] accepterede dit tilbud om venskab.
+	</notification>
+	<notification name="FriendshipDeclined">
+		[NAME] afviste dit tilbud om venskab.
+	</notification>
+	<notification name="OfferCallingCard">
+		[FIRST] [LAST] tilbyder vedkommendes visitkort.
+Dette vil tilføje et bogmærke i din beholdning, så du hurtigt kan sende en personlig besked (IM) til denne beboer.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+		</form>
+	</notification>
+	<notification name="RegionRestartMinutes">
+		Regionen genstarter om [MINUTES] minutter.
+Hvis du bliver i denne region, vil du blive logget af.
+	</notification>
+	<notification name="RegionRestartSeconds">
+		Regionen genstarter om [SECONDS] sekunder.
+Hvis du bliver i denne region, vil du blive logget af.
+	</notification>
+	<notification name="LoadWebPage">
+		Indlæs internetside [URL]?
 
-  <notification
-   
-   name="FriendOffline"
-   >
-[FIRST] [LAST] er Offline
-  </notification>
+[MESSAGE]
 
-  <notification
-   
-   name="AddSelfFriend"
-   >
-Du kan ikke tilføje dig selv som ven.
-  </notification>
+Fra genstand: [OBJECTNAME], ejer: [NAME]?
+		<form name="form">
+			<button name="Gotopage" text="GÃ¥ til side"/>
+			<button name="Cancel" text="Afbryd"/>
+		</form>
+	</notification>
+	<notification name="FailedToFindWearableUnnamed">
+		Det lykkedes ikke at finde [TYPE] i databasen.
+	</notification>
+	<notification name="FailedToFindWearable">
+		Det lykkedes ikke at finde [TYPE] med navnet [DESC] i databasen.
+	</notification>
+	<notification name="InvalidWearable">
+		Den genstand du prøver at tage på benytter funktioner som din klient ikke kan forstå. Opdatér din version af Second Life for at tage genstanden på.
+	</notification>
+	<notification name="ScriptQuestion">
+		&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[NAME]&apos;, vil gerne:
+ [QUESTIONS]
+Er det iorden?
+		<form name="form">
+			<button name="Yes" text="Ja"/>
+			<button name="No" text="Nej"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="ScriptQuestionCaution">
+		&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[NAME]&apos;, vil gerne:
 
-  <notification
-   
-   name="UploadingAuctionSnapshot"
-   >
-Uploader billeder fra verdenen og www...
-(Tager omkring 5 minutter.)
-  </notification>
-
-  <notification
-   
-   name="UploadPayment"
-   >
-Du betalte L$[AMOUNT] for at uploade.
-  </notification>
-
-  <notification
-   
-   name="UploadWebSnapshotDone"
-   >
-Billeder fra www er uploadet.
-  </notification>
-
-  <notification
-   
-   name="UploadSnapshotDone"
-   >
-Billeder fra verdenen er uploadet
-  </notification>
-
-  <notification
-   
-   name="TerrainDownloaded"
-   >
-Terrain.raw downloadet
-  </notification>
-
-  <notification
-   
-   name="GestureMissing"
-   >
-Gestus [NAME] mangler i databasen.
-  </notification>
-
-  <notification
-   
-   name="UnableToLoadGesture"
-   >
-Ikke muligt at indlæse gestus [NAME].
-Prøv venligst igen.
-  </notification>
-
-  <notification
-   
-   name="LandmarkMissing"
-   >
-Landmærke mangler i databasen.
-  </notification>
-
-  <notification
-   
-   name="UnableToLoadLandmark"
-   >
-Ikke muligt at indlæse landmærke.  Prøv venligst igen.
-  </notification>
-
-  <notification
-   
-   name="CapsKeyOn"
-   >
-Du har slået store bogstaver til.
-Da det vil have betydning når du indtaster kodeordet, vil du højest sandsynlig slå dem fra.
-  </notification>
-
-  <notification
-   
-   name="NotecardMissing"
-   >
-Note mangler i databasen.
-  </notification>
-
-  <notification
-   
-   name="NotecardNoPermissions"
-   >
-Utilstrækkelige tilladelser til at se note.
-  </notification>
-
-  <notification
-   
-   name="RezItemNoPermissions"
-   >
-Utilstrækkelige tilladelser til at danne genstanden.
-  </notification>
-
-  <notification
-   
-   name="UnableToLoadNotecard"
-   >
-Ikke muligt at indlæse note.
-Prøv venligst igen.
-  </notification>
-
-  <notification
-   
-   name="ScriptMissing"
-   >
-Script mangler i databasen.
-  </notification>
-
-  <notification
-   
-   name="ScriptNoPermissions"
-   >
-Utilstrækkelige tilladelser til at se script.
-  </notification>
-
-  <notification
-   
-   name="UnableToLoadScript"
-   >
-Ikke muligt at indlæse script.  Prøv venligst igen.
-  </notification>
-
-  <notification
-   
-   name="IncompleteInventory"
-   >
-Det komplette indhold, du tilbyder, er ikke endnu tilgængelig lokalt. Prøv venligst at tilbyde tingene igen om lidt.
-  </notification>
-
-  <notification
-   
-   name="CannotModifyProtectedCategories"
-   >
-Du kan ikke ændre beskyttede kategorier.
-  </notification>
-
-  <notification
-   
-   name="CannotRemoveProtectedCategories"
-   >
-Du kan ikke fjerne beskyttede kategorier.
-  </notification>
-
-  <notification
-   
-   name="OfferedCard"
-   >
-Du har tilbudt et visitkort til [FIRST] [LAST]
-  </notification>
-
-  <notification
-   
-   name="OfferedFriendship"
-   >
-Du har tilbudt venskab til [FIRST] [LAST]
-  </notification>
-
-  <notification
-   
-   name="UnableToBuyWhileDownloading"
-   >
-Ikke muligt at købe, imens genstandens data hentes.
-Prøv venligst igen.
-  </notification>
-
-  <notification
-   
-   name="UnableToLinkWhileDownloading"
-   >
-Ikke muligt at lænke imens genstandens data hentes.
-Prøv venligst igen.
-  </notification>
-
-  <notification
-   
-   name="CannotBuyObjectsFromDifferentOwners"
-   >
-Kan ikke købe genstande fra forskellige ejere på samme tid.
-Prøv venligst at vælge en enkelt genstand.
-  </notification>
-
-  <notification
-   
-   name="ObjectNotForSale"
-   >
-Genstanden ser ikke ud til at være til salg.
-  </notification>
-
-  <notification
-   
-   name="EnteringGodMode"
-   >
-Starter gud-tilstand, niveau [LEVEL]
-  </notification>
-
-  <notification
-   
-   name="LeavingGodMode"
-   >
-Stopper gud-tilstand, niveau [LEVEL]
-  </notification>
-
-  <notification
-   
-   name="CopyFailed"
-   >
-Kopiering lykkedes ikke fordi du ikke har nok tilladelser til at kopiere
-  </notification>
-
-  <notification
-   
-   name="InventoryAccepted"
-   >
-[NAME] accepterede det du tilbød fra din beholdning.
-  </notification>
-
-  <notification
-   
-   name="InventoryDeclined"
-   >
-[NAME] afviste det du tilbød fra din beholdning.
-  </notification>
-
-  <notification
-   
-   name="ObjectMessage"
-   >
-[NAME]: [MESSAGE]
-  </notification>
-
-  <notification
-   
-   name="CallingCardAccepted"
-   >
-Dit visitkort blev accepteret.
-  </notification>
-
-  <notification
-   
-   name="CallingCardDeclined"
-   >
-Dit visitkort blev afvist.
-  </notification>
-
-  <notification
-   
-   name="TeleportToLandmark"
-   >
-Nu hvor du er nået frem til hovedlandet, kan du teleportere til steder som &apos;[NAME]&apos; ved at klikke på Beholdning-knappen i nederste højre side af skærmen hvorefter du vælger Landmærke-mappen.
-Dobbeltklik på landmærket og klik på Teleportér, for at rejse derhen.
-  </notification>
-
-  <notification
-   
-   name="TeleportToPerson"
-   >
-Nu hvor du har nået frem til hovedlandet, kan du kontakte indbyggere som &apos;[NAME]&apos; ved at klikke på Beholdning-knappen i nederste højre side af skærmen, hvorefter du vælger Visitkort-mappen.
-Dobbeltklik på kortet, klik på IM og skriv beskeden.
-  </notification>
-
-  <notification
-   
-   name="CantSelectLandFromMultipleRegions"
-   >
-Kan ikke vælge land på tværs af grænser.
-Prøv at vælge mindre stykker land.
-  </notification>
-
-  <notification
-   
-   name="GroupVote"
-   >
-[NAME] har forslået at stemme for:
-[MESSAGE]
-    <form name="form">
-      <button
-       
-       name="VoteNow"
-       text="Stem nu"/>
-      <button
-       
-       name="Later"
-       text="Senere"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="SystemMessage"
-   >
-[MESSAGE]
-  </notification>
-
-  <notification
-   
-   name="EventNotification"
-   >
-Besked om begivenhed:
-
-[NAME]
-[DATE]
-    <form name="form">
-      <button
-       
-       name="Teleport"
-       text="Teleportér"/>
-      <button
-       
-       name="Description"
-       text="Beskrivelse"/>
-      <button
-       
-       name="Cancel"
-       text="Annullér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="TransferObjectsHighlighted"
-   >
-Alle genstande på denne grund, som vil blive overført til køberen af denne grund, er nu oplyst.
-
-* Træer og græs, der vil blive overført, er ikke fremhævet.
-    <form name="form">
-      <button
-       
-       name="Done"
-       text="Færdig"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="DeactivatedGesturesTrigger"
-   >
-Deaktiverede bevægelser med samme udløser: [NAMES]
-  </notification>
-
-  <notification
-   
-   name="NoQuickTime"
-   >
-Apple&apos;s QuickTime ser ikke ud til at være installeret på computeren.
-Hvis du vil se live transmitteret medie på grunde, der understøtter det, skal du gå ind på QuickTime-siden (http://www.apple.dk/quicktime) og installere QuickTime afspilleren.
-  </notification>
-
-  <notification
-   
-   name="OwnedObjectsReturned"
-   >
-De genstande du ejer på det valgte stykke land er blevet returneret til din beholdning.
-  </notification>
-
-  <notification
-   
-   name="OtherObjectsReturned"
-   >
-Genstandene på det valgte stykke land der er ejet af [FIRST] [LAST] er blevet returneret til hans eller hendes beholdning.
-  </notification>
-
-  <notification
-   
-   name="OtherObjectsReturned2"
-   >
-Genstandene på det valgte stykke land der er ejet af beboeren &apos;[NAME]&apos; er blevet returneret til deres ejere.
-  </notification>
-
-  <notification
-   
-   name="GroupObjectsReturned"
-   >
-Genstandene på det valgte stykke land, delt med gruppen [GROUPNAME], er blevet returneret til deres ejeres beholdninger.
-Genstande, som er dedikerede og som kan overføres, er blevet returneret til deres forrige ejere.
-Genstande, der ikke kan overføres og som er dedikeret til gruppen, er blevet slettet.
-  </notification>
-
-  <notification
-   
-   name="UnOwnedObjectsReturned"
-   >
-Genstandene på det valgte stykke land, der IKKE er ejet af dig, er blevet returneret til deres ejere.
-  </notification>
-
-  <notification
-   
-   name="NotSafe"
-   >
-Dette land har sat skade til (&apos;ikke sikker&apos;).
-Du kan komme til skade her. Hvis du dør, vil du blive teleporteret til din hjem-lokalitet.
-  </notification>
-
-  <notification
-   
-   name="NoFly"
-   >
-Dette land har slået flyvning fra (&apos;ingen flyvning&apos;).
-Du kan ikke flyve her.
-  </notification>
-
-  <notification
-   
-   name="PushRestricted"
-   >
-Dette land giver ikke mulighed for at &apos;skubbe&apos; andre, med mindre du ejer landet.
-  </notification>
-
-  <notification
-   
-   name="NoVoice"
-   >
-Dette land har ikke mulighed for at bruge stemme.
-  </notification>
-
-  <notification
-   
-   name="NoBuild"
-   >
-Dette land giver ikke mulighed for at bygge (&apos;byggeri forbudt&apos;).
-Du kan ikke skabe genstande her.
-  </notification>
-
-  <notification
-   
-   name="ScriptsStopped"
-   >
-En administrator har midlertidig stoppet scripts i denne region.
-  </notification>
-
-  <notification
-   
-   name="ScriptsNotRunning"
-   >
-Denne region kører ikke nogen scripts.
-  </notification>
-
-  <notification
-   
-   name="NoOutsideScripts"
-   >
-Dette land har eksterne scripts slået fra
-(&apos;ingen eksterne scripts&apos;).
-Ingen scripts vil køre på nær dem, som tilhører ejeren af landet.
-  </notification>
-
-  <notification
-   
-   name="ClaimPublicLand"
-   >
-Du kan kun gøre krav på offentlig land i den region, du befinder dig i.
-  </notification>
-
-  <notification
-   
-   name="ObjectGiveItem"
-   >
-En genstand med navnet [OBJECTFROMNAME], ejet af [FIRST] [LAST], har givet dig en/et [OBJECTTYPE] med navnet [OBJECTNAME].
-    <form name="form">
-      <button
-       
-       name="Keep"
-       text="Behold"/>
-      <button
-       
-       name="Discard"
-       text="Smid væk"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="ObjectGiveItemUnknownUser"
-   >
-En genstand med navnet [OBJECTFROMNAME], ejet af (en ukendt bruger), har givet dig en/et [OBJECTTYPE] med navnet [OBJECTNAME].
-    <form name="form">
-      <button
-       
-       name="Keep"
-       text="Behold"/>
-      <button
-       
-       name="Discard"
-       text="Smid væk"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="UserGiveItem"
-   >
-[NAME] har givet dig en/et [OBJECTTYPE] med navnet &apos;[OBJECTNAME]&apos;.
-    <form name="form">
-      <button
-       
-       name="Keep"
-       text="Behold"/>
-      <button
-       
-       name="Discard"
-       text="Smid væk"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="GodMessage"
-   >
-[NAME]
-[MESSAGE]
-  </notification>
-
-  <notification
-   
-   name="JoinGroup"
-   >
-[MESSAGE]
-    <form name="form">
-      <button
-       
-       name="Join"
-       text="Indmeld"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-      <button
-       
-       name="Info"
-       text="Information"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="TeleportOffered"
-   >
-[NAME] har tilbudt at teleportere dig til hans eller hendes lokalitet:
-
-[MESSAGE]
-    <form name="form">
-      <button
-       
-       name="Teleport"
-       text="Teleportér"/>
-      <button
-       
-       name="Cancel"
-       text="Annullér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="GotoURL"
-   >
-[MESSAGE]
-[URL]
-    <form name="form">
-      <button
-       
-       name="Later"
-       text="Senere"/>
-      <button
-       
-       name="GoNow..."
-       text="GÃ¥ nu..."/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="OfferFriendship"
-   >
-[NAME] tilbyder venskab.
-
-Som standard vil du kunne se andres onlinestatus.
-    <form name="form">
-      <button
-       
-       name="Accept"
-       text="Acceptér"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="FriendshipAccepted"
-   >
-[NAME] accepterede dit tilbud om venskab.
-  </notification>
-
-  <notification
-   
-   name="FriendshipDeclined"
-   >
-[NAME] afviste dit tilbud om venskab.
-  </notification>
-
-  <notification
-   
-   name="OfferCallingCard"
-   >
-[FIRST] [LAST] tilbyder vedkommendes visitkort.
-Dette vil tilføje et bogmærke i din beholdning, så du hurtigt kan sende en personlig besked (IM) til denne beboer.
-    <form name="form">
-      <button
-       
-       name="Accept"
-       text="Acceptér"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="RegionRestartMinutes"
-   
-   
-   >
-Regionen genstarter om [MINUTES] minutter.
-Hvis du bliver i denne region, vil du blive logget af.
-  </notification>
-
-  <notification
-   
-   name="RegionRestartSeconds"
-   
-   
-   >
-Regionen genstarter om [SECONDS] sekunder.
-Hvis du bliver i denne region, vil du blive logget af.
-  </notification>
-
-  <notification
-   
-   name="LoadWebPage"
-   >
-Indlæs internetside [URL]?
-
-[MESSAGE]
-
-Fra genstand: [OBJECTNAME], ejer: [NAME]?
-    <form name="form">
-      <button
-       
-       name="Gotopage"
-       text="GÃ¥ til side"/>
-      <button
-       
-       name="Cancel"
-       text="Afbryd"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="FailedToFindWearableUnnamed"
-   >
-Det lykkedes ikke at finde [TYPE] i databasen.
-  </notification>
-
-  <notification
-   
-   name="FailedToFindWearable"
-   >
-Det lykkedes ikke at finde [TYPE] med navnet [DESC] i databasen.
-  </notification>
-
-  <notification
-   
-   name="ScriptQuestion"
-   >
-&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[NAME]&apos;, vil gerne:
- [QUESTIONS]
-Er det iorden?
-    <form name="form">
-      <button
-       
-       name="Yes"
-       text="Ja"/>
-      <button
-       
-       name="No"
-       text="Nej"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="ScriptQuestionCaution"
-   >
-&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[NAME]&apos;, vil gerne:
-
-[QUESTIONS]
-Hvis du ikke har tillid til denne genstand og dens skaber, bør du afvise denne forespørgsel. For yderligere information klik på Detaljer-knappen.
+[QUESTIONS]
+Hvis du ikke har tillid til denne genstand og dens skaber, bør du afvise denne forespørgsel. For yderligere information klik på Detaljer-knappen.
 
 Imødekom denne forespørgsel?
-    <form name="form">
-      <button
-       
-       name="Grant"
-       text="Imødekom"/>
-      <button
-       
-       name="Deny"
-       text="Afvis"/>
-      <button
-       
-       name="Details"
-       text="Detaljer..."/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="ScriptDialog"
-   >
-[FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
+		<form name="form">
+			<button name="Grant" text="Imødekom"/>
+			<button name="Deny" text="Afvis"/>
+			<button name="Details" text="Detaljer..."/>
+		</form>
+	</notification>
+	<notification name="ScriptDialog">
+		[FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
 [MESSAGE]
-    <form name="form">
-      <button
-       
-       name="Ignore"
-       text="Ignorér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="ScriptDialogGroup"
-   >
-[GROUPNAME]&apos;s &apos;[TITLE]&apos;
+		<form name="form">
+			<button name="Ignore" text="Ignorér"/>
+		</form>
+	</notification>
+	<notification name="ScriptDialogGroup">
+		[GROUPNAME]&apos;s &apos;[TITLE]&apos;
 [MESSAGE]
-    <form name="form">
-      <button
-       
-       name="Ignore"
-       text="Ignorér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="FirstBalanceIncrease"
-   >
-Du har lige modtaget L$[AMOUNT].
+		<form name="form">
+			<button name="Ignore" text="Ignorér"/>
+		</form>
+	</notification>
+	<notification name="FirstBalanceIncrease">
+		Du har lige modtaget L$[AMOUNT].
 Genstande og andre brugere kan give dig L$.
 Din saldo er vist i øverste højre hjørne af skærmen.
-  </notification>
-
-  <notification
-   
-   name="FirstBalanceDecrease"
-   >
-Du har lige modtaget L$[AMOUNT].
+	</notification>
+	<notification name="FirstBalanceDecrease">
+		Du har lige modtaget L$[AMOUNT].
 Din saldo er vist i øverste højre hjørne af skærmen.
-  </notification>
-
-  <notification
-   
-   name="FirstSit"
-   >
-Du sidder.
+	</notification>
+	<notification name="FirstSit">
+		Du sidder.
 Brug piletasterne (eller AWSD) for at ændre hvilken vej du ser.
 Klik på &apos;Stå op&apos;-knappen for at rejse dig op.
-  </notification>
-
-  <notification
-   
-   name="FirstMap"
-   >
-Klik og træk for at flytte kortvisningen.
+	</notification>
+	<notification name="FirstMap">
+		Klik og træk for at flytte kortvisningen.
 Dobbelt-klik for at teleportere.
 Brug kontrollerne til højre for at finde ting og se forskellige baggrunde.
-  </notification>
-
-  <notification
-   
-   name="FirstBuild"
-   >
-Du kan bygge nye genstande i nogle områder af [SECOND_LIFE].
+	</notification>
+	<notification name="FirstBuild">
+		Du kan bygge nye genstande i nogle områder af [SECOND_LIFE].
 Brug værktøjet øverst til venstre for at bygge, og prøv at holde Ctrl eller Alt nede for hurtigt at skifte imellem værktøjerne.
 Tryk Esc for at stoppe med at bygge.
-  </notification>
-
-  <notification
-   
-   name="FirstLeftClickNoHit"
-   >
-Venstre-klik interagerer med specielle genstande.
+	</notification>
+	<notification name="FirstLeftClickNoHit">
+		Venstre-klik interagerer med specielle genstande.
 Hvis musemarkøren ændrer sig til en hånd, kan du interagere med genstanden.
 Højre-klik viser altid en menu med ting du kan gøre.
-  </notification>
-
-  <notification
-   
-   name="FirstTeleport"
-   >
-Du har lige teleporteret.
+	</notification>
+	<notification name="FirstTeleport">
+		Du har lige teleporteret.
 Du er ved info-standen nærmest ved din destination.
 Din destination er markeret med en stor rød lyskegle.
-  </notification>
-
-  <notification
-   
-   name="FirstOverrideKeys"
-   >
-Dine bevælgelsestaster bliver nu håndteret af et objekt.
+	</notification>
+	<notification name="FirstOverrideKeys">
+		Dine bevælgelsestaster bliver nu håndteret af et objekt.
 Brug piletasterne eller AWSD for at se, hvad de gør.
 Nogle genstande (som skydevåben) kræver at du går ind i musevisning for at bruge dem.
 Tryk på &apos;M&apos; for at gåre det.
-  </notification>
-
-  <notification
-   
-   name="FirstAppearance"
-   >
-Du tilretter dit udseende.
+	</notification>
+	<notification name="FirstAppearance">
+		Du tilretter dit udseende.
 For at rotere og zoome brug piletasterne.
 Når du er færdig, tryk på &apos;Gem alt&apos; for at gemme dit udseende og lukke.
 Du kan rette dit udseende så tit du vil.
-  </notification>
-
-  <notification
-   
-   name="FirstInventory"
-   >
-Dette er din beholdning, der indeholder objekter, noter, tøj og andre ting du ejer.
+	</notification>
+	<notification name="FirstInventory">
+		Dette er din beholdning, der indeholder objekter, noter, tøj og andre ting du ejer.
 * For at bære et objekt eller en mappe med tøj, træk den over på dig selv.
 * For at få et objekt frem i verdenen, træk den ud på jorden.
 * For at læse en note, dobbeltklik på den.
-  </notification>
-
-  <notification
-   
-   name="FirstSandbox"
-   >
-Dette er sandkasseområdet.
+	</notification>
+	<notification name="FirstSandbox">
+		Dette er sandkasseområdet.
 Genstande, der er skabt her, vil blive slettet efter du har forladt området. Sandkasser renses jævnligt. Se venligst informationen øverst på skærmen, lige ved siden af områdenavnet.
 
 Sandkasseområder er ikke almindelige. De er mærket med skilte.
-  </notification>
-
-  <notification
-   
-   name="FirstFlexible"
-   >
-Denne genstand er fleksibel.
+	</notification>
+	<notification name="FirstFlexible">
+		Denne genstand er fleksibel.
 Fleksible genstande er ikke fysiske og man kan gå igennem dem, indtil fleksibel-punktet ikke er afkrydset.
-  </notification>
-
-  <notification
-   
-   name="FirstDebugMenus"
-   >
-Du har sat avanceret menu til.
+	</notification>
+	<notification name="FirstDebugMenus">
+		Du har sat avanceret menu til.
 Denne menu indeholder funktioner brugbare for udviklere, der udbedrer fejl i Second Life.
 For at vise denne menu, skal man i Windows trykke Ctrl-Alt-D. PÃ¥ Mac tryk Cmd-Opt-Shift-D.
-  </notification>
-
-  <notification
-   
-   name="FirstSculptedPrim"
-   >
-Du retter en sculpted prim.
+	</notification>
+	<notification name="FirstSculptedPrim">
+		Du retter en sculpted prim.
 Sculpted prims kræver et specielt tekstur for at specificere deres form.
 Du kan finde eksempler på sculptede teksturer i din beholdning.
-  </notification>
-
-  <notification
-   
-   name="FirstMedia"
-   >
-Du er begyndt at afspille medie.  Medie kan sættes til automatisk af blive afspillet under Indstillinger, Lyd / Video. Vær opmærksom på, at der kan være en sikkerhedsrisiko for medie-steder, du ikke stoler på.
-  </notification>
-
-  <notification
-   
-   name="MaxListSelectMessage"
-   >
-Du må kun vælge op til [MAX_SELECT] genstande på denne liste.
-  </notification>
-
-  <notification
-   
-   name="VoiceInviteP2P"
-   >
-[NAME] inviterer dig til en stemme-chat.
+	</notification>
+	<notification name="FirstMedia">
+		Du er begyndt at afspille medie.  Medie kan sættes til automatisk af blive afspillet under Indstillinger, Lyd / Video. Vær opmærksom på, at der kan være en sikkerhedsrisiko for medie-steder, du ikke stoler på.
+	</notification>
+	<notification name="MaxListSelectMessage">
+		Du må kun vælge op til [MAX_SELECT] genstande på denne liste.
+	</notification>
+	<notification name="VoiceInviteP2P">
+		[NAME] inviterer dig til en stemme-chat.
 Klik for at acceptere at koble dig på samtalen eller Afvis for at afvise invitationen. Klik på Slå fra for at blokere denne opkalder.
-    <form name="form">
-      <button
-       
-       name="Accept"
-       text="Acceptér"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="AutoUnmuteByIM"
-   >
-[FIRST] [LAST] har fået en personlig besked (IM) og er automatisk ikke blokeret mere.
-  </notification>
-
-  <notification
-   
-   name="AutoUnmuteByMoney"
-   >
-[FIRST] [LAST] har fået penge og er automatisk ikke blokeret mere.
-  </notification>
-
-  <notification
-   
-   name="AutoUnmuteByInventory"
-   >
-[FIRST] [LAST] har fået tilbudt genstande og er automatisk ikke blokeret mere.
-  </notification>
-
-  <notification
-   
-   name="VoiceInviteGroup"
-   >
-[NAME] har tilsluttet sig stemme-chat med gruppen [GROUP].
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="AutoUnmuteByIM">
+		[FIRST] [LAST] har fået en personlig besked (IM) og er automatisk ikke blokeret mere.
+	</notification>
+	<notification name="AutoUnmuteByMoney">
+		[FIRST] [LAST] har fået penge og er automatisk ikke blokeret mere.
+	</notification>
+	<notification name="AutoUnmuteByInventory">
+		[FIRST] [LAST] har fået tilbudt genstande og er automatisk ikke blokeret mere.
+	</notification>
+	<notification name="VoiceInviteGroup">
+		[NAME] har tilsluttet sig stemme-chat med gruppen [GROUP].
 Klik Acceptér for at slutte dig til samtalen eller Afvis for at afvise invitationen. Klik Slå fra for at blokere denne opkalder.
-    <form name="form">
-      <button
-       
-       name="Accept"
-       text="Acceptér"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="VoiceInviteAdHoc"
-   >
-[NAME] har tilsluttet sig stemme-chat med en konference-chat.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="VoiceInviteAdHoc">
+		[NAME] har tilsluttet sig stemme-chat med en konference-chat.
 Klik Acceptér for at slutte dig til samtalen eller Afvis for at afvise invitationen. Klik Slå fra for at blokere denne opkalder.
-    <form name="form">
-      <button
-       
-       name="Accept"
-       text="Acceptér"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="InviteAdHoc"
-   >
-[NAME] inviterer dig til en konference-chat.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="InviteAdHoc">
+		[NAME] inviterer dig til en konference-chat.
 Klik Acceptér for at slutte dig til samtalen eller Afvis for at afvise invitationen. Klik Slå fra for at blokere denne opkalder.
-    <form name="form">
-      <button
-       
-       name="Accept"
-       text="Acceptér"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-      <button
-       
-       name="Mute"
-       text="Blokeret"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="VoiceChannelFull"
-   >
-Den stemme-chat, du prøver at tilslutte dig, [VOICE_CHANNEL_NAME], har nået maksiumum kapacitet. Prøv venligst igen senere.
-  </notification>
-
-  <notification
-   
-   name="ProximalVoiceChannelFull"
-   >
-Vi beklager.  Dette område har nået sin maksimale kapacitet for stemme-chat.  Prøv venligst at benytte stemme i et andet område.
-  </notification>
-
-  <notification
-   
-   name="VoiceChannelDisconnected"
-   >
-Du er blevet koblet af [VOICE_CHANNEL_NAME].  Du vil nu blive koblet op på en lokal stemme-chat.
-  </notification>
-
-  <notification
-   
-   name="VoiceChannelDisconnectedP2P"
-   >
-[VOICE_CHANNEL_NAME] har afsluttet opkaldet.  Du vil nu blive koblet op på en lokal stemme-chat.
-  </notification>
-
-  <notification
-   
-   name="P2PCallDeclined"
-   >
-[VOICE_CHANNEL_NAME] har afvist dit opkald.  Du vil nu blive koblet op på en lokal stemme-chat.
-  </notification>
-
-  <notification
-   
-   name="P2PCallNoAnswer"
-   >
-[VOICE_CHANNEL_NAME] har ikke mulighed for at besvare dit opkald.  Du vil nu blive koblet op på en lokal chat.
-  </notification>
-
-  <notification
-   
-   name="VoiceChannelJoinFailed"
-   >
-Det lykkedes ikke at koble op til [VOICE_CHANNEL_NAME]. Prøv venligst igen senere.
-  </notification>
-
-  <notification
-   
-   name="VoiceLoginRetry"
-   >
-Vi laver en stemmekanal til dig. Det kan tage op til et minut.
-  </notification>
-
-  <notification
-   
-   name="Cannot enter parcel: not a group member"
-   >
-Du kan ikke komme ind på området. Du er ikke medlem af den nødvendige gruppe.
-  </notification>
-
-  <notification
-   
-   name="Cannot enter parcel: banned"
-   >
-Du kan ikke komme ind på området. Du er blevet udelukket.
-  </notification>
-
-  <notification
-   
-   name="Cannot enter parcel: not on access list"
-   >
-Du kan ikke komme ind på området. Du er ikke på adgangslisten.
-  </notification>
-
-  <notification
-   
-   name="VoiceNotAllowed"
-   >
-Du har ikke tilladelse til at tilslutte dig stemme-chat på [VOICE_CHANNEL_NAME].
-  </notification>
-
-  <notification
-   
-   name="VoiceCallGenericError"
-   >
-En fejl er opstået under forsøget på at koble sig på stemme chatten [VOICE_CHANNEL_NAME].  Pråv venligst senere.
-  </notification>
-
-  <notification
-   
-   name="ServerVersionChanged"
-   >
-Det område, du er kommet ind på, kører en anden simulatorversion. Klik på denne besked for detaljer.
-  </notification>
-
-  <notification
-   
-   name="UnableToOpenCommandURL"
-   >
-Www-adressen, du har klikket på, kan ikke åbnes fra denne internetbrowser.
-  </notification>
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Mute" text="Blokeret"/>
+		</form>
+	</notification>
+	<notification name="VoiceChannelFull">
+		Den stemme-chat, du prøver at tilslutte dig, [VOICE_CHANNEL_NAME], har nået maksiumum kapacitet. Prøv venligst igen senere.
+	</notification>
+	<notification name="ProximalVoiceChannelFull">
+		Vi beklager.  Dette område har nået sin maksimale kapacitet for stemme-chat.  Prøv venligst at benytte stemme i et andet område.
+	</notification>
+	<notification name="VoiceChannelDisconnected">
+		Du er blevet koblet af [VOICE_CHANNEL_NAME].  Du vil nu blive koblet op på en lokal stemme-chat.
+	</notification>
+	<notification name="VoiceChannelDisconnectedP2P">
+		[VOICE_CHANNEL_NAME] har afsluttet opkaldet.  Du vil nu blive koblet op på en lokal stemme-chat.
+	</notification>
+	<notification name="P2PCallDeclined">
+		[VOICE_CHANNEL_NAME] har afvist dit opkald.  Du vil nu blive koblet op på en lokal stemme-chat.
+	</notification>
+	<notification name="P2PCallNoAnswer">
+		[VOICE_CHANNEL_NAME] har ikke mulighed for at besvare dit opkald.  Du vil nu blive koblet op på en lokal chat.
+	</notification>
+	<notification name="VoiceChannelJoinFailed">
+		Det lykkedes ikke at koble op til [VOICE_CHANNEL_NAME]. Prøv venligst igen senere.
+	</notification>
+	<notification name="VoiceLoginRetry">
+		Vi laver en stemmekanal til dig. Det kan tage op til et minut.
+	</notification>
+	<notification name="Cannot enter parcel: not a group member">
+		Du kan ikke komme ind på området. Du er ikke medlem af den nødvendige gruppe.
+	</notification>
+	<notification name="Cannot enter parcel: banned">
+		Du kan ikke komme ind på området. Du er blevet udelukket.
+	</notification>
+	<notification name="Cannot enter parcel: not on access list">
+		Du kan ikke komme ind på området. Du er ikke på adgangslisten.
+	</notification>
+	<notification name="VoiceNotAllowed">
+		Du har ikke tilladelse til at tilslutte dig stemme-chat på [VOICE_CHANNEL_NAME].
+	</notification>
+	<notification name="VoiceCallGenericError">
+		En fejl er opstået under forsøget på at koble sig på stemme chatten [VOICE_CHANNEL_NAME].  Pråv venligst senere.
+	</notification>
+	<notification name="ServerVersionChanged">
+		Det område, du er kommet ind på, kører en anden simulatorversion. Klik på denne besked for detaljer.
+	</notification>
+	<notification name="UnableToOpenCommandURL">
+		Www-adressen, du har klikket på, kan ikke åbnes fra denne internetbrowser.
+	</notification>
 </notifications>
-
diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml
index 393ac49725..4281ec6792 100644
--- a/indra/newview/skins/default/xui/da/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_general.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Generelt" name="general_tab">
 	<string name="help_text">
 		Generel-fanen indeholder generel information om
@@ -10,28 +10,26 @@ Bevæg din mus over mulighederne for mere hjælp.
 	<string name="group_info_unchanged">
 		Generel gruppeinformation er ændret.
 	</string>
-	<button label="?" label_selected="?" name="help_button" />
-	<line_editor label="Indtast nyt gruppenavn her" name="group_name_editor" />
+	<button label="?" label_selected="?" name="help_button"/>
+	<line_editor label="Indtast nyt gruppenavn her" name="group_name_editor"/>
 	<text name="group_name">
 		Skriv det nye gruppenavn her
 	</text>
 	<text name="prepend_founded_by">
 		Grundlagt af
 	</text>
-	<text name="founder_name">
+	<text name="founder_name" left_delta="70" >
 		(venter)
 	</text>
 	<text name="group_charter_label">
 		Gruppens formål
 	</text>
-	<texture_picker label="Gruppe distinktioner" name="insignia"
-	     tool_tip="Klik for at vælge et billede" />
+	<texture_picker label="Gruppe distinktioner" name="insignia" tool_tip="Klik for at vælge et billede"/>
 	<text_editor name="charter">
 		Gruppens formål
 	</text_editor>
-	<button label="Tilmeld (L$0)" label_selected="Tilmeld (L$0)" name="join_button" />
-	<button label="Detaljeret visning" label_selected="Detaljeret visning"
-	     name="info_button" />
+	<button label="Tilmeld (L$0)" label_selected="Tilmeld (L$0)" name="join_button"/>
+	<button label="Detaljeret visning" label_selected="Detaljeret visning" name="info_button"/>
 	<text name="text_owners_and_visible_members">
 		Ejere &amp; synlige medlemmer
 	</text>
@@ -39,34 +37,37 @@ Bevæg din mus over mulighederne for mere hjælp.
 		(Ejere er vist med fed skrift)
 	</text>
 	<name_list name="visible_members">
-		<column label="Medlemsnavn" name="name" />
-		<column label="Titel" name="title" />
-		<column label="Senest på d." name="online" />
+		<column label="Medlemsnavn" name="name"/>
+		<column label="Titel" name="title"/>
+		<column label="Senest på d." name="online"/>
 	</name_list>
 	<text name="text_group_preferences">
 		Gruppeindstillinger
 	</text>
 	<panel name="preferences_container">
-		<check_box label="Vis i søgning" name="show_in_group_list"
-		     tool_tip="Lad folk se denne gruppe i søgeresultater." />
-		<check_box label="Ã…ben tilmelding" name="open_enrollement"
-		     tool_tip="Angiver om denne gruppe tillader nye medlemmer at tilmelde sig, uden de er inviteret." />
-		<check_box label="Tilmeldingsgebyr: L$" name="check_enrollment_fee"
-		     tool_tip="Angiver om der kræves et gebyr, for at tilmelde sig gruppen." />
-		<spinner name="spin_enrollment_fee"
-		     tool_tip="Nye medlemmer skal betale dette gebyr for at tilmelde sig gruppen, når Tilmeldingsgebyr er valgt." />
-
+		<check_box label="Vis i søgning" name="show_in_group_list" tool_tip="Lad folk se denne gruppe i søgeresultater."/>
+		<check_box label="Ã…ben tilmelding" name="open_enrollement" tool_tip="Angiver om denne gruppe tillader nye medlemmer at tilmelde sig, uden de er inviteret."/>
+		<check_box label="Tilmeldingsgebyr: L$" name="check_enrollment_fee" tool_tip="Angiver om der kræves et gebyr, for at tilmelde sig gruppen."/>
+		<spinner name="spin_enrollment_fee" tool_tip="Nye medlemmer skal betale dette gebyr for at tilmelde sig gruppen, når Tilmeldingsgebyr er valgt." width="60" left_delta="130"/>
+		<combo_box name="group_mature_check" tool_tip="Angiver om din gruppes information anses som &apos;mature&apos;." width="150">
+			<combo_item name="select_mature">
+				- Vælg indholdsrating -
+			</combo_item>
+			<combo_item name="mature">
+				Mature indhold
+			</combo_item>
+			<combo_item name="pg">
+				PG indhold
+			</combo_item>
+		</combo_box>
 		<panel name="title_container">
 			<text name="active_title_label">
 				Min aktive titel
 			</text>
-			<combo_box length="150" name="active_title"
-			     tool_tip="Angiver den titel der vises i din avatars navnefelt, når denne gruppe er aktiv." />
+			<combo_box length="150" name="active_title" tool_tip="Angiver den titel der vises i din avatars navnefelt, når denne gruppe er aktiv."/>
 		</panel>
-		<check_box label="Modtag gruppeinformationer" name="receive_notices"
-		     tool_tip="Angiver om du vil modtage informationer fra denne gruppe.   Fjern markeringen i boksen hvis gruppen spammer dig." />
-		<check_box label="Vis gruppen i min profil" name="list_groups_in_profile"
-		     tool_tip="Angiver om du vil vise denne gruppe i dine profilinformationer" />
+		<check_box label="Modtag gruppeinformationer" name="receive_notices" tool_tip="Angiver om du vil modtage informationer fra denne gruppe.   Fjern markeringen i boksen hvis gruppen spammer dig."/>
+		<check_box label="Vis gruppen i min profil" name="list_groups_in_profile" tool_tip="Angiver om du vil vise denne gruppe i dine profilinformationer"/>
 	</panel>
 	<string name="incomplete_member_data_str">
 		Henter medlemsinformationer
diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml
index 6efc93daac..813007aee0 100644
--- a/indra/newview/skins/default/xui/da/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_invite.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Invitér et medlem" name="invite_panel">
 	<text name="help_text">
-		Du kan invitere flere beboere til at 
-blive medlem af din gruppe. Klik &apos;Ã…ben  
-personvælger&apos; for at begynde.
+		Du kan invitere flere beboere ad 
+gangen til at blive medlem af din 
+gruppe. Klik &apos;Åben personvælger&apos; for 
+at begynde.
 	</text>
-	<button label="Åben personvælger" name="add_button" />
+	<button label="Åben personvælger" name="add_button" bottom_delta="-30"/>
 	<name_list name="invitee_list"
 	     tool_tip="Hold Ctrl-tasten nede og klik på beboere for at vælge flere." />
 	<button label="Fjern valgte fra listen" name="remove_button"
diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
index 2ab8935609..029922c413 100644
--- a/indra/newview/skins/default/xui/da/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Land &amp; L$" name="land_money_tab">
 	<string name="help_text">
-		Grunde ejet af gruppen er vist sammen med bidragsdetaljer. En advarsel vises indtil Total land i brug er mindre end eller lig med det totale
-bidrag. Planlægning, detaljer og salgsfaneblade viser information om gruppens økonomi.
+		Grunde ejet af gruppen er vist sammen med bidragsdetaljer. En advarsel vises indtil Total land i brug er mindre end eller lig med det totale bidrag. Planlægning, detaljer og salgsfaneblade viser information om gruppens økonomi.
 	</string>
-	<button label="?" name="help_button" />
+	<button label="?" name="help_button"/>
 	<string name="cant_view_group_land_text">
 		Du har ikke tilladelse til at se gruppeejet land.
 	</string>
@@ -18,29 +17,30 @@ bidrag. Planlægning, detaljer og salgsfaneblade viser information om gruppens 
 		Gruppeejet land
 	</text>
 	<scroll_list name="group_parcel_list">
-		<column label="Grundens navn" name="name" />
-		<column label="Region" name="location" />
-		<column label="Område" name="area" />
-		<column label="" name="hidden" />
+		<column label="Grundens navn" name="name"/>
+		<column label="Region" name="location"/>
+		<column label="Type" name="type"/>
+		<column label="Område" name="area"/>
+		<column label="" name="hidden"/>
 	</scroll_list>
-	<button label="Vis på kort" label_selected="Vis på kort" name="map_button" />
+	<button label="Vis på kort" label_selected="Vis på kort" name="map_button"/>
 	<text name="total_contributed_land_label">
 		Total bidrag:
 	</text>
 	<text name="total_contributed_land_value">
-		[AREA] kvadratmeter
+		[AREA] m²
 	</text>
 	<text name="total_land_in_use_label">
 		Total land i brug:
 	</text>
 	<text name="total_land_in_use_value">
-		[AREA] kvadratmeter
+		[AREA] m²
 	</text>
 	<text name="land_available_label">
 		Tilgængeligt land:
 	</text>
 	<text name="land_available_value">
-		[AREA] kvadratmeter
+		[AREA] m²
 	</text>
 	<text name="your_contribution_label">
 		Dit bidrag:
@@ -49,32 +49,34 @@ bidrag. Planlægning, detaljer og salgsfaneblade viser information om gruppens 
 		Ikke muligt at lave dit bidrag til landet.
 	</string>
 	<text name="your_contribution_max_value">
-		kvadratmeter ([AMOUNT] maks.)
+		m² ([AMOUNT] maks.)
 	</text>
 	<text name="group_over_limit_text">
-		Gruppemedlemmer må bidrag med mere, for at understøtte med det land der bliver brugt.
+		Gruppemedlemmer må bidrag med mere, for at understøtte 
+med det land der bliver brugt.
 	</text>
 	<text name="group_money_heading">
 		Gruppe L$
 	</text>
 	<tab_container name="group_money_tab_container">
+		<panel label="Planlægning" name="group_money_planning_tab">
+			<text_editor name="group_money_planning_text">
+				Beregner...
+			</text_editor>
+		</panel>
 		<panel label="Detaljer" name="group_money_details_tab">
 			<text_editor name="group_money_details_text">
 				Beregner...
 			</text_editor>
-			<button label="&lt; Før" label_selected="&lt; Før" name="earlier_details_button"
-			     tool_tip="GÃ¥ tilbage i tid" />
-			<button label="Efter &gt;" label_selected="Efter &gt;" name="later_details_button"
-			     tool_tip="GÃ¥ frem i tid" />
+			<button label="&lt; Før" label_selected="&lt; Før" name="earlier_details_button" tool_tip="Gå tilbage i tid"/>
+			<button label="Efter &gt;" label_selected="Efter &gt;" name="later_details_button" tool_tip="GÃ¥ frem i tid"/>
 		</panel>
 		<panel label="Salg" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
 				Beregner...
 			</text_editor>
-			<button label="&lt; Før" label_selected="&lt; Før" name="earlier_sales_button"
-			     tool_tip="GÃ¥ tilbage i tid" />
-			<button label="Efter &gt;" label_selected="Efter &gt;" name="later_sales_button"
-			     tool_tip="GÃ¥ frem i tid" />
+			<button label="&lt; Før" label_selected="&lt; Før" name="earlier_sales_button" tool_tip="Gå tilbage i tid"/>
+			<button label="Efter &gt;" label_selected="Efter &gt;" name="later_sales_button" tool_tip="GÃ¥ frem i tid"/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml
index 2af84858a1..5c2fd356d8 100644
--- a/indra/newview/skins/default/xui/da/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_roles.xml
@@ -11,7 +11,7 @@
 		<text name="static">
 			Medlemmer &amp; roller
 		</text>
-		<text name="static2">
+		<text name="static2" width="400">
 			Gruppemedlemmer får tildelt roller med rettigheder. Disse indstillinger kan 
 let tilpasses efter ønske, så gruppen kan vokse og blive mere fleksibel.
 		</text>
@@ -20,10 +20,10 @@ let tilpasses efter ønske, så gruppen kan vokse og blive mere fleksibel.
 		<text name="static">
 			Roller
 		</text>
-		<text name="role_properties_modifiable">
-			Vælg en rolle nedenfor.  Du kan ændre dens navn, beskrivelse og medlemstitel.
+		<text name="role_properties_modifiable" width="400">
+			Vælg en rolle nedenfor. Du kan ændre dens navn, beskrivelse og medlemstitel.
 		</text>
-		<text name="role_properties_not_modifiable">
+		<text name="role_properties_not_modifiable" width="400">
 			Vælg rolle forneden for at se dens egenskaber, medlemmer og rettigheder.
 		</text>
 		<text name="role_actions_modifiable">
@@ -51,7 +51,7 @@ der har denne rettighed.
 				<column label="Doneret leje" name="donated" />
 				<column label="Sidst på den" name="online" />
 			</name_list>
-			<button label="Inviter ny person ..." name="member_invite" />
+			<button label="Invitér nyt medlem..." name="member_invite"/>
 			<button label="Udmeld" name="member_eject" />
 			<string name="help_text">
 				Du kan tilføje eller fjerne roller, der er tildelt medlemmerne.
@@ -67,7 +67,7 @@ klik på deres navne.
 				<column label="Titel" name="title" />
 				<column label="Medlemmer" name="members" />
 			</scroll_list>
-			<button label="Opret ny rolle ..." name="role_create" />
+			<button label="Opret ny rolle..." name="role_create" />
 			<button label="Slet rolle" name="role_delete" />
 			<string name="help_text">
 				Roller har en titel og en tilladelsesliste med rettigheder,
diff --git a/indra/newview/skins/default/xui/da/panel_groups.xml b/indra/newview/skins/default/xui/da/panel_groups.xml
index b3a09b0082..4c7b924bcc 100644
--- a/indra/newview/skins/default/xui/da/panel_groups.xml
+++ b/indra/newview/skins/default/xui/da/panel_groups.xml
@@ -3,10 +3,10 @@
 	<scroll_list name="group list">
 		<column label="" name="name" />
 	</scroll_list>
-	<text type="string" length="1" name="groupdesc">
+	<text type="string" length="1" name="groupdesc" width="300">
 		Din nuværende aktive gruppe er fremhævet i listen.
 	</text>
-	<text type="string" length="1" name="groupcount">
+	<text type="string" length="1" name="groupcount" width="300">
 		Du er medlem i [COUNT] grupper (ud af maksimalt [MAX]).
 	</text>
 	<button label="IM/Opkald" name="IM" tool_tip="Ã…bner IM session" />
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
index 74a1ab1d7a..bb8bea6580 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Generelt" name="general_panel">
 	<radio_group name="default_start_location">
 		<radio_item name="MyHome" tool_tip="Log ind til min hjemme lokation som standard.">
@@ -8,7 +8,7 @@
 			Min sidste lokation
 		</radio_item>
 	</radio_group>
-	<check_box label="Vis start lokation på login billedet" name="show_location_checkbox" />
+	<check_box label="Vis start lokation på login billedet" name="show_location_checkbox"/>
 	<combo_box name="fade_out_combobox">
 		<combo_item name="Never">
 			Aldrig
@@ -20,99 +20,127 @@
 			Altid
 		</combo_item>
 	</combo_box>
-	<check_box label="Små avatar navne" name="small_avatar_names_checkbox" />
-	<check_box label="Skjul mit navn på min skærm" name="show_my_name_checkbox" />
-	<text type="string" length="1" name="group_titles_textbox">
+	<check_box label="Små avatar navne" name="small_avatar_names_checkbox"/>
+	<check_box label="Skjul mit navn på min skærm" name="show_my_name_checkbox"/>
+	<text length="1" name="group_titles_textbox" type="string">
 		Gruppe titler:
 	</text>
-	<check_box label="Skjul alle gruppe titler" name="show_all_title_checkbox" />
-	<check_box label="Gem min gruppe titel" name="show_my_title_checkbox" />
-	<color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger" />
-	<text type="string" length="1" name="UI Size:">
+	<check_box label="Skjul alle gruppe titler" name="show_all_title_checkbox"/>
+	<check_box label="Gem min gruppe titel" name="show_my_title_checkbox"/>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger"/>
+	<text length="1" name="UI Size:" type="string">
 		UI Størrelse:
 	</text>
-	<check_box label="Brug opløsnings uafhængig skalering" name="ui_auto_scale" />
-	<spinner label="Tid før inaktiv:" name="afk_timeout_spinner" />
-	<check_box label="Rotér mini-kort" name="rotate_mini_map_checkbox" />
-	<check_box label="Giv besked når Linden dollars (L$) bliver brugt eller modtaget"
-	     name="notify_money_change_checkbox" />
-	<check_box label="Brug standard farve vælger" name="use_system_color_picker_checkbox"
-	     tool_tip="Brug dit systems standard farve vælger i stedet for den der er indbygget i Second Life." />
-	<check_box label="Vis Søg i øverste højre hjørne" name="show_search_panel"
-	     tool_tip="Vis indbygget søgepanel." />
-	<text type="string" length="1" name="start_location_textbox">
+	<check_box label="Brug opløsnings uafhængig skalering" name="ui_auto_scale"/>
+	<spinner label="Tid før inaktiv:" name="afk_timeout_spinner"/>
+	<check_box label="Giv besked når Linden dollars (L$) bliver brugt eller modtaget" name="notify_money_change_checkbox"/>
+	<text name="maturity_desired_label">
+		Rating:
+	</text>
+	<text name="maturity_desired_prompt">
+		Jeg ønsker adgang til inhold med rating:
+	</text>
+	<combo_box name="maturity_desired_combobox" left="360" width="135">
+		<combo_item name="Desired_Adult">
+			PG, Mature og Adult
+		</combo_item>
+		<combo_item name="Desired_Mature">
+			PG and Mature
+		</combo_item>
+		<combo_item name="Desired_PG">
+			PG only
+		</combo_item>
+	</combo_box>
+	<text name="maturity_desired_textbox" left="360">
+		PG only
+	</text>
+	<text length="1" name="start_location_textbox" type="string">
 		Start lokation:
 	</text>
-	<text type="string" length="1" name="show_names_textbox">
+	<text length="1" name="show_names_textbox" type="string">
 		Vis navne:
 	</text>
-	<text type="string" length="1" name="effects_color_textbox">
+	<text length="1" name="effects_color_textbox" type="string">
 		Farve til mine effekter:
 	</text>
-	<text type="string" length="1" name="seconds_textbox">
+	<text length="1" name="seconds_textbox" type="string">
 		sekunder
 	</text>
-	<text type="string" length="1" name="crash_report_textbox">
+	<text length="1" name="crash_report_textbox" type="string">
 		Nedbrudsrapporter:
 	</text>
-	<text type="string" length="1" name="language_textbox">
+	<text length="1" name="language_textbox" type="string">
 		Sprog:
 	</text>
-	<text type="string" length="1" name="language_textbox2">
+	<text length="1" name="language_textbox2" type="string">
 		(Kræver genstart for at virke optimalt)
 	</text>
 	<string name="region_name_prompt">
 		&lt;Skriv regions navn&gt;
 	</string>
 	<combo_box name="crash_behavior_combobox">
-		<combo_item type="string" length="1" name="Askbeforesending">
+		<combo_item length="1" name="Askbeforesending" type="string">
 			Bed om bekræftigelse
 		</combo_item>
-		<combo_item type="string" length="1" name="Alwayssend">
+		<combo_item length="1" name="Alwayssend" type="string">
 			Send altid
 		</combo_item>
-		<combo_item type="string" length="1" name="Neversend">
+		<combo_item length="1" name="Neversend" type="string">
 			Send aldrig
 		</combo_item>
 	</combo_box>
 	<combo_box name="language_combobox">
-		<combo_item type="string" length="1" name="System Default Language">
+		<combo_item length="1" name="System Default Language" type="string">
 			System standard
 		</combo_item>
-		<combo_item type="string" length="1" name="English">
+		<combo_item length="1" name="English" type="string">
 			English (Engelsk)
 		</combo_item>
-		<combo_item type="string" length="1" name="Danish">
+		<combo_item length="1" name="Danish" type="string">
 			Dansk - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="Deutsch(German)">
+		<combo_item length="1" name="Deutsch(German)" type="string">
 			Deutsch (Tysk) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="Spanish">
+		<combo_item length="1" name="Spanish" type="string">
 			Español (Spansk) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="French">
+		<combo_item length="1" name="French" type="string">
 			Français (Fransk) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="Hungarian">
+		<combo_item name="Italian">
+			Italiano (Italiensk) - Beta
+		</combo_item>
+		<combo_item length="1" name="Hungarian" type="string">
 			Magyar (Ungarsk) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="Polish">
+		<combo_item name="Dutch">
+			Nederlands (Hollandsk) - Beta
+		</combo_item>
+		<combo_item length="1" name="Polish" type="string">
 			Polski (Polsk) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="Portugese">
+		<combo_item length="1" name="Portugese" type="string">
 			Portugués (Portugisisk) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="Chinese">
+		<combo_item name="Russian">
+			Ру��кий (Russisk) - Beta
+		</combo_item>
+		<combo_item name="Turkish">
+			Türkçe (Tyrkisk) - Beta
+		</combo_item>
+		<combo_item name="Ukrainian">
+			Україн�ька (Ukrainsk) - Beta
+		</combo_item>
+		<combo_item length="1" name="Chinese" type="string">
 			中文 (简体) (Kinesisk) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="(Japanese)">
+		<combo_item length="1" name="(Japanese)" type="string">
 			日本語 (Japansk) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="(Korean)">
+		<combo_item length="1" name="(Korean)" type="string">
 			한국어 (Koreansk) - Beta
 		</combo_item>
 	</combo_box>
-	<check_box label="Del sprog med objekter" name="language_is_public"
-	     tool_tip="Dette lader objekter i verden vide hvad dit foretrukne sprog er." />
+	<check_box label="Del sprog med objekter" name="language_is_public" tool_tip="Dette lader objekter i verden vide hvad dit foretrukne sprog er."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_region_covenant.xml b/indra/newview/skins/default/xui/da/panel_region_covenant.xml
index 63a2f90e36..394664f1f1 100644
--- a/indra/newview/skins/default/xui/da/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_covenant.xml
@@ -1,39 +1,67 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Covenant" name="Covenant">
+	<text name="estate_section_lbl">
+		Estate:
+	</text>
+	<text name="estate_name_lbl">
+		Navn:
+	</text>
+	<text name="estate_name_text">
+		mainland
+	</text>
+	<text name="estate_owner_lbl">
+		Ejer:
+	</text>
+	<text name="estate_owner_text">
+		(ingen)
+	</text>
+	<text name="covenant_timestamp_text">
+		Sidst ændret Ons Dec 31 16:00:00 1969
+	</text>
+	<button label="?" name="covenant_help"/>
+	<text_editor name="covenant_editor">
+		Der er ikke angivet nogen regler for denne estate.
+	</text_editor>
+	<button label="Reset" name="reset_covenant"/>
 	<text name="covenant_help_text">
-		Ændringer i regel information vil blive vist i alle parceller til denne estate.
+		Ændringer i regler vil blive vist i alle parceller til denne estate.
 	</text>
-	<text name="region_name_lbl">
+	<text name="covenant_instructions">
+		Træk og slip et notecard her for at ændre regler for denne estate.
+	</text>
+	<text name="region_section_lbl">
 		Region:
 	</text>
+	<text name="region_name_lbl">
+		Navn:
+	</text>
 	<text name="region_name_text">
-		(ukendt)
+		leyla
 	</text>
-	<text name="estate_name_lbl">
-		Estate:
+	<text name="region_landtype_lbl">
+		Type:
 	</text>
-	<text name="estate_name_text">
-		(ukendt)
+	<text name="region_landtype_text">
+		Mainland / Homestead
 	</text>
-	<text name="estate_owner_lbl">
-		Estate ejer:
+	<text name="region_maturity_lbl">
+		Rating:
 	</text>
-	<text name="estate_owner_text">
-		(ukendt)
+	<text name="region_maturity_text">
+		Adult
+	</text>
+	<text name="resellable_lbl">
+		Videresalg:
 	</text>
 	<text name="resellable_clause">
-		Valgfrit om købt land i denne region må sælges videre
+		Land i denne region må ikke sælges videre.
 	</text>
-	<text name="changeable_clause">
-		Valgfrit om købt land i denne region må deles eller samles.
+	<text name="changeable_lbl">
+		Opdel:
 	</text>
-	<text name="covenent_instructions">
-		Træk og slip et notecard her for at ændre regler for dette estate.
+	<text name="changeable_clause">
+		Land i denne region må ikke deles eller samles.
 	</text>
-	<text_editor name="covenant_editor">
-		Henter...
-	</text_editor>
-	<button label="Reset" name="reset_covenant" />
 	<string name="can_resell">
 		Købt land i denne region må sælges videre
 	</string>
@@ -46,5 +74,4 @@
 	<string name="can_not_change">
 		Købt land i denne region må ikke deles eller samles.
 	</string>
-	<button label="?" name="covenant_help" />
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml
index 108763d544..0a439f8c62 100644
--- a/indra/newview/skins/default/xui/da/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml
@@ -34,7 +34,7 @@ regioner i dette estate.
 	<button label="?" name="voice_chat_help" />
 	<check_box label="Tillad direkte teleport" name="allow_direct_teleport" />
 	<button label="?" name="allow_direct_teleport_help" />
-	<text name="abuse_email_text">
+	<text name="abuse_email_text" width="260">
 		Send beskeder misbrug til email adresse:
 	</text>
 	<string name="email_unsupported">
diff --git a/indra/newview/skins/default/xui/da/panel_region_general.xml b/indra/newview/skins/default/xui/da/panel_region_general.xml
index 5f0e71f63d..e4b722c20d 100644
--- a/indra/newview/skins/default/xui/da/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_general.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Region" name="General">
 	<text name="region_text_lbl">
 		Region:
@@ -12,35 +12,48 @@
 	<text name="version_channel_text">
 		ukendt
 	</text>
-	<check_box label="Blokér for redigering af terræn" name="block_terraform_check" />
-	<button label="?" name="terraform_help" />
-	<check_box label="Blokér for flyvning" name="block_fly_check" />
-	<button label="?" name="fly_help" />
-	<check_box label="Tillad skader" name="allow_damage_check" />
-	<button label="?" name="damage_help" />
-	<check_box label="Begræns skubning" name="restrict_pushobject" />
-	<button label="?" name="restrict_pushobject_help" />
-	<check_box label="Tillad at sælge land" name="allow_land_resell_check" />
-	<button label="?" name="land_resell_help" />
-	<check_box label="Tillad at samle/dele land" name="allow_parcel_changes_check" />
-	<button label="?" name="parcel_changes_help" />
-	<check_box label="Blokér visning af land i Søgning" name="block_parcel_search_check"
-	     tool_tip="Lad beboere se denne region og dens parceller i søgeresultater" />
-	<button label="?" name="parcel_search_help" />
-	<spinner label="Max besøgende" name="agent_limit_spin" />
-	<button label="?" name="agent_limit_help" />
-	<spinner label="Objekt bonus" name="object_bonus_spin" />
-	<button label="?" name="object_bonus_help" />
+	<text name="region_type_lbl">
+		Type:
+	</text>
+	<text name="region_type">
+		ukendt
+	</text>
+	<check_box label="Blokér for redigering af terræn" name="block_terraform_check"/>
+	<button label="?" name="terraform_help"/>
+	<check_box label="Blokér for flyvning" name="block_fly_check"/>
+	<button label="?" name="fly_help"/>
+	<check_box label="Tillad skader" name="allow_damage_check"/>
+	<button label="?" name="damage_help"/>
+	<check_box label="Begræns skubning" name="restrict_pushobject"/>
+	<button label="?" name="restrict_pushobject_help"/>
+	<check_box label="Tillad at sælge land" name="allow_land_resell_check"/>
+	<button label="?" name="land_resell_help"/>
+	<check_box label="Tillad at samle/dele land" name="allow_parcel_changes_check"/>
+	<button label="?" name="parcel_changes_help"/>
+	<check_box label="Blokér visning af land i Søgning" name="block_parcel_search_check" tool_tip="Lad beboere se denne region og dens parceller i søgeresultater"/>
+	<button label="?" name="parcel_search_help"/>
+	<spinner label="Max besøgende" name="agent_limit_spin"/>
+	<button label="?" name="agent_limit_help"/>
+	<spinner label="Objekt bonus" name="object_bonus_spin"/>
+	<button label="?" name="object_bonus_help"/>
 	<text label="Indhold" name="access_text">
-		Indhold:
+		Rating:
 	</text>
-
-
-
-	<button label="?" name="access_help" />
-	<button label="Gem" name="apply_btn" />
-	<button label="Send en beboer hjem ..." name="kick_btn" />
-	<button label="Send alle beboere hjem..." name="kick_all_btn" />
-	<button label="Send besked til region..." name="im_btn" />
-	<button label="Vedligehold telehub..." name="manage_telehub_btn" />
+	<combo_box label="Mature" name="access_combo">
+		<combo_item name="Adult">
+			Adult
+		</combo_item>
+		<combo_item name="Mature">
+			Mature
+		</combo_item>
+		<combo_item name="PG">
+			PG
+		</combo_item>
+	</combo_box>
+	<button label="?" name="access_help"/>
+	<button label="Gem" name="apply_btn"/>
+	<button label="Send en beboer hjem ..." name="kick_btn"/>
+	<button label="Send alle beboere hjem..." name="kick_all_btn"/>
+	<button label="Send besked til region..." name="im_btn"/>
+	<button label="Vedligehold telehub..." name="manage_telehub_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_region_terrain.xml b/indra/newview/skins/default/xui/da/panel_region_terrain.xml
index 4ff81112d3..14ef0060b1 100644
--- a/indra/newview/skins/default/xui/da/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_terrain.xml
@@ -13,9 +13,9 @@
 	<spinner label="Max sænkning af land" name="terrain_lower_spin" />
 	<button label="?" name="terrain_lower_help" />
 	<check_box label="Benyt solopsætning fra estate" name="use_estate_sun_check" />
-	<button label="?" name="use_estate_sun_help" />
+	<button label="?" name="use_estate_sun_help" left="430"/>
 	<check_box label="Fast sol-position" name="fixed_sun_check" />
-	<button label="?" name="fixed_sun_help" />
+	<button label="?" name="fixed_sun_help" left="430"/>
 	<slider label="Fase" name="sun_hour_slider" />
 	<button label="Gem" name="apply_btn" />
 	<button label="Download RAW terræn fil..." name="download_raw_btn"
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index bd34d39993..79ebbc3324 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -1,4 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This file contains strings that used to be hardcoded in the source.
+     It is only for those strings which do not belong in a floater.
+     For example, the strings used in avatar chat bubbles, and strings 
+     that are returned from one component and may appear in many places-->
 <strings>
 	<string name="LoginInProgress">
 		Logger p. [APP_NAME] kan virke laast.  Vent venligst.
@@ -51,12 +55,15 @@
 	<string name="LoginDownloadingClothing">
 		Henter tøj...
 	</string>
-	<string name="LoginFailedNoNetwork">
-		Netværks fejl: Kunne ikke oprette forbindelse, tjek venligst din netværksforbindelse.
-	</string>
 	<string name="AgentLostConnection">
 		Denne region kan have problemer. Tjek venligst din forbindelse til internettet.
 	</string>
+	<string name="TooltipPerson">
+		Person
+	</string>
+	<string name="TooltipNoName">
+		(intet navn)
+	</string>
 	<string name="TooltipOwner">
 		Ejer:
 	</string>
@@ -78,12 +85,18 @@
 	<string name="TooltipFlagL$">
 		L$
 	</string>
+	<string name="TooltipFlagDropInventory">
+		Drop beholdning
+	</string>
 	<string name="TooltipFlagPhantom">
 		Fantom
 	</string>
 	<string name="TooltipFlagTemporary">
 		Temporær
 	</string>
+	<string name="TooltipFlagRightClickMenu">
+		(Højre-klik for menu)
+	</string>
 	<string name="TooltipFreeToCopy">
 		Kan kopieres
 	</string>
@@ -168,6 +181,9 @@
 	<string name="AssetErrorCircuitGone">
 		Forbindelsen mistet
 	</string>
+	<string name="AssetErrorPriceMismatch">
+		Second Life klient og server er uenige om prisen
+	</string>
 	<string name="AssetErrorUnknownStatus">
 		Ukendt status
 	</string>
@@ -402,4 +418,69 @@
 	<string name="shout">
 		råber:
 	</string>
+	<string name="SIM_ACCESS_PG">
+		PG
+	</string>
+	<string name="SIM_ACCESS_MATURE">
+		Mature
+	</string>
+	<string name="SIM_ACCESS_ADULT">
+		Adult
+	</string>
+	<string name="SIM_ACCESS_DOWN">
+		logget af
+	</string>
+	<string name="SIM_ACCESS_MIN">
+		Ukendt
+	</string>
+	<string name="land_type_unknown">
+		(ukendt)
+	</string>
+	<string name="covenant_never_modified">Sidst ændret: (aldrig)</string>
+	<string name="covenant_modified">Sidst ændret: </string>
+	<string name="all_files">
+		Alle filer
+	</string>
+	<string name="sound_files">
+		Lyde
+	</string>
+	<string name="animation_files">
+		Animationer
+	</string>
+	<string name="image_files">
+		Billeder
+	</string>
+	<string name="save_file_verb">
+		Gem
+	</string>
+	<string name="load_file_verb">
+		Hent
+	</string>
+	<string name="targa_image_files">
+		Targa billeder
+	</string>
+	<string name="bitmap_image_files">
+		Bitmap billeder
+	</string>
+	<string name="avi_movie_file">
+		AVI film fil
+	</string>
+	<string name="xaf_animation_file">
+		XAF Anim Fil
+	</string>
+	<string name="xml_file">
+		XML Fil
+	</string>
+	<string name="dot_raw_file">
+		RAW Fil
+	</string>
+	<string name="compressed_image_files">
+		Komprimerede billeder
+	</string>
+	<string name="load_files">
+		Hent filer
+	</string>
+	<string name="choose_the_directory">
+		Vælg bibliotek
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml
index 78052b4ef5..cc75abbb26 100644
--- a/indra/newview/skins/default/xui/da/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/da/teleport_strings.xml
@@ -2,21 +2,18 @@
 <teleport_messages>
 	<message_set name="errors">
 		<message name="invalid_tport">
-			Der er problemer med at håndtere din teleport.
-Det kan være nødvendigt at logge ud og ind for at kunne skifte teleportere.
+			Der er problemer med at håndtere din teleport. Det kan være nødvendigt at logge ud og ind for at kunne skifte teleportere.
 Hvis du bliver ved med at have problemet kan du checke teknisk support på:
-www.secondlife.com/support.
+www.secondlife.com/support
 		</message>
 		<message name="invalid_region_handoff">
-			Problem registreret i forbindelse med skift til ny region. 
-Det kan være nødvendigt at logge ud og ind for at kunne skifte regioner.
+			Problem registreret i forbindelse med skift til ny region. Det kan være nødvendigt at logge ud og ind for at kunne skifte regioner.
 Hvis du bliver ved med at have problemet kan du checke teknisk support på:
-www.secondlife.com/support.
+www.secondlife.com/support
 		</message>
 		<message name="blocked_tport">
 			Beklager, teleport er blokeret lige nu. Prøv igen senere.
-Hvis du stadig ikke kan teleporte, prøv venligst at logge ud og ligge
-ind for at løse dette problem.
+Hvis du stadig ikke kan teleporte, prøv venligst at logge ud og ligge ind for at løse dette problem.
 		</message>
 		<message name="nolandmark_tport">
 			Beklager, systemet kunne ikke finde landmærke destinationen.
@@ -29,24 +26,20 @@ Prøv igen om lidt.
 			Beklager, du har ikke adgang til denne teleport destination.
 		</message>
 		<message name="missing_attach_tport">
-			Dine vedhæng er ikke ankommet endnu. Prøv at vente lidt endnu
-eller log ud og ind igen før du prøver at teleporte igen.
+			Dine vedhæng er ikke ankommet endnu. Prøv at vente lidt endnu eller log ud og ind igen før du prøver at teleporte igen.
 		</message>
 		<message name="too_many_uploads_tport">
 			Tekniske problemer hindrer at din teleport kan gennemføres.
 Prøv venligst igen om lidt eller vælg et mindre travlt område.
 		</message>
 		<message name="expired_tport">
-			Beklager, men systemet kunne ikke fuldføre din teleport
-i rimelig tid. Prøv venligst igen om lidt.
+			Beklager, men systemet kunne ikke fuldføre din teleport i rimelig tid. Prøv venligst igen om lidt.
 		</message>
 		<message name="expired_region_handoff">
-			Beklager, men systemet kunne ikke fuldføre skift til anden region
-i rimelig tid. Prøv venligst igen om lidt.
+			Beklager, men systemet kunne ikke fuldføre skift til anden region i rimelig tid. Prøv venligst igen om lidt.
 		</message>
 		<message name="no_host">
-			Ikke muligt at fine teleport destination. Destinationen kan
-være midlertidig utilgængelig eller findes ikke mere. 
+			Ikke muligt at fine teleport destination. Destinationen kan være midlertidig utilgængelig eller findes ikke mere. 
 Prøv evt. igen om lidt.
 		</message>
 		<message name="no_inventory_host">
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index c3935882af..28785c6786 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Ãœber Second Life">
 	<text_editor name="credits_editor">
-		Second Life wird Ihnen präsentiert von Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les und vielen anderen.
+		Second Life wird Ihnen präsentiert von Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl und vielen anderen.
 
-Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
+Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
 APR Copyright (C) 2000-2004 The Apache Software Foundation
diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml
index 1dbc066914..44ae6b0c15 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml
@@ -36,6 +36,7 @@
 	<text name="covenant_text">
 		Sie müssen dem Grundstücksvertrag zustimmen:
 	</text>
+	<text left="470" name="covenant_timestamp_text"/>
 	<text_editor name="covenant_editor">
 		Wird geladen...
 	</text_editor>
diff --git a/indra/newview/skins/default/xui/de/floater_mute_object.xml b/indra/newview/skins/default/xui/de/floater_mute_object.xml
index 02eafbcb68..60c6ff008c 100644
--- a/indra/newview/skins/default/xui/de/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_mute_object.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="mute by name" title="Objekt nach Name stummschalten">
 	<text name="message">
-		Stummschalten nach Name betrifft nur Chat und IM, keine Sounds.
-Sie müssen den Objektnamen exakt angeben.
+		Stummschalten nach Name betrifft nur Chat und IM, keine
+Sounds. Sie müssen den Objektnamen exakt angeben.
 	</text>
 	<line_editor name="object_name">
 		Objektname
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index cef204eb5f..44ebde6b3c 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Bauen">
 	<button label="" label_selected="" name="button focus" tool_tip="Fokus"/>
 	<button label="" label_selected="" name="button move" tool_tip="Verschieben"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Bearbeiten"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 279024616a..e1fb1caffd 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -169,7 +169,9 @@
 		<menu_item_separator label="-----------" name="separator4"/>
 		<menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/>
 		<menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/>
-		<menu_item_call label="Objekt kaufen" name="Menu Object Take"/>
+		<menu_item_call label="Objekt kaufen" name="Menu Object Take">
+			<on_enable userdata="Kaufen,Nehmen" name="EnableBuyOrTake"/>
+		</menu_item_call>
 		<menu_item_call label="Kopie nehmen/machen" name="Take Copy"/>
 		<menu_item_call label="Objekt wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/>
 		<menu_item_separator label="-----------" name="separator6"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index e920b2451f..ae25e1ec85 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -2598,7 +2598,7 @@ Gehen Sie zu „Help Island Public“ und wiederholen sie das Tutorial.
 	<notification name="ImproperPaymentStatus">
 		Die für den Zutritt zu dieser Region erforderlichen Zahlungsinformationen liegen nicht vor.
 	</notification>
-	<notification name="MustGetAgeRgion">
+	<notification name="MustGetAgeRegion">
 		Sie müssen alterüberprüft sein, um diese Region betreten zu können.
 	</notification>
 	<notification name="MustGetAgeParcel">
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index d6fbc38752..e59b5a6fb4 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="Acerca de Second Life">
 	<text_editor name="credits_editor">
-		Le ofrecen Second Life Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, y otros muchos.
+		Le ofrecen Second Life Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl, y otros muchos.
 
-  Gracias a todos estos residentes por contribuir a garantizar que, por el momento, esta es la mejor versión: 
+  Gracias a todos estos residentes por contribuir a garantizar que esta es la mejor versión: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
   3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
   APR Copyright (C) 2000-2004 The Apache Software Foundation
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index 767b384a2d..0e256bd8b8 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -47,13 +47,13 @@
 			<text length="1" name="For sale to" type="string">
 				En venta a: [BUYER]
 			</text>
-			<text length="1" name="Sell with landowners objects in parcel." type="string">
+			<text width="216" length="1" name="Sell with landowners objects in parcel." type="string">
 				Los objetos se incluyen en la venta.
 			</text>
-			<text length="1" name="Selling with no objects in parcel." type="string">
+			<text width="216" length="1" name="Selling with no objects in parcel." type="string">
 				Los objetos no se incluyen en la venta.
 			</text>
-			<button font="SansSerifSmall" left="275" width="165" label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" name="Cancel Land Sale"/>
+			<button font="SansSerifSmall" bottom="-245" left="275" width="165" label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" name="Cancel Land Sale"/>
 			<text length="1" name="Claimed:" type="string">
 				Reclamada:
 			</text>
@@ -194,7 +194,7 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<text length="1" name="Simulator primitive usage:" type="string">
 				Simulador de uso de prims:
 			</text>
-			<text name="objects_available"  left="214" width="230" >
+			<text name="objects_available"  left="204" width="250" >
 				[COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles)
 			</text>
 			<string name="objects_available_text">
@@ -206,19 +206,19 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<text length="1" name="Primitives parcel supports:" type="string" width="200">
 				Prims que admite la parcela:
 			</text>
-			<text name="object_contrib_text" left="214" width="152">
+			<text name="object_contrib_text" left="204" width="152">
 				[COUNT]
 			</text>
 			<text length="1" name="Primitives on parcel:" type="string">
 				Prims en la parcela:
 			</text>
-			<text name="total_objects_text" left="214"  width="48">
+			<text name="total_objects_text" left="204"  width="48">
 				[COUNT]
 			</text>
 			<text length="1" name="Owned by parcel owner:" type="string" left="14" width="180" >
 				Del propietario de la parcela:
 			</text>
-			<text name="owner_objects_text" left="214"  width="48">
+			<text name="owner_objects_text" left="204"  width="48">
 				[COUNT]
 			</text>
 			<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/>
@@ -226,7 +226,7 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<text length="1" name="Set to group:" type="string" left="14"  width="180">
 				Del grupo:
 			</text>
-			<text name="group_objects_text" left="214"  width="48">
+			<text name="group_objects_text" left="204"  width="48">
 				[COUNT]
 			</text>
 			<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/>
@@ -234,7 +234,7 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<text length="1" name="Owned by others:" type="string" left="14" width="128">
 				Propiedad de otros:
 			</text>
-			<text name="other_objects_text" left="214"  width="48">
+			<text name="other_objects_text" left="204"  width="48">
 				[COUNT]
 			</text>
 			<button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/>
@@ -242,7 +242,7 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<text length="1" name="Selected / sat upon:" type="string" left="14" width="193" >
 				Seleccionados / con gente sentada:
 			</text>
-			<text name="selected_objects_text" left="214"  width="48">
+			<text name="selected_objects_text" left="204"  width="48">
 				[COUNT]
 			</text>
 			<text name="Autoreturn" left="4" width="412" >
@@ -299,7 +299,7 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 			<string name="search_disabled_permissions_tooltip">
 				Esta opción no esta activada porque usted no puede modificar las opciones de la parcela.
 			</string>
-			<combo_box name="land category with adult">
+			<combo_box name="land category with adult" left="282" width="140">
 				<combo_item name="AnyCategory">
 					Cualquier categoría
 				</combo_item>
@@ -340,7 +340,7 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 					Otra
 				</combo_item>
 			</combo_box>
-			<combo_box name="land category">
+			<combo_box name="land category" left="282" width="140">
 				<combo_item name="AnyCategory">
 					Cualquier categoría
 				</combo_item>
@@ -378,7 +378,7 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 					Otra
 				</combo_item>
 			</combo_box>
-			<button label="?" label_selected="?" name="?"/>
+			<button label="?" label_selected="?" name="?" left="427"/>
 			<check_box label="Contenido &apos;Mature&apos;" name="MatureCheck" tool_tip=""/>
 			<string name="mature_check_mature">
 				Contenido &apos;Mature&apos;
diff --git a/indra/newview/skins/default/xui/es/floater_animation_preview.xml b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
index a5b9847c4f..de01c5c54b 100644
--- a/indra/newview/skins/default/xui/es/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
@@ -6,14 +6,14 @@
 	<text name="description_label">
 		Descripción:
 	</text>
-	<spinner label="Prioridad" name="priority" tool_tip="Controle qué otras animaciones pueden ser anuladas por ésta."/>
-	<check_box label="Bucle" name="loop_check" tool_tip="Haga esta animación en bucle."/>
-	<spinner label="Empieza(%)" name="loop_in_point" tool_tip="Indique el punto en el que la animación empieza el bucle."/>
-	<spinner label="Acaba(%)" name="loop_out_point" tool_tip="Indique el punto en el que la animación acaba el bucle."/>
+	<spinner label_width="72" width="110" label="Prioridad:" name="priority" tool_tip="Controle qué otras animaciones pueden ser anuladas por ésta."/>
+	<check_box left="8" label="Bucle:" name="loop_check" tool_tip="Haga esta animación en bucle."/>
+	<spinner label_width="65" left="65" width="116" label="Empieza(%)" name="loop_in_point" tool_tip="Indique el punto en el que la animación empieza el bucle."/>
+	<spinner label_width="50" left="185" label="Acaba(%)" name="loop_out_point" tool_tip="Indique el punto en el que la animación acaba el bucle."/>
 	<text name="hand_label">
 		Posición de las manos
 	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="Control de lo que hacen las manos durante la animación.">
+	<combo_box left_delta="120" width="164" name="hand_pose_combo" tool_tip="Control de lo que hacen las manos durante la animación.">
 		<combo_item name="Spread">
 			Extendidas
 		</combo_item>
@@ -57,7 +57,7 @@
 	<text name="emote_label">
 		Expresión
 	</text>
-	<combo_box label="" name="emote_combo" tool_tip="Controle qué hace la cara durante la animación.">
+	<combo_box left_delta="120" width="164" name="emote_combo" tool_tip="Controle qué hace la cara durante la animación.">
 		<combo_item name="[None]">
 			[Nada]
 		</combo_item>
@@ -119,10 +119,10 @@
 			Preocupación
 		</combo_item>
 	</combo_box>
-	<text name="preview_label">
+	<text name="preview_label" width="250">
 		Vista previa mientras
 	</text>
-	<combo_box label="" name="preview_base_anim" tool_tip="Compruebe cómo se comporta su animación a la vez que el avatar realiza acciones comunes.">
+	<combo_box left_delta="120" width="130" name="preview_base_anim" tool_tip="Compruebe cómo se comporta su animación a la vez que el avatar realiza acciones comunes.">
 		<combo_item name="Standing">
 			Estar de pie
 		</combo_item>
@@ -136,15 +136,16 @@
 			Volar
 		</combo_item>
 	</combo_box>
-	<spinner label="Combinar (sec)" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones."/>
-	<spinner label="Dejar de combinar (sec)" name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones."/>
-	<button label="" name="play_btn" tool_tip="Mover/Pausar su animación."/>
+	<spinner label_width="125" width="192" label="Combinar (sec)" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones."/>
+	<spinner bottom_delta="-20"  label_width="125" left="10"  width="192" label="Dejar de combinar (sec)" name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones."/>
+	<button bottom_delta="-32" name="play_btn" tool_tip="Mover/Pausar su animación."/>
 	<button label="" name="stop_btn" tool_tip="Parar la repetición de la animación"/>
 	<slider label="" name="playback_slider"/>
 	<text name="bad_animation_text">
 		No se ha podido leer el archivo de la animación.
 
-Recomendamos usar archivos BVH exportados de Poser 4.
+Recomendamos usar archivos BVH exportados de
+Poser 4.
 	</text>
 	<button label="Cancelar" name="cancel_btn"/>
 	<button label="Subir ([AMOUNT] L$)" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
index 105111f29f..68a56ac678 100644
--- a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
@@ -14,13 +14,15 @@
 		</panel>
 		<panel label="Cercanos" name="NearMePanel">
 			<text name="InstructSelectResident">
-				Seleccionar un residente cercano:
+				Seleccionar un
+residente cercano:
 			</text>
-			<button label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh"/>
-			<slider label="Alcance" name="near_me_range"/>
+			<button font="SansSerifSmall" left_delta="1" width="115" label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh"/>
+			<slider label="Alcance" name="near_me_range" bottom_delta="-36"/>
 			<text name="meters">
 				Metros
 			</text>
+		<scroll_list bottom_delta="-169" height="159" name="NearMe"  />
 		</panel>
 	</tab_container>
 	<button label="Elegir" label_selected="Elegir" name="Select"/>
diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml
index bbb5b0e36d..c3e4acacf0 100644
--- a/indra/newview/skins/default/xui/es/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_build_options.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="Opciones de la cuadrícula">
-	<spinner label="Unidad de la cuadrícula (metros)" name="GridResolution"/>
-	<spinner label="Graduación de la cuadrícula (metros)" name="GridDrawSize"/>
+	<spinner label="Unidad de la cuadrícula (metros)" name="GridResolution" width="250" label_width="192"/>
+	<spinner label="Graduación de la cuadrícula (metros)" name="GridDrawSize" width="250" label_width="192"/>
 	<check_box label="Activar subunidades" name="GridSubUnit"/>
 	<check_box label="Ver la sección transversal" name="GridCrossSection"/>
-	<slider label="Opacidad de la cuadrícula" name="GridOpacity"/>
+	<slider label="Opacidad de la cuadrícula" name="GridOpacity" width="250"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
index e93b8bce2d..2346798f94 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
@@ -6,7 +6,7 @@
 	<text name="buy_text">
 		¿Comprar por [AMOUNT] L$ a [NAME]?
 	</text>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn" width="73"/>
 	<button label="Comprar" label_selected="Comprar" name="buy_btn"/>
 	<check_box label="Vestirse ahora la ropa" name="wear_check"/>
 	<string name="no_copy_text">
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index b26a9c7494..a01e07e694 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -22,14 +22,14 @@
 	<text name="buy_action">
 		[NAME] [PRICE] L$
 	</text>
-	<text name="currency_action">
-		Comprar L$
+	<text name="currency_action" width="50">
+		Comprar 
 	</text>
-	<line_editor name="currency_amt">
+	<line_editor name="currency_amt" width="65" left_delta="50">
 		1234
 	</line_editor>
-	<text name="currency_est">
-		por, aprox., [USD] US$
+	<text name="currency_est" width="138" left_delta="68">
+		L$  por, aprox., [USD] US$
 	</text>
 	<text name="getting_data">
 		Obteniendo los datos...
@@ -63,6 +63,6 @@ Aumente la cantidad a comprar.
 	<button label="Cancelar" name="cancel_btn"/>
 	<button label="Comprar" name="buy_btn"/>
 	<string name="buy_currency">
-		Comprar L$ [LINDENS] por, aprox., [USD] U$D
+		Compre [LINDENS] L$ por, aprox., [USD] US$
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml
index a0d3734bbb..b926b59195 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml
@@ -3,25 +3,25 @@
 	<text name="region_name_label">
 		Región:
 	</text>
-	<text name="region_name_text">
+	<text name="region_name_text" left="565">
 		(desconocida)
 	</text>
 	<text name="region_type_label">
 		Tipo:
 	</text>
-	<text name="region_type_text">
+	<text name="region_type_text" left="565">
 		(desconocido)
 	</text>
 	<text name="estate_name_label">
 		Estado:
 	</text>
-	<text name="estate_name_text">
+	<text name="estate_name_text" left="565">
 		(desconocido)
 	</text>
-	<text name="estate_owner_label">
+	<text name="estate_owner_label" width="115" right="565">
 		Propietario del estado:
 	</text>
-	<text name="estate_owner_text">
+	<text name="estate_owner_text" left="565" >
 		(desconocido)
 	</text>
 	<text name="resellable_changeable_label">
@@ -36,6 +36,7 @@
 	<text name="covenant_text">
 		Deve aceptar el Contrato del Estado:
 	</text>
+	<text left="470" name="covenant_timestamp_text"/>
 	<text_editor name="covenant_editor">
 		Cargando...
 	</text_editor>
diff --git a/indra/newview/skins/default/xui/es/floater_color_picker.xml b/indra/newview/skins/default/xui/es/floater_color_picker.xml
index 238853c58d..c220c48cb0 100644
--- a/indra/newview/skins/default/xui/es/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/es/floater_color_picker.xml
@@ -25,6 +25,7 @@
 		Color actual:
 	</text>
 	<text name="(Drag below to save.)">
-		(Arrástrelo abajo para guardarlo)
+		(Arrástrelo abajo
+ para guardarlo.)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_customize.xml b/indra/newview/skins/default/xui/es/floater_customize.xml
index fa3113faf7..58aea9a380 100644
--- a/indra/newview/skins/default/xui/es/floater_customize.xml
+++ b/indra/newview/skins/default/xui/es/floater_customize.xml
@@ -188,7 +188,7 @@ avatar. O parta de cero creando una nueva y vistiéndola.
 				No tiene permiso para modificar este ítem.
 			</text>
 			<text name="Item Action Label" right="107">
-				Camiseta:
+				Camisa:
 			</text>
 		</panel>
 		<panel label="Pantalones" name="Pants">
@@ -225,7 +225,7 @@ avatar. O parta de cero creando unos nuevos y vistiéndoselos.
 				Pantalones:
 			</text>
 		</panel>
-		<panel label="Shoes" name="Shoes">
+		<panel label="Zapatos" name="Shoes">
 			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
@@ -468,5 +468,5 @@ avatar. O parta de cero creando una nueva y vistiéndola.
 	<scroll_container left="230" name="panel_container"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<button label="OK" label_selected="OK" name="Ok"/>
-	<button label="Hacer un vestuario..." label_selected="Hacer un vestuario..." name="Make Outfit" width="125"/>
+	<button label="Hacer un vestuario..." label_selected="Hacer un vestuario..." name="Make Outfit" width="130"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
index dd74505239..9ee7fc3ead 100644
--- a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
@@ -57,9 +57,9 @@
 			<text name="WL12amHash2">
 				|
 			</text>
-			<button label="Añadir un punto" label_selected="Añadir un punto" name="WLAddKey"/>
-			<button label="Quitar un punto" label_selected="Quitar un punto" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
+			<button font="SansSerifSmall" width="96" left="546" label="Añadir un punto" label_selected="Añadir un punto" name="WLAddKey"/>
+			<button font="SansSerifSmall" width="96" left="546" label="Quitar un punto" label_selected="Quitar un punto" name="WLDeleteKey"/>
+			<text font="SansSerifSmall" name="WLCurKeyFrameText" width="190">
 				Configuración del fotograma clave:
 			</text>
 			<text name="WLCurKeyTimeText">
@@ -86,9 +86,9 @@
 			</text>
 			<button label="Probar" label_selected="Probar" name="WLAnimSky"/>
 			<button label="Parar" label_selected="Parar" name="WLStopAnimSky"/>
-			<button label="Usar el horario del estado" label_selected="Ir al horario del estado" name="WLUseLindenTime"/>
-			<button label="Guardar este tipo de día" label_selected="Guardar este tipo de día" name="WLSaveDayCycle"/>
-			<button label="Cargar y probar un tipo de día" label_selected="Cargar y probar un tipo de día" name="WLLoadDayCycle"/>
+			<button width="150" font="SansSerifSmall" label="Usar el horario del estado" label_selected="Ir al horario del estado" name="WLUseLindenTime"/>
+			<button left="440" width="180" font="SansSerifSmall" label="Guardar este tipo de día" label_selected="Guardar este tipo de día" name="WLSaveDayCycle"/>
+			<button left="440" width="180" font="SansSerifSmall" label="Cargar y probar un tipo de día" label_selected="Cargar y probar un tipo de día" name="WLLoadDayCycle"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_env_settings.xml b/indra/newview/skins/default/xui/es/floater_env_settings.xml
index 8b9bfe7362..65710fc5ed 100644
--- a/indra/newview/skins/default/xui/es/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_env_settings.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Environment Editor Floater" title="Editor del entorno">
 	<text name="EnvTimeText">
-		Duración de un día
+		Duración de
+un día
 	</text>
 	<text name="EnvTimeText2">
 		12:00 PM
@@ -10,14 +11,16 @@
 		Nubosidad
 	</text>
 	<text name="EnvWaterColorText">
-		Color del agua
+		Color del
+agua
 	</text>
 	<color_swatch label="" name="EnvWaterColor" tool_tip="Pulse para abrir el selector de color"/>
 	<text name="EnvWaterFogText">
-		Claridad del agua
+		Claridad del
+agua
 	</text>
-	<button label="Usar el horario del estado" name="EnvUseEstateTimeButton"/>
-	<button label="Cielo avanzado" name="EnvAdvancedSkyButton"/>
-	<button label="Agua avanzada" name="EnvAdvancedWaterButton"/>
+	<button bottom="-144" label="Usar el horario del estado" name="EnvUseEstateTimeButton" width="155"/>
+	<button label="Cielo avanzado" name="EnvAdvancedSkyButton" width="155" left="167" />
+	<button label="Agua avanzada" name="EnvAdvancedWaterButton" width="155" left="326"/>
 	<button label="?" name="EnvSettingsHelpButton"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml
index 4f19286d01..e7f1a7aca2 100644
--- a/indra/newview/skins/default/xui/es/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_gesture.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gestures" title="Gestos disponibles">
 	<text name="help_label">
-		Pulse dos veces en un gesto para reproducir las animaciones y sonidos.
+		Pulse dos veces en un gesto para reproducir las animaciones
+y sonidos.
 	</text>
-	<scroll_list name="gesture_list">
+	<scroll_list bottom_delta="-385" height="360"  name="gesture_list">
 		<column label="Botón" name="trigger"/>
 		<column label="Tecla" name="shortcut"/>
 		<column label="Nombre" name="name"/>
diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
index e596ee7f9e..c1149f34c5 100644
--- a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
@@ -7,7 +7,7 @@
 	<text name="Antialiasing:">
 		Antialiasing:
 	</text>
-	<combo_box label="Antialiasing" name="fsaa">
+	<combo_box label="Antialiasing" name="fsaa" width="94">
 		<combo_item name="FSAADisabled">
 			Desactivado
 		</combo_item>
@@ -32,7 +32,7 @@
 		Activar VBO:
 	</text>
 	<check_box label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caídas."/>
-	<slider label="Memoria para texturas (MB):" name="GrapicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vídeo. Reducir esta cantidad puede mejorar el rendimiento, pero también puede hacer que las texturas se vean borrosas."/>
+	<slider label_width="150" left="10" width="300" label="Memoria para texturas (MB):" name="GrapicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vídeo. Reducir esta cantidad puede mejorar el rendimiento, pero también puede hacer que las texturas se vean borrosas."/>
 	<spinner label="Intensidad de la niebla:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_image_preview.xml b/indra/newview/skins/default/xui/es/floater_image_preview.xml
index f682254a50..55d90da1b2 100644
--- a/indra/newview/skins/default/xui/es/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_image_preview.xml
@@ -7,9 +7,10 @@
 		Descripción:
 	</text>
 	<text name="preview_label">
-		Previsualizar la imagen como:
+		Previsualizar la
+imagen como:
 	</text>
-	<combo_box label="Tipo de ropa" name="clothing_type_combo">
+	<combo_box label="Tipo de ropa" name="clothing_type_combo" left="100" width="186">
 		<combo_item name="Image">
 			Imagen
 		</combo_item>
@@ -44,9 +45,10 @@
 	<text name="bad_image_text">
 		Imposible leer la imagen.
 
-Pruebe a guardar la imagen como Targa (.tga) de 24 bites.
+Pruebe a guardar la imagen como Targa (.tga)
+de 24 bites.
 	</text>
 	<check_box label="Usar compresión sin pérdida" name="lossless_check"/>
 	<button label="Cancelar" name="cancel_btn"/>
-	<button label="Subir ([AMOUNT] 10L$)" name="ok_btn"/>
+	<button label="Subir ([AMOUNT]L$)" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inspect.xml b/indra/newview/skins/default/xui/es/floater_inspect.xml
index 7a9f76de0f..026081bc04 100644
--- a/indra/newview/skins/default/xui/es/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/es/floater_inspect.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="inspect" title="Examinar objetos">
+<floater name="inspect" title="Examinar objetos" min_width="450">
 	<scroll_list name="object_list" tool_tip="Seleccione un objeto de esta lista para realzarlo en el mundo">
 		<column label="Nombre del objeto" name="object_name"/>
-		<column label="Nombre del propietario" name="owner_name"/>
-		<column label="Nombre del creador" name="creator_name"/>
+		<column label="Propietario" name="owner_name"/>
+		<column label="Creador" name="creator_name"/>
 		<column label="Fecha de creación" name="creation_date"/>
 	</scroll_list>
-	<button label="Ver el perfil del propietario..." label_selected="" name="button owner" tool_tip="Ver el perfil del propietario del objeto realzado"/>
-	<button label="Ver el perfil del creadir..." label_selected="" name="button creator" tool_tip="Ver el perfil del creador original del objeto realzado"/>
+	<button width="185" label="Ver el perfil del propietario..." label_selected="" name="button owner" tool_tip="Ver el perfil del propietario del objeto realzado"/>
+	<button width="165" left="205" label="Ver el perfil del creador..." label_selected="" name="button creator" tool_tip="Ver el perfil del creador original del objeto realzado"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
index dfe0b8e520..fc8dc4ecb0 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
@@ -30,7 +30,7 @@
 		Usted puede:
 	</text>
 	<check_box label="Modificarlo" name="CheckOwnerModify"/>
-	<check_box label="Copiarlo" name="CheckOwnerCopy"/>
+	<check_box left_delta="88" label="Copiarlo" name="CheckOwnerCopy"/>
 	<check_box label="Venderlo/darlo" name="CheckOwnerTransfer"/>
 	<text name="BaseMaskDebug">
 		B:
@@ -49,17 +49,17 @@
 	</text>
 	<check_box label="Compartir con el grupo" name="CheckShareWithGroup"/>
 	<check_box label="Permitir a cualquiera que lo copie" name="CheckEveryoneCopy"/>
-	<text name="NextOwnerLabel">
+	<text name="NextOwnerLabel" width="230">
 		El próximo propietario puede:
 	</text>
 	<check_box label="Modificarlo" name="CheckNextOwnerModify"/>
-	<check_box label="Copiarlo" name="CheckNextOwnerCopy"/>
+	<check_box left_delta="88" label="Copiarlo" name="CheckNextOwnerCopy"/>
 	<check_box label="Revenderlo/darlo" name="CheckNextOwnerTransfer"/>
 	<text name="SaleLabel">
 		Marcar ítem como:
 	</text>
 	<check_box label="En venta" name="CheckPurchase"/>
-	<radio_group name="RadioSaleType">
+	<radio_group name="RadioSaleType" left_delta="88" >
 		<radio_item name="radio">
 			Original
 		</radio_item>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
index d341de17e9..d0283afa38 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
@@ -11,14 +11,14 @@
 	<check_box label="Sonidos" name="check_sound"/>
 	<check_box label="Texturas" name="check_texture"/>
 	<check_box label="Fotos" name="check_snapshot"/>
-	<button label="Todo" label_selected="Todo" name="All"/>
-	<button label="Nada" label_selected="Nada" name="None"/>
-	<check_box label="Mostrar siempre las carpetas" name="check_show_empty"/>
-	<check_box label="Desde el fin de sesión" name="check_since_logoff"/>
+	<button label="Todo" label_selected="Todo" name="All" width="70"/>
+	<button label="Nada" label_selected="Nada" name="None" width="70" bottom_delta="0" left="83"/>
+	<check_box label="Mostrar siempre las&#10;carpetas" name="check_show_empty"/>
+	<check_box label="Desde el fin de sesión" name="check_since_logoff" bottom_delta="-36"/>
 	<text length="1" name="- OR -" type="string">
 		- O -
 	</text>
 	<spinner label="horas atrás" name="spin_hours_ago"/>
 	<spinner label="días atrás" name="spin_days_ago"/>
-	<button label="Cerrar" label_selected="Cerrar" name="Close"/>
+	<button label="Cerrar" label_selected="Cerrar" name="Close" bottom_delta="-30"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml
index 527485e57d..5009a31277 100644
--- a/indra/newview/skins/default/xui/es/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/es/floater_joystick.xml
@@ -3,13 +3,14 @@
 	<check_box name="enable_joystick">
 		Activar el joystick:
 	</check_box>
-	<spinner label="Mapping: X" name="JoystickAxis1"/>
-	<spinner label="Mapping: Y" name="JoystickAxis2"/>
-	<spinner label="Mapping: Z" name="JoystickAxis0"/>
-	<spinner label="Mapping: arriba/abajo" name="JoystickAxis4"/>
-	<spinner label="Mapping: izq./der." name="JoystickAxis5"/>
-	<spinner label="Mapping: giro" name="JoystickAxis3"/>
-	<spinner label="Mapping: zoom" name="JoystickAxis6"/>
+	<text left="140" name="joystick_type" width="360"/>
+	<spinner label="Mapping: eje X" name="JoystickAxis1" label_width="118" width="161"/>
+	<spinner label="Mapping: eje Y" name="JoystickAxis2" label_width="105" width="148"/>
+	<spinner label="Mapping: eje Z" name="JoystickAxis0" label_width="95" width="138"/>
+	<spinner label="Mapping: arriba/abajo" name="JoystickAxis4" label_width="118" width="161"/>
+	<spinner label="Mapping: izq./der." name="JoystickAxis5" label_width="105" width="148"/>
+	<spinner label="Mapping: giro" name="JoystickAxis3" label_width="95" width="138"/>
+	<spinner label="Mapping: zoom" name="JoystickAxis6" label_width="118" width="161"/>
 	<check_box label="Zoom directo" name="ZoomDirect"/>
 	<check_box label="Cursor 3D" name="Cursor3D"/>
 	<check_box label="Nivel automático" name="AutoLeveling"/>
@@ -19,7 +20,7 @@
 	<check_box name="JoystickAvatarEnabled">
 		Avatar
 	</check_box>
-	<check_box name="JoystickBuildEnabled">
+	<check_box name="JoystickBuildEnabled" left="192">
 		Construir
 	</check_box>
 	<check_box name="JoystickFlycamEnabled">
@@ -34,7 +35,7 @@
 	<text name="ZScale">
 		Escala: Z
 	</text>
-	<text name="PitchScale">
+	<text name="PitchScale" left="3" width="115">
 		Escala: arriba/abajo
 	</text>
 	<text name="YawScale">
@@ -52,10 +53,10 @@
 	<text name="ZDeadZone">
 		Zona muerta Z
 	</text>
-	<text name="PitchDeadZone">
+	<text name="PitchDeadZone" left="3" width="115">
 		Zona muerta arriba/abajo
 	</text>
-	<text name="YawDeadZone">
+	<text name="YawDeadZone" left="3" width="115">
 		Zona muerta izq./der
 	</text>
 	<text name="RollDeadZone">
@@ -70,9 +71,9 @@
 	<text name="ZoomDeadZone">
 		Zona muerta zoom
 	</text>
-	<button label="Predeterminados del SpaceNavigator" name="SpaceNavigatorDefaults"/>
-	<button label="OK" label_selected="OK" name="ok_btn"/>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Predeterminados del SpaceNavigator" name="SpaceNavigatorDefaults" font="SansSerifSmall" left="330" width="210"/>
+	<button label="OK" label_selected="OK" name="ok_btn" left="330"/>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn" left_delta="120"/>
 	<string name="JoystickMonitor">
 		Monitor del joystick
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_lagmeter.xml b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
index 7d499750de..1af0bb065c 100644
--- a/indra/newview/skins/default/xui/es/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
@@ -4,23 +4,26 @@
 	<text name="client">
 		Cliente:
 	</text>
-	<text name="client_text">
+	<text name="client_text" font="SansSerifSmall">
 		Normal
 	</text>
+	<text left="30" name="client_lag_cause" right="-10" />
 	<button label="" label_selected="" name="network_lagmeter" tool_tip="Estado del lag de la red"/>
 	<text name="network">
 		Red:
 	</text>
-	<text name="network_text">
+	<text name="network_text" font="SansSerifSmall">
 		Normal
 	</text>
+	<text left="30" name="network_lag_cause" right="-10" />
 	<button label="" label_selected="" name="server_lagmeter" tool_tip="Estado del lag del servidor"/>
 	<text name="server">
 		Servidor:
 	</text>
-	<text name="server_text">
+	<text name="server_text" font="SansSerifSmall">
 		Normal
 	</text>
+	<text left="30" name="server_lag_cause" right="-32" />
 	<button label="?" name="server_help"/>
 	<button label="&gt;&gt;" name="minimize"/>
 	<string name="max_title_msg">
@@ -117,10 +120,10 @@
 		20
 	</string>
 	<string name="server_frame_time_critical_msg">
-		Frecuencia del simulador -framerate- por debajo de [SERVER_FRAME_RATE_CRITICAL]
+		Frecuencia (framerate) por debajo de [SERVER_FRAME_RATE_CRITICAL]
 	</string>
 	<string name="server_frame_time_warning_msg">
-		Frecuencia del simulador -framerate- entre [SERVER_FRAME_RATE_CRITICAL] y [SERVER_FRAME_RATE_WARNING]
+		Frecuencia (framerate) entre [SERVER_FRAME_RATE_CRITICAL] y [SERVER_FRAME_RATE_WARNING]
 	</string>
 	<string name="server_frame_time_normal_msg">
 		Normal
diff --git a/indra/newview/skins/default/xui/es/floater_land_holdings.xml b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
index 5c08b04055..5df319905d 100644
--- a/indra/newview/skins/default/xui/es/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
@@ -8,7 +8,7 @@
 		<column label="" name="hidden"/>
 	</scroll_list>
 	<button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportar al centro de este terreno."/>
-	<button label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="Show on Map" tool_tip="Mostrar este terreno en el mapa del mundo."/>
+	<button width="130" label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="Show on Map" tool_tip="Mostrar este terreno en el mapa del mundo."/>
 	<text name="contrib_label">
 		Contribuciones a sus grupos:
 	</text>
diff --git a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
index 00a6995575..226c3482af 100644
--- a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="Script: script nuevo">
 	<button label="Reiniciar" label_selected="Reiniciar" name="Reset"/>
-	<check_box label="Ejecutándose" name="running"/>
-	<check_box label="Mono" name="mono"/>
+	<check_box label="Ejecutándose" name="running" left="4"/>
+	<check_box label="Mono" name="mono" left="106"/>
 	<string name="not_allowed">
 		No está autorizado para ver este script.
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
index c1e431f274..859a2d3812 100644
--- a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="Wiki de LSL">
 	<check_box label="Seguir al cursor" name="lock_check"/>
-	<combo_box label="Bloquear" name="history_combo"/>
-	<button label="Atrás" name="back_btn"/>
+	<combo_box label="Bloquear" name="history_combo" left_delta="120" width="70"/>
+	<button label="Atrás" name="back_btn" left_delta="75"/>
 	<button label="Adelante" name="fwd_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_media_browser.xml b/indra/newview/skins/default/xui/es/floater_media_browser.xml
index 9b60b28537..79c8980c02 100644
--- a/indra/newview/skins/default/xui/es/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/es/floater_media_browser.xml
@@ -2,10 +2,11 @@
 <floater name="floater_about" title="Navegador">
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
-			<button label="Atrás" name="back"/>
-			<button label="Adelante" name="forward"/>
-			<button label="Actualizar" name="reload"/>
-			<button label="Ir" name="go"/>
+			<button label="Atrás" name="back" width="75"/>
+			<button label="Adelante" name="forward" left_delta="75"  width="70"/>
+			<button label="Actualizar" name="reload" left_delta="75"/>
+			<combo_box left_delta="75" name="address" width="510"/>
+			<button label="Ir" name="go" left_delta="515"/>
 		</layout_panel>
 		<layout_panel name="parcel_owner_controls">
 			<button label="Enviar a la parcela la URL actual" name="assign"/>
diff --git a/indra/newview/skins/default/xui/es/floater_mute_object.xml b/indra/newview/skins/default/xui/es/floater_mute_object.xml
index a2b87b67ab..0cf38c09ee 100644
--- a/indra/newview/skins/default/xui/es/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_mute_object.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="mute by name" title="Ignorar un objeto según su nombre">
-	<text name="message">
-		Ignorar según el nombre sólo afecta al chat y los MI del objeto, no a sus sonidos.
+	<text name="message" bottom_delta="-40">
+		Ignorar según el nombre sólo afecta al chat y los MI del
+objeto, no a sus sonidos. 
 Debe escribir exactamente el nombre del objeto.
 	</text>
-	<line_editor name="object_name">
+	<line_editor name="object_name" bottom_delta="-58">
 		Nombre del objeto
 	</line_editor>
 	<button label="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/es/floater_pay.xml b/indra/newview/skins/default/xui/es/floater_pay.xml
index 9770e90bf4..136e6a6f01 100644
--- a/indra/newview/skins/default/xui/es/floater_pay.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay.xml
@@ -6,16 +6,17 @@
 	<button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
 	<button label="Pagar" label_selected="Pagar" name="pay btn"/>
 	<button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
-	<text length="1" name="payee_label" type="string">
+	<text length="1" name="payee_label" type="string" left="5" width="105">
 		Pagar al residente:
 	</text>
-	<text length="1" name="payee_name" type="string">
+	<text length="1" name="payee_name" type="string" left="115">
 		[FIRST] [LAST]
 	</text>
-	<text length="1" name="fastpay text" type="string">
+	<text length="1" name="fastpay text" type="string" width="100" halign="left">
 		Pago rápido:
 	</text>
-	<text length="1" name="amount text" type="string">
+	<text length="1" name="amount text" type="string" left="4" >
 		Cantidad:
 	</text>
+	<line_editor left="60" name="amount" width="55"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pay_object.xml b/indra/newview/skins/default/xui/es/floater_pay_object.xml
index 86b3af76f8..770ecc6ae5 100644
--- a/indra/newview/skins/default/xui/es/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay_object.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-	<text length="1" name="payee_group" type="string">
+	<text length="1" name="payee_group" type="string" left="5" width="110">
 		Pagar al grupo:
 	</text>
-	<text length="1" name="payee_resident" type="string">
+	<text length="1" name="payee_resident" type="string" left="5" width="110">
 		Pagar al residente:
 	</text>
-	<text length="1" name="payee_name" type="string">
+	<text length="1" name="payee_name" type="string" left="120" width="180">
 		[FIRST] [LAST]
 	</text>
-	<text length="1" name="object_name_label" type="string">
+	<text length="1" name="object_name_label" type="string" left="5" width="110">
 		A través del objeto:
 	</text>
-	<text length="1" name="object_name_text" type="string">
+	<text length="1" name="object_name_text" type="string" left="120" width="180">
 		...
 	</text>
 	<text length="1" name="fastpay text" type="string">
diff --git a/indra/newview/skins/default/xui/es/floater_postcard.xml b/indra/newview/skins/default/xui/es/floater_postcard.xml
index 06f8e7294a..315ea98c82 100644
--- a/indra/newview/skins/default/xui/es/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/es/floater_postcard.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Postcard" title="Foto por correo electrónico">
 	<text name="to_label">
-		Correo electrónico del destinatario:
+		Correo electrónico
+   del destinatario:
 	</text>
-	<text name="from_label">
-		Su correo electrónico:
+	<line_editor bottom_delta="-20" name="to_form" />
+	<text name="from_label" bottom_delta="-12">
+		Su correo
+   electrónico:
 	</text>
+	<line_editor bottom_delta="-20" name="from_form" />
 	<text name="name_label">
 		Su nombre:
 	</text>
@@ -13,14 +17,15 @@
 		Asunto:
 	</text>
 	<line_editor label="Escriba aquí el asunto." name="subject_form"/>
-	<text name="msg_label">
+	<text name="msg_label" bottom_delta="-18">
 		Mensaje:
 	</text>
 	<text_editor name="msg_form">
 		Escriba aquí el mensaje.
 	</text_editor>
-	<text name="fine_print">
-		Si su destinatario se registra en SL, usted conseguirá un bono de referido.
+	<text name="fine_print" bottom_delta="-21">
+		Si su destinatario se registra en Second Life,
+usted conseguirá un bono de referido.
 	</text>
 	<button label="Cancelar" name="cancel_btn"/>
 	<button label="Enviar" name="send_btn"/>
diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml
index 56e99e2285..df7fc93dd9 100644
--- a/indra/newview/skins/default/xui/es/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/es/floater_preferences.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Preferences" title="Preferencias">
+<floater name="Preferences" title="Preferencias" min_width="350" width="646">
 	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<button label="Aplicar" label_selected="Aplicar" name="Apply"/>
-	<button label="Acerca de" label_selected="Acerca de" name="About..."/>
+	<button label="Acerca de..." label_selected="Acerca de..." name="About..." />
 	<button label="Ayuda" label_selected="Ayuda" name="Help"/>
+	<tab_container name="pref core" tab_width="146" width="646" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
index cea2273089..0f2762022a 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
@@ -3,6 +3,6 @@
 	<text length="1" name="desc txt" type="string">
 		Descripción:
 	</text>
-	<button label="Ejecutarla en el mundo" label_selected="Parar" name="Anim play btn" tool_tip="Ejecutar esta animación de modo que puedan verla los demás."/>
-	<button label="Ejecutarla para usted" label_selected="Parar" name="Anim audition btn" tool_tip="Ejecutar esta animación de modo que sólo la vea usted."/>
+	<button left="12" width="142" label="Ejecutarla en el mundo" label_selected="Parar" name="Anim play btn" tool_tip="Ejecutar esta animación de modo que puedan verla los demás."/>
+	<button left="156" width="136" label="Ejecutarla para usted" label_selected="Parar" name="Anim audition btn" tool_tip="Ejecutar esta animación de modo que sólo la vea usted."/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
index 4513fc6f3c..492c4f958a 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
@@ -15,15 +15,15 @@
 	<text name="trigger_label">
 		Palabra clave:
 	</text>
-	<text name="replace_text" tool_tip="Reemplaza la/s palabra/s clave con estas palabras. Por ejemplo, si cambia la palabra clave &apos;hola&apos; por &apos;qué tal&apos;, se cambiará en el chat &apos;Quise decir hola&apos; por &apos;Quise decir qué tal&apos; en cuanto realice el gesto.">
+	<text left="208" name="replace_text" tool_tip="Reemplaza la/s palabra/s clave con estas palabras. Por ejemplo, si cambia la palabra clave &apos;hola&apos; por &apos;qué tal&apos;, se cambiará en el chat &apos;Quise decir hola&apos; por &apos;Quise decir qué tal&apos; en cuanto realice el gesto.">
 		Reemplazar por:
 	</text>
 	<line_editor name="replace_editor" tool_tip="Reemplaza la/s palabra/s clave con estas palabras. Por ejemplo, si cambia la palabra clave &apos;hola&apos; por &apos;qué tal&apos;, se cambiará en el chat &apos;Quise decir hola&apos; por &apos;Quise decir qué tal&apos; en cuanto realice el gesto."/>
 	<text name="key_label">
 		Atajo de teclado:
 	</text>
-	<combo_box label="Ninguno" name="modifier_combo"/>
-	<combo_box label="Ninguno" name="key_combo"/>
+	<combo_box label="Ninguno" name="modifier_combo" left="116" width="76"/>
+	<combo_box label="Ninguno" name="key_combo" width="76" left_delta="80"/>
 	<text name="library_label">
 		Biblioteca:
 	</text>
@@ -44,6 +44,7 @@ Esperar
 		Todos los pasos suceden a la vez, 
 a menos que añada pasos de espera.
 	</text>
+	<text left="230" name="options_text" width="200" />
 	<radio_group name="animation_trigger_type">
 		<radio_item name="start">
 			Empezar
@@ -52,9 +53,10 @@ a menos que añada pasos de espera.
 			Parar
 		</radio_item>
 	</radio_group>
-	<check_box label="hasta que las animaciones estén hechas" name="wait_anim_check"/>
-	<check_box label="tiempo en segundos" name="wait_time_check"/>
-	<check_box label="Disponible" name="active_check" tool_tip="Los gestos disponibles pueden realizarse escribiendo en el chat su frase clave o pulsando su tecla de acceso rápido. Generalmente, los gestos pasan a no disponibles cuando hay un conflicto de teclas."/>
-	<button label="Vista previa" name="preview_btn"/>
+	<check_box bottom_delta="34" label="hasta que las animaciones &#10;estén hechas" name="wait_anim_check"/>
+	<check_box bottom_delta="-30" label="tiempo en segundos" name="wait_time_check"/>
+	<line_editor left_delta="130" name="wait_time_editor" />
+	<check_box left="130" label="Disponible" name="active_check" tool_tip="Los gestos disponibles pueden realizarse escribiendo en el chat su frase clave o pulsando su tecla de acceso rápido. Generalmente, los gestos pasan a no disponibles cuando hay un conflicto de teclas."/>
+	<button label="Vista previa" name="preview_btn" width="85"/>
 	<button label="Guardar" name="save_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
index 0624f48a01..1d2b732d4d 100644
--- a/indra/newview/skins/default/xui/es/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
@@ -170,7 +170,9 @@
 		Detalles:
 	</text>
 	<text name="bug_aviso">
-		Por favor, sea muy concreto sobre la fecha, la localización, la naturaleza de la infracción, el aportar textos relevantes del chat o los MI, y, si es posible, seleccione el objeto.
+		Por favor, sea muy concreto sobre la fecha, la localización,
+la naturaleza de la infracción, el aportar textos relevantes
+del chat o los MI, y, si es posible, seleccione el objeto.
 	</text>
 	<text name="incomplete_title">
 		Nota: las denuncias incompletas no se investigarán.
diff --git a/indra/newview/skins/default/xui/es/floater_script_search.xml b/indra/newview/skins/default/xui/es/floater_script_search.xml
index 9cabed9e36..dc05370c2b 100644
--- a/indra/newview/skins/default/xui/es/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_search.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script search" title="Buscar en el script">
-	<check_box label="Indiferente mays./mins." name="case_text"/>
-	<button label="Buscar" label_selected="Buscar" name="search_btn"/>
-	<button label="Reemplazar" label_selected="Reemplazar" name="replace_btn"/>
-	<button label="Reemplazar todos" label_selected="Reemplazar todos" name="replace_all_btn"/>
-	<text length="1" name="txt" type="string">
+<floater name="script search" title="Buscar en el script" width="320">
+	<check_box label="Indiferente mays./mins." name="case_text" left="75"/>
+	<button label="Buscar" label_selected="Buscar" name="search_btn" width="85"/>
+	<button label="Reemplazar" label_selected="Reemplazar" name="replace_btn" left="100" width="85"/>
+	<button label="Reemplazar todos" label_selected="Reemplazar todos" name="replace_all_btn" left="190" width="122"/>
+	<text length="1" name="txt" type="string" width="65">
 		Buscar
 	</text>
-	<text length="1" name="txt2" type="string">
+	<text length="1" name="txt2" type="string" width="65">
 		Reemplazar
 	</text>
+	<line_editor left="75" name="search_text" width="240" />
+	<line_editor left="75" name="replace_text" width="240" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml
index 132985864c..9c889df63a 100644
--- a/indra/newview/skins/default/xui/es/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/es/floater_select_key.xml
@@ -2,6 +2,6 @@
 <floater name="modal container" title="">
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<text name="Save item as:">
-		Pulse una tecla para seleccionar
+		Pulse una tecla para seleccionarla
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_settings_debug.xml b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
index 056d71a7bc..e5c652711e 100644
--- a/indra/newview/skins/default/xui/es/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
@@ -2,10 +2,10 @@
 <floater name="settings_debug" title="Configuración del depurador">
 	<combo_box name="boolean_combo">
 		<combo_item name="TRUE">
-			TRUE
+			VERDADERO
 		</combo_item>
 		<combo_item name="FALSE">
-			FALSE
+			FALSO
 		</combo_item>
 	</combo_box>
 	<color_swatch label="Color" name="color_swatch"/>
@@ -13,5 +13,5 @@
 	<spinner label="x" name="val_spinner_2"/>
 	<spinner label="x" name="val_spinner_3"/>
 	<spinner label="x" name="val_spinner_4"/>
-	<button label="Volver a las opciones por defecto" name="default_btn"/>
+	<button label="Volver a las opciones por defecto" name="default_btn" width="210"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml
index ad23be3166..1ea3327d96 100644
--- a/indra/newview/skins/default/xui/es/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml
@@ -108,8 +108,8 @@
 			BMP
 		</combo_item>
 	</combo_box>
-	<spinner label="Ancho" name="snapshot_width"/>
-	<spinner label="Alto" name="snapshot_height"/>
+	<spinner label="Ancho" name="snapshot_width" label_width="41" width="101"/>
+	<spinner label="Alto" name="snapshot_height" label_width="30" width="90" left="121"/>
 	<check_box label="Mantener las proporciones" name="keep_aspect_check"/>
 	<slider label="Calidad de la imagen" name="image_quality_slider"/>
 	<text name="layer_type_label">
@@ -127,10 +127,10 @@
 		</combo_item>
 	</combo_box>
 	<check_box label="Incluir la interfaz en la foto" name="ui_check"/>
-	<check_box label="Incluir los HUD en la foto" name="hud_check"/>
-	<check_box label="Mantenerla abierta tras guardarla" name="keep_open_check"/>
-	<check_box label="Congelar la toma (vista previa en pantalla completa)" name="freeze_frame_check"/>
-	<check_box label="Actualizar automáticamente" name="auto_snapshot_check"/>
+	<check_box bottom_delta="-17" label="Incluir los HUD en la foto" name="hud_check"/>
+	<check_box bottom_delta="-17" label="Mantenerla abierta tras guardarla" name="keep_open_check"/>
+	<check_box bottom_delta="-17" label="Congelar la toma &#10;(vista previa en pantalla completa)" name="freeze_frame_check"/>
+	<check_box bottom_delta="-29" label="Actualizar automáticamente" name="auto_snapshot_check"/>
 	<string name="unknown">
 		desconocido
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_telehub.xml b/indra/newview/skins/default/xui/es/floater_telehub.xml
index 921577751a..74084e9db9 100644
--- a/indra/newview/skins/default/xui/es/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/es/floater_telehub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="telehub" title="Punto de Teleporte">
+<floater name="telehub" title="Punto de Teleporte" min_height="310" height="310">
 	<text name="status_text_connected">
 		Punto de Teleporte conectado al objeto [OBJECT]
 	</text>
@@ -9,20 +9,24 @@
 	<text name="help_text_connected">
 		Para quitar, pulse Desconectar.
 	</text>
-	<text name="help_text_not_connected">
-		Seleccione el objeto y pulse Conectar el Punto de Teleporte.
+	<text name="help_text_not_connected" height="38" bottom_delta="-18">
+		Seleccione el objeto y pulse Conectar el Punto
+de Teleporte.
 	</text>
 	<button label="Conectar el Punto de Teleporte" name="connect_btn"/>
 	<button label="Desconectar" name="disconnect_btn"/>
 	<text name="spawn_points_text">
-		Spawn Points (positions, not objects):
+		Sucursales (posiciónes, no objetos):
 	</text>
 	<button label="Añadir sucursales" name="add_spawn_point_btn"/>
 	<button label="Quitar sucursales" name="remove_spawn_point_btn"/>
 	<text name="spawn_point_help">
-		Seleccione el objeto y pulse Añadir para especificar la posición.
+		Seleccione el objeto y pulse Añadir para
+especificar la posición.
 Hecho eso, puede mover o borrar el objeto.
-Las posiciones son relativas al centro del Punto de Teleporte.
-Seleccione un ítem de la lista para mostrar su posición en el mundo.
+Las posiciones son relativas al centro del
+Punto de Teleporte.
+Seleccione un ítem de la lista para mostrar su
+posición en el mundo.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index 8c3882f0c8..477d546806 100644
--- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -9,8 +9,8 @@
 	<text length="1" name="unknown" type="string">
 		Dimensiones: [DIMENSIONS]
 	</text>
-	<button label="Por defecto" label_selected="Por defecto" name="Default"/>
-	<button label="Ninguna" label_selected="Ninguna" name="None"/>
+	<button label="Por defecto" label_selected="Por defecto" name="Default" width="84"/>
+	<button label="Ninguna" label_selected="Ninguna" name="None" left="90"/>
 	<button label="Blanca" label_selected="Blanca" name="Blank"/>
 	<check_box label="Ver las carpetas" name="show_folders_check"/>
 	<search_editor label="Escriba aquí para buscar una" name="inventory search editor"/>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 15c66c8366..e6ff6b0fa5 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Construir" width="288">
 	<button label="" label_selected="" name="button focus" tool_tip="Visión"/>
 	<button label="" label_selected="" name="button move" tool_tip="Mover"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Editar"/>
@@ -19,7 +19,7 @@
 	<text name="text ruler mode">
 		Ajuste:
 	</text>
-	<combo_box name="combobox grid mode">
+	<combo_box name="combobox grid mode" width="82">
 		<combo_item name="World">
 			Mundo
 		</combo_item>
@@ -34,8 +34,8 @@
 	<check_box label="Estirar las texturas" name="checkbox stretch textures"/>
 	<check_box label="Usar la cuadrícula" name="checkbox snap to grid"/>
 	<button label="Opciones..." label_selected="Opciones..." name="Options..."/>
-	<text name="text status">
-		Arrastrar para mover, arrastrar + Mayús. para copiar
+	<text name="text status" width="280">
+		Arrastrar para mover, Mayús.+arrastrar para copiar
 	</text>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
@@ -63,7 +63,7 @@
 	<check_box label="Suavizar" name="radio smooth"/>
 	<check_box label="Escarpar" name="radio noise"/>
 	<check_box label="Restablecer" name="radio revert"/>
-	<button label="Aplicar" label_selected="Aplicar" name="button apply to selection" tool_tip="Modificar el terreno seleccionado"/>
+	<button label="Aplicar" label_selected="Aplicar" name="button apply to selection" tool_tip="Modificar el terreno seleccionado" left="146"/>
 	<text name="Bulldozer:">
 		Bulldozer:
 	</text>
@@ -73,13 +73,13 @@
 	<text name="Strength:">
 		Fuerza
 	</text>
-	<text name="obj_count">
+	<text name="obj_count" left="134">
 		Objetos seleccionados: [COUNT]
 	</text>
-	<text name="prim_count">
+	<text name="prim_count" left="134">
 		primitivas: [COUNT]
 	</text>
-	<tab_container name="Object Info Tabs">
+	<tab_container name="Object Info Tabs" tab_max_width="62" tab_min_width="30" width="288">
 		<panel label="General" name="General">
 			<text name="Name:">
 				Nombre:
@@ -144,12 +144,12 @@
 				El próximo propietario puede:
 			</text>
 			<check_box label="Modificarlo" name="checkbox next owner can modify"/>
-			<check_box label="Copiarlo" name="checkbox next owner can copy"/>
-			<check_box label="Revenderlo/Darlo" name="checkbox next owner can transfer"/>
-			<text name="label click action">
+			<check_box label="Copiarlo" name="checkbox next owner can copy" left_delta="80"/>
+			<check_box label="Revenderlo/Darlo" name="checkbox next owner can transfer" left_delta="67"/>
+			<text name="label click action" width="180">
 				Al pulsarlo con el botón izquierdo:
 			</text>
-			<combo_box name="clickaction">
+			<combo_box name="clickaction" width="192">
 				<combo_item name="Touch/grab(default)">
 					Tocar/Agarrar (por defecto)
 				</combo_item>
@@ -206,7 +206,7 @@
 				Debe seleccionar todo el objeto para definir los permisos.
 			</string>
 			<string name="Cost Default">
-				Precio:           L$
+				Precio:         L$
 			</string>
 			<string name="Cost Total">
 				Precio total:  L$
@@ -223,7 +223,7 @@
 		</panel>
 		<panel label="Objeto" name="Object">
 			<text name="select_single">
-				Seleccione un único prim para editar los parámetros.
+				Seleccione un sólo prim para editarlo.
 			</text>
 			<text name="edit_object">
 				Modificar los parámetros del objeto:
@@ -277,7 +277,7 @@
 				</combo_item>
 			</combo_box>
 			<text name="label basetype">
-				Tipo de objeto para construir
+				Tipo de objeto a construir
 			</text>
 			<combo_box name="comboBaseType">
 				<combo_item name="Box">
@@ -334,7 +334,7 @@
 				</combo_item>
 			</combo_box>
 			<text name="text twist">
-				La torsión: Inicio y Fin
+				Torsión: Inicio y Fin
 			</text>
 			<spinner label="I" name="Twist Begin"/>
 			<spinner label="F" name="Twist End"/>
@@ -397,9 +397,9 @@
 				</combo_item>
 			</combo_box>
 		</panel>
-		<panel label="Características" name="Features">
+		<panel label="Caracter." name="Features">
 			<text name="select_single">
-				Seleccione un sólo prim para editar las características.
+				Seleccione un sólo prim para editarlo.
 			</text>
 			<text name="edit_object">
 				Editar las características del objeto:
@@ -431,11 +431,11 @@
 			<text name="glow label">
 				Resplandor
 			</text>
-			<check_box label="Brillo al máximo" name="checkbox fullbright"/>
+			<check_box label="Brillo al &#10;máximo" name="checkbox fullbright" bottom_delta="-21"/>
 			<text name="tex gen">
 				Detallado
 			</text>
-			<combo_box name="combobox texgen">
+			<combo_box name="combobox texgen" width="86">
 				<combo_item name="Default">
 					Por defecto
 				</combo_item>
@@ -530,27 +530,29 @@
 				Rotación (grados)
 			</text>
 			<string name="string repeats per meter">
-				Repeticiones por metro
+				Repeticiones por m.
 			</string>
 			<string name="string repeats per face">
 				Repeticiones por cara
 			</string>
 			<text name="rpt">
-				Repeticiones por metro
+				Repeticiones por m.
 			</text>
-			<button label="Aplicar" label_selected="Aplicar" name="button apply"/>
+			<spinner left="118" name="TexRot" width="62" />
+			<spinner left="118" name="rptctrl" width="62" />
+			<button label="Aplicar" label_selected="Aplicar" name="button apply" left_delta="72"/>
 			<text name="tex offset">
 				Desplazar
 			</text>
 			<spinner label="Horizontal (U)" name="TexOffsetU"/>
 			<spinner label="Vertical (V)" name="TexOffsetV"/>
-			<text name="textbox autofix">
+			<text name="textbox autofix" width="180">
 				Centrar la textura para los media
 (primero debe subirla)
 			</text>
-			<button label="Alinear" label_selected="Alinear" name="button align"/>
+			<button label="Alinear" label_selected="Alinear" name="button align" left="180"/>
 		</panel>
-		<panel label="Contenido" name="Contents">
+		<panel label="Contenido " name="Contents">
 			<button label="Script nuevo" label_selected="Script nuevo" name="button new script"/>
 			<button label="Permisos..." name="button permissions"/>
 		</panel>
@@ -565,19 +567,19 @@
 		<text name="label_area">
 			Superficie: [AREA] m²
 		</text>
-		<button label="Acerca del terreno..." label_selected="Acerca del terreno..." name="button about land"/>
+		<button label="Acerca del terreno..." label_selected="Acerca del terreno..." name="button about land" width="140"/>
 		<check_box label="Mostrar los propietarios" name="checkbox show owners" tool_tip="El color de las parcelas es según su propietario"/>
-		<button label="?" label_selected="?" name="button show owners help"/>
+		<button label="?" label_selected="?" name="button show owners help" left_delta="150"/>
 		<text name="label_parcel_modify">
 			Modificar la parcela
 		</text>
-		<button label="Subdividir..." label_selected="Subdividir..." name="button subdivide land"/>
-		<button label="Unir..." label_selected="Unir..." name="button join land"/>
+		<button label="Subdividir..." label_selected="Subdividir..." name="button subdivide land" width="140"/>
+		<button label="Unir..." label_selected="Unir..." name="button join land" width="140"/>
 		<text name="label_parcel_trans">
 			Transacciones de terreno
 		</text>
-		<button label="Comprar terreno..." label_selected="Comprar terreno..." name="button buy land"/>
-		<button label="Abandonar el terreno..." label_selected="Abandonar el terreno..." name="button abandon land"/>
+		<button label="Comprar terreno..." label_selected="Comprar terreno..." name="button buy land" width="140"/>
+		<button label="Abandonar el terreno..." label_selected="Abandonar el terreno..." name="button abandon land" width="140"/>
 	</panel>
 	<string name="status_rotate">
 		Arrastre las bandas de color para girar el objeto
@@ -586,7 +588,7 @@
 		Pulse y arrastre para estirar el lado seleccionado
 	</string>
 	<string name="status_move">
-		Arrastrar para mover, arrastrar + Mayús. para copiar
+		Arrastrar para mover, Mayús.+arrastrar para copiar
 	</string>
 	<string name="status_modifyland">
 		Mantenga pulsado para modificar el terreno
diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml
index ce0c22062b..95f2c39d42 100644
--- a/indra/newview/skins/default/xui/es/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/es/floater_top_objects.xml
@@ -11,23 +11,26 @@
 		<column label="Tiempo" name="time"/>
 		<column label="Tiempo en Mono" name="mono_time"/>
 	</scroll_list>
+	<line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/>
+	<line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/>
+	<line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/>
 	<text name="id_text">
 		ID del objeto:
 	</text>
-	<button label="Mostrar la baliza" name="show_beacon_btn"/>
+	<button label="Mostrar la baliza" name="show_beacon_btn" width="115"/>
 	<text name="obj_name_text">
 		Nombre del objeto:
 	</text>
-	<button label="Filtro" name="filter_object_btn"/>
-	<text name="owner_name_text">
+	<button label="Filtro" name="filter_object_btn" width="115"/>
+	<text name="owner_name_text" width="130">
 		Nombre del propietario:
 	</text>
-	<button label="Filtro" name="filter_owner_btn"/>
-	<button label="Devolver lo seleccionado" name="return_selected_btn"/>
-	<button label="Devolver todo" name="return_all_btn"/>
-	<button label="Desactivar lo seleccionado" name="disable_selected_btn"/>
-	<button label="Desactivar todo" name="disable_all_btn"/>
-	<button label="Actualizar" name="refresh_btn"/>
+	<button label="Filtro" name="filter_owner_btn" width="115"/>
+	<button label="Devolver lo seleccionado" name="return_selected_btn" width="170"/>
+	<button label="Devolver todo" name="return_all_btn" left="190"/>
+	<button label="Desactivar lo seleccionado" name="disable_selected_btn" width="170"/>
+	<button label="Desactivar todo" name="disable_all_btn" left="190"/>
+	<button label="Actualizar" name="refresh_btn" width="115"/>
 	<string name="top_scripts_title">
 		Scripts según su uso
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml
index 9f2ff615f3..e6975e8994 100644
--- a/indra/newview/skins/default/xui/es/floater_tos.xml
+++ b/indra/newview/skins/default/xui/es/floater_tos.xml
@@ -4,8 +4,8 @@
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<check_box label="Estoy de acuerdo con las Condiciones del Servicio" name="agree_chk"/>
 	<text name="tos_heading">
-		Por favor, lea cuidadosamente las siguientes Condiciones del Servicio. Si quiere seguir iniciando sesión en Second Life,
-debe aceptar el acuerdo.
+		Por favor, lea cuidadosamente las siguientes Condiciones del Servicio. Si quiere seguir
+iniciando sesión en Second Life, debe aceptar el acuerdo.
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/es/floater_url_entry.xml b/indra/newview/skins/default/xui/es/floater_url_entry.xml
index abdd69b090..f7c85ff068 100644
--- a/indra/newview/skins/default/xui/es/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/es/floater_url_entry.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="url_entry" title="">
 	<text name="media_label">
-		URL para media:
+		URL del media:
 	</text>
+	<combo_box left="106" name="media_entry" width="354" />
 	<button label="OK" name="ok_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
 	<button label="Limpiar" name="clear_btn"/>
diff --git a/indra/newview/skins/default/xui/es/floater_water.xml b/indra/newview/skins/default/xui/es/floater_water.xml
index 5a759af5ff..934fc7882b 100644
--- a/indra/newview/skins/default/xui/es/floater_water.xml
+++ b/indra/newview/skins/default/xui/es/floater_water.xml
@@ -11,20 +11,20 @@
 			<text name="BHText">
 				Color del agua
 			</text>
-			<button label="?" name="WaterFogColorHelp"/>
+			<button label="?" name="WaterFogColorHelp" left="175" />
 			<color_swatch label="" name="WaterFogColor" tool_tip="Pulse para abrir el selector de color"/>
 			<text name="WaterFogDensText">
 				Transparencia
 			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
+			<button label="?" name="WaterFogDensityHelp" left="175" />
 			<text name="WaterUnderWaterFogModText">
 				Modificar la claridad del agua
 			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
+			<button label="?" name="WaterUnderWaterFogModHelp" left="175" />
 			<text name="BDensText">
 				Tamaño de las ondulaciones
 			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
+			<button label="?" name="WaterNormalScaleHelp" left="405"/>
 			<text name="BHText2">
 				1
 			</text>
@@ -37,29 +37,29 @@
 			<text name="HDText">
 				Escala de Fresnel
 			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
+			<button label="?" name="WaterFresnelScaleHelp" left="405"/>
 			<text name="FresnelOffsetText">
 				Coeficiente de reflexión
 			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
+			<button label="?" name="WaterFresnelOffsetHelp" left="405"/>
 			<text name="DensMultText">
 				Refracción de la superficie
 			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
+			<button label="?" name="WaterScaleAboveHelp" left="640"/>
 			<text name="WaterScaleBelowText">
 				Refracción bajo la superficie
 			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
+			<button label="?" name="WaterScaleBelowHelp" left="640"/>
 			<text name="MaxAltText">
 				Desenfoque
 			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
+			<button label="?" name="WaterBlurMultiplierHelp" left="640"/>
 		</panel>
 		<panel label="Imagen" name="Waves">
 			<text name="BHText">
 				Sentido de la onda grande
 			</text>
-			<button label="?" name="WaterWave1Help"/>
+			<button label="?" name="WaterWave1Help" left="170"/>
 			<text name="WaterWave1DirXText">
 				X
 			</text>
@@ -69,7 +69,7 @@
 			<text name="BHText2">
 				Sentido de la onda pequeña
 			</text>
-			<button label="?" name="WaterWave2Help"/>
+			<button label="?" name="WaterWave2Help" left="170"/>
 			<text name="WaterWave2DirXText">
 				X
 			</text>
diff --git a/indra/newview/skins/default/xui/es/floater_windlight_options.xml b/indra/newview/skins/default/xui/es/floater_windlight_options.xml
index 79b70d4d59..e240dea0b5 100644
--- a/indra/newview/skins/default/xui/es/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_windlight_options.xml
@@ -6,7 +6,7 @@
 	<button label="Nuevo" label_selected="Nuevo" name="WLNewPreset"/>
 	<button label="Guardar" label_selected="Guardar" name="WLSavePreset"/>
 	<button label="Borrar" label_selected="Borrar" name="WLDeletePreset"/>
-	<button label="Editor del ciclo de un día" label_selected="Editor del ciclo de un día" name="WLDayCycleMenuButton"/>
+	<button font="SansSerifSmall" width="150" left_delta="90" label="Editor del ciclo de un día" label_selected="Editor del ciclo de un día" name="WLDayCycleMenuButton"/>
 	<tab_container name="WindLight Tabs">
 		<panel label="Atmósfera" name="Atmosphere">
 			<text name="BHText">
@@ -122,7 +122,7 @@
 			<text name="WLCloudColorText">
 				Color de las nubes
 			</text>
-			<button label="?" name="WLCloudColorHelp"/>
+			<button label="?" name="WLCloudColorHelp" left="190" />
 			<text name="BHText">
 				R
 			</text>
@@ -138,7 +138,7 @@
 			<text name="WLCloudColorText2">
 				Posición/Densidad de las nubes
 			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
+			<button label="?" name="WLCloudDensityHelp" left="190"/>
 			<text name="BHText5">
 				X
 			</text>
@@ -156,11 +156,12 @@
 				Altitud de las nubes
 			</text>
 			<button label="?" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Detalle de las nubes (Posición/Densidad)
+			<text name="WLCloudDetailText" font="SansSerifSmall">
+				Detalle de las nubes
+(Posición/Densidad)
 			</text>
 			<button label="?" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
+			<text name="BHText8" bottom="-113">
 				X
 			</text>
 			<text name="BHText9">
@@ -169,18 +170,19 @@
 			<text name="BHText10">
 				D
 			</text>
+			<slider bottom="-127" name="WLCloudDetailX"/>
 			<text name="WLCloudScrollXText">
-				Velocidad de las nubes: X
+				Velocidad de X
 			</text>
 			<button label="?" name="WLCloudScrollXHelp"/>
 			<check_box label="Bloquear" name="WLCloudLockX"/>
 			<text name="WLCloudScrollYText">
-				Velocidad de las nubes: Y
+				Velocidad de Y
 			</text>
 			<button label="?" name="WLCloudScrollYHelp"/>
 			<check_box label="Bloquear" name="WLCloudLockY"/>
 			<check_box label="Incluir nubes clásicas" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
+			<button label="?" name="WLClassicCloudsHelp" left="618"/>
 		</panel>
 	</tab_container>
 	<string name="WLDefaultSkyNames">
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 0712440e1f..4a7ac4e175 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -119,8 +119,12 @@
 		<menu_item_call label="Parar la animación de mi avatar" name="Stop Animating My Avatar"/>
 		<menu_item_call label="Recuperar las teclas" name="Release Keys"/>
 		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="Historial de mi cuenta..." name="Account History..."/>
-		<menu_item_call label="Administrar mi cuenta..." name="Manage My Account..."/>
+		<menu_item_call label="Historial de mi cuenta..." name="Account History...">
+			<on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=es"/>
+		</menu_item_call>
+		<menu_item_call label="Administrar mi cuenta..." name="Manage My Account...">
+			<on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es"/>
+		</menu_item_call>
 		<menu_item_call label="Comprar L$..." name="Buy and Sell L$..."/>
 		<menu_item_separator label="-----------" name="separator5"/>
 		<menu_item_call label="Mi terreno..." name="My Land..."/>
@@ -165,7 +169,9 @@
 		<menu_item_separator label="-----------" name="separator4"/>
 		<menu_item_call label="Visión en lo seleccionado" name="Focus on Selection"/>
 		<menu_item_call label="Zoom en lo seleccionado" name="Zoom to Selection"/>
-		<menu_item_call label="Comprar el objeto" name="Menu Object Take"/>
+		<menu_item_call label="Comprar el objeto" name="Menu Object Take">
+			<on_enable userdata="Comprar el objeto,Coger el objeto" name="EnableBuyOrTake"/>
+		</menu_item_call>
 		<menu_item_call label="Coger una copia" name="Take Copy"/>
 		<menu_item_call label="Devolver una copia del objeto a los contenidos de donde salió" name="Save Object Back to Object Contents"/>
 		<menu_item_separator label="-----------" name="separator6"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index d7e480c653..9bbbc6c47f 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -189,7 +189,7 @@ No podrá removérseles de ese rol, sino que deberán renunciar a él por sí mi
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="ClickPublishHelpLand">
-		Seleccionar &quot;Publicar en la web&quot;
+		Seleccionar &apos;Publicar en la web&apos;
 Marcando este ítem, se mostrará:
 - esta parcela en los resultados de la búsqueda
 - los objetos públicos de esta parcela
@@ -219,7 +219,7 @@ Marcando este ítem, se mostrará:
 		No puede hacer que esta parcela aparezca en la búsqueda, porque está situada en una región que lo prohíbe.
 	</notification>
 	<notification name="ClickPublishHelpAvatar">
-		Al seleccionar &quot;Mostrar en Buscar&quot; se mostrará:
+		Al seleccionar &apos;Mostrar en la búsqueda&apos; se mostrará:
 - mi perfil en los resultados de la búsqueda
 - un enlace a mi perfil en las páginas públicas de grupo
 	</notification>
@@ -928,7 +928,7 @@ Deberá reconfigurar el nombre y las opciones de la nueva parcela.
 El color de las parcelas indica el tipo de propietario.
 
 Verde = Su terreno
-Agua = Terreno de su&apos;s grupo&apos;s
+Agua = Terreno de sus grupos
 Rojo = Propiedad de otros
 Amarillo = En venta
 Morado = Para subasta
@@ -1196,13 +1196,13 @@ Por favor, selección sólo uno y reinténtelo.
 		No se han podido configurar las texturas de la región:
 La textura del terreno [TEXTURE_NUM] tiene una profundidad de bites inválida: [TEXTURE_BIT_DEPTH].
 
-Cambie la textura [TEXTURE_NUM] por una imagen de 24-bit y 512x512 o menor, y pulse de nuevo &quot;Aplicar&quot; .
+Cambie la textura [TEXTURE_NUM] por una imagen de 24-bit y 512x512 o menor, y pulse de nuevo &apos;Aplicar&apos; .
 	</notification>
 	<notification name="InvalidTerrainSize">
 		No se han podido configurar las texturas de la región:
 La textura del terreno [TEXTURE_NUM] es demasiado grande: [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
 
-Cambie la textura [TEXTURE_NUM] por una imagen de 24-bit y 512x512 o menor, y pulse de nuevo &quot;Aplicar&quot; .
+Cambie la textura [TEXTURE_NUM] por una imagen de 24-bit y 512x512 o menor, y pulse de nuevo &apos;Aplicar&apos; .
 	</notification>
 	<notification name="RawUploadStarted">
 		Ha empezado la subida. Dependiendo de la velocidad de su conexión, llevará unos dos minutos.
@@ -1537,7 +1537,7 @@ Por favor, compruebe que tiene instalado el último visor, y vaya a la Base de C
 		Usted no está autorizado en esa región por su nivel de calificación..
 
 Puede pulsar &apos;Cambiar preferencia&apos; para aumentar su nivel de calificación y poder entrar. Desde ese momento, podrá buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quiere deshacer esta configuración, vaya a Editar &gt; Preferencias... &gt; General.
-	 <form>
+	 <form name="form">
       <button
        name="OK"
        text="Cambiar preferencia"/>
@@ -1545,7 +1545,7 @@ Puede pulsar &apos;Cambiar preferencia&apos; para aumentar su nivel de calificac
        default="true"
        name="Cancel"
        text="Cerrar"/>
-       <ignore text="Cuando la entrada a la región está bloqueada por la preferencia del nivel de calificación"/>
+       <ignore name="ignore" text="Cuando la entrada a la región está bloqueada por la preferencia del nivel de calificación"/>
     </form>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
@@ -1735,7 +1735,7 @@ Cuando está activada, los residentes sólo pueden ser empujados por sí mismos
 Por defecto: Off
 	</notification>
 	<notification label="Unir/Dividir parcelas" name="HelpParcelChanges">
-		Esta casilla determina si las parcelas que no son del propietario del estado pueden puede unirse o subdividirse.
+		Esta casilla determina si las parcelas que no son del propietario del estado pueden unirse o subdividirse.
 Si no se marca esta opción:
  * Sólo los propietarios o los administradores del estado pueden unir o dividir parcelas.
  * Sólo podrán unir o dividir las parcelas pertenecientes al propietario o a un grupo en el que tengan los poderes adecuados.
@@ -1860,7 +1860,7 @@ Por defecto: on
 		Esta casilla fija la posición del Sol en la posición del deslizable Fase, y detiene su movimiento.
 	</notification>
 	<notification label="Acceso público" name="HelpEstateExternallyVisible">
-		Esta casilla habilita a cualquier residente que esté en otro estado pueda entrar en éste sin tener que estar en una lista de acceso.
+		Esta casilla habilita que cualquier residente que esté en otro estado pueda entrar en éste sin tener que estar en una lista de acceso.
 
 Por defecto: on
 	</notification>
@@ -2162,7 +2162,7 @@ Núm. máx. de partículas: define el número máximo de partículas que podrá
 
 Calidad del procesamiento: define la resolución con que se renderiza el brillo.
 
-Detalle de la malla: define la cantidad de dettales o número de triángulos usados para renderizar algunos objetos. Cuanto más alto sea el valor, más detalle, pero más tiempo para renderizar.
+Detalle de la malla: define la cantidad de detalles o número de triángulos usados para renderizar algunos objetos. Cuanto más alto sea el valor, más detalle, pero más tiempo para renderizar.
 
 Detalles de la iluminación: determina que tipo de luces quiere usted que se rendericen.
 
@@ -2195,30 +2195,30 @@ Nivel de detalle del terreno: marca con cuánto detalle quiere ver la textura de
 	<notification name="EnvSettingsHelpButton">
 		Estas configuraciones ajustan la forma en que usted ve el medio ambiente localmente, en su ordenador. Su tarjeta gráfica debe admitir shaders de la atmósfera (&apos;atmospheric shaders&apos;) para poder acceder a esta configuración.
 
-Ajuste el deslizable &quot;Duración de un día&quot; para cambiar localmente, en su visor, las etapas del día.
+Ajuste el deslizable &apos;Duración de un día&apos; para cambiar localmente, en su visor, las etapas del día.
 
-Ajuste el deslizable &quot;Nubosidad&quot; para controlar cuántas nubes cubren el cielo.
+Ajuste el deslizable &apos;Nubosidad&apos; para controlar cuántas nubes cubren el cielo.
 
-Pulse un color en el selector de &quot;Color del agua&quot; para cambiar el color de la misma.
+Pulse un color en el selector de &apos;Color del agua&apos; para cambiar el color de la misma.
 
-Ajuste el deslizable &quot;Claridad del agua&quot; para controlar el nivel de claridad del agua bajo la superficie.
+Ajuste el deslizable &apos;Claridad del agua&apos; para controlar el nivel de claridad del agua bajo la superficie.
 
-Pulse &quot;Usar el horario del estado&quot; para devolver los valores del día al tiempo actual de la región y seguir a partir de él.
+Pulse &apos;Usar el horario del estado&apos; para devolver los valores del día al tiempo actual de la región y seguir a partir de él.
 
-Pulse &quot;Cielo avanzado&quot; para abrir un editor con configuraciones avanzadas para el cielo.
+Pulse &apos;Cielo avanzado&apos; para abrir un editor con configuraciones avanzadas para el cielo.
 
-Pulse &quot;Agua avanzada&quot; para abrir un editor con configuraciones avanzadas para el agua.
+Pulse &apos;Agua avanzada&apos; para abrir un editor con configuraciones avanzadas para el agua.
 	</notification>
 	<notification name="HelpDayCycle">
 		El Editor del ciclo del día le permite controlar el cielo de Second Life durante el ciclo día/noche. Este es el ciclo que usa el deslizable Duración de un día del Editor del entorno.
 
-El Editor del ciclo del día trabaja configurando fotogramas clave (&apos;keyframes&apos;): nodos (representados por los puntos grises en la línea del tiempo) cada uno de los cuales tiene asociado un Cielo definido. Según progresa la Duración de un día, el WindLight realiza la &quot;animación&quot; del cielo interpolándose entre esos fotogramas clave.
+El Editor del ciclo del día trabaja configurando fotogramas clave (&apos;keyframes&apos;): nodos (representados por los puntos grises en la línea del tiempo) cada uno de los cuales tiene asociado un Cielo definido. Según progresa la Duración de un día, el WindLight realiza la &apos;animación&apos; del cielo interpolándose entre esos fotogramas clave.
 
 La flecha amarilla sobre la línea del tiempo representa lo que usted ve actualmente, basándose en la Duración de un día. Púlsela y muévela para ver cómo cambia la animación del día. Puede añadir o borrar fotogramas clave pulsando los botones Añadir un punto o Quitar un punto, situados a la derecha de la línea del tiempo.
 
-Puede establecer la posición en el tiempo de cualquier fotograma clave moviéndolo a lo largo de la línea del tiempo, o configurando manualmente su valor por su valor manualmente en el recuadro Configuración del fotograma clave. También en ese recuadro podrá asociar el fotograma clave a un modelo predefinido de WindLight.
+Puede establecer la posición en el tiempo de cualquier fotograma clave moviéndolo a lo largo de la línea del tiempo, o configurando manualmente su valor en el recuadro Configuración del fotograma clave. También en ese recuadro podrá asociar el fotograma clave a un modelo predefinido de WindLight.
 
-La Duración del ciclo establece la duración total de un &quot;día&quot;. Marcar un valor bajo (por ejemplo, 2 min.) hará que las 24 horas de su línea del tiempo se animen ¡en sólo dos minutos reales! Una vez que esté satisfecho con su ciclo de la línea del tiempo y los fotogramas clave, utilice los botones Probar y Parar para obtener una vista previa de los resultados. Recuerde que también puede mover la flecha amarilla de encima de la línea del tiempo para ver el ciclo de la animación. El botón Usar el horario del estado sincronizará su ciclo de duración de un día con el ciclo del estado.
+La Duración del ciclo establece la duración total de un &apos;día&apos;. Marcar un valor bajo (por ejemplo, 2 min.) hará que las 24 horas de su línea del tiempo se animen ¡en sólo dos minutos reales! Una vez que esté satisfecho con su ciclo de la línea del tiempo y los fotogramas clave, utilice los botones Probar y Parar para obtener una vista previa de los resultados. Recuerde que también puede mover la flecha amarilla de encima de la línea del tiempo para ver el ciclo de la animación. El botón Usar el horario del estado sincronizará su ciclo de duración de un día con el ciclo del estado.
 
 Cuando todo esté a su gusto, puede guardar esos datos y cargarlos luego usando los botones Guardar este tipo de día y Cargar un tipo de día. Note que, por el momento, sólo podemos permitir un ciclo de un día.
 	</notification>
@@ -2235,13 +2235,13 @@ Cuando todo esté a su gusto, puede guardar esos datos y cargarlos luego usando
 		La Densidad de la bruma controla lo sombrío de la atmósfera, su neblina. Es eficaz para simular escenas con mucho humo o contaminantes, y también para simular niebla y llovizna.
 	</notification>
 	<notification name="HelpDensityMult">
-		La Densidad puede usarse para definir globalmente la &apos;pesadez&apos; de la atmósfera. Los ajustes bajos dan sensación de un &quot;aire limpio&quot;, y los altos de pesadez, de esmog.
+		La Densidad puede usarse para definir globalmente la &apos;pesadez&apos; de la atmósfera. Los ajustes bajos dan sensación de un &apos;aire limpio&apos;, y los altos de pesadez, de esmog.
 	</notification>
 	<notification name="HelpDistanceMult">
 		Ajusta a qué distancia se percibe el WindLight. El valor cero desactiva la influencia del WindLight en el terreno y los objetos. Los valores superiores a 1 simulan mayores distancias a las que afectan los efectos atmosféricos
 	</notification>
 	<notification name="HelpMaxAltitude">
-		La Altitud máx. ajusta hasta que altura el WindLight realiza sus cálculos para computar la iluminación atmosférica. En las últimas horas del día, es útil para ajustar la &quot;profundidad&quot; a la que aparece el Sol.
+		La Altitud máx. ajusta hasta que altura el WindLight realiza sus cálculos para computar la iluminación atmosférica. En las últimas horas del día, es útil para ajustar la &apos;profundidad&apos; a la que aparece el Sol.
 	</notification>
 	<notification name="HelpSunlightColor">
 		Ajusta en la escena la intensidad y el color de las luces directas.
@@ -2382,7 +2382,7 @@ Pero, vaya, diviértase si quiere.
 	</notification>
 	<notification name="AutoWearNewClothing">
 		¿Quiere vestirse automáticamente el ítem de ropa nueva que ha creado?
-		<usetemplate ignoretext="Vestirme automáticamente la ropa nueva" name="okcancelignore" notext="No" yestext="Sí"/>
+		<usetemplate ignoretext="Al vestirme automáticamente la ropa nueva" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="NotAgeVerified">
 		Para acceder a esta parcela, se debe haber verificado su edad.
@@ -2390,7 +2390,7 @@ Pero, vaya, diviértase si quiere.
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php
+			https://secondlife.com/account/verification.php?lang=es
 		</url>
 		<usetemplate ignoretext="Advertir de la falta de la verificación de edad" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
@@ -2663,7 +2663,7 @@ Vaya a la &apos;Help Island Public&apos; (&apos;Isla Pública de Ayuda&apos;) pa
 	<notification name="ImproperPaymentStatus">
 		No tiene el estado de pago adecuado para entrar a esta región.
 	</notification>
-	<notification name="MustGetAgeRgion">
+	<notification name="MustGetAgeRegion">
 		Debe haber verificado su edad para entrar a esta región.
 	</notification>
 	<notification name="MustGetAgeParcel">
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml
index e5fd4b3aae..68245ffb70 100644
--- a/indra/newview/skins/default/xui/es/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_general.xml
@@ -37,9 +37,9 @@ Ponga su ratón sobre las opciones para más información.
 		(los propietarios aparecen en negrilla)
 	</text>
 	<name_list name="visible_members">
-		<column label="Nombre del miembro" name="name"/>
-		<column label="Etiqueta" name="title"/>
-		<column label="Última conexión" name="online"/>
+		<column label="Nombre del miembro" name="name" relwidth="0.40"/>
+		<column label="Etiqueta" name="title" relwidth="0.25"/>
+		<column label="Última conexión" name="online" relwidth="0.35"/>
 	</name_list>
 	<text name="text_group_preferences">
 		Preferencias del grupo
@@ -47,9 +47,9 @@ Ponga su ratón sobre las opciones para más información.
 	<panel name="preferences_container">
 		<check_box label="Mostrar en la búsqueda" name="show_in_group_list" tool_tip="Dejar que la gente vea este grupo en los resultados de la búsqueda."/>
 		<check_box label="Inscripción libre" name="open_enrollement" tool_tip="Definir si se admiten al grupo nuevos miembros sin que sea preciso invitárseles."/>
-		<check_box label="Cuota de inscripción en L$" name="check_enrollment_fee" tool_tip="Define si se requiere una cuota para entrar al grupo."/>
-		<spinner name="spin_enrollment_fee" tool_tip="Cuando está marcado &apos;Cuota de inscripción&apos;, los miembros nuevos deben pagar esta cuota para entrar al grupo."/>
-		<combo_box name="group_mature_check" tool_tip="Establece si la información de su grupo es &apos;mature&apos;.">
+		<check_box label="Cuota de inscripción&#10; en L$:" name="check_enrollment_fee" tool_tip="Define si se requiere una cuota para entrar al grupo."/>
+		<spinner width="60" left_delta="130" name="spin_enrollment_fee" tool_tip="Cuando está marcado &apos;Cuota de inscripción&apos;, los miembros nuevos deben pagar esta cuota para entrar al grupo."/>
+		<combo_box bottom_delta="-38" width="150" name="group_mature_check" tool_tip="Establece si la información de su grupo es &apos;mature&apos;.">
 			<combo_item name="select_mature">
 				- Elegir Calificación -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
index 5f5f2c6e2e..f66f0c473a 100644
--- a/indra/newview/skins/default/xui/es/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Invitar a un miembro" name="invite_panel">
-	<text name="help_text">
-		Puede seleccionar a varios residentes para 
-invitarles a su grupo. Para empezar, pulse
-&apos;Abrir el selector de residentes&apos;.
+<panel label="Invitar a un miembro" name="invite_panel" width="224">
+	<text name="help_text" height="72" bottom_delta="-96" width="214">
+		Puede seleccionar a varios residentes
+para invitarles a su grupo. Para
+empezar, pulse &apos;Abrir el selector de
+residentes&apos;.
 	</text>
-	<button label="Abrir el selector de residentes" name="add_button" tool_tip=""/>
-	<name_list name="invitee_list" tool_tip="Para seleccionar a varios residentes, mantenga pulsada la tecla Ctrl y vaya pulsando sus nombres."/>
-	<button label="Eliminar de la lista a los seleccionados" name="remove_button" tool_tip="Elimina los residentes seleccionados de la lista de invitaciones."/>
+	<button bottom_delta="-10" label="Abrir el selector de residentes" name="add_button" tool_tip=""/>
+	<name_list height="156" bottom_delta="-160" name="invitee_list" tool_tip="Para seleccionar a varios residentes, mantenga pulsada la tecla Ctrl y vaya pulsando sus nombres."/>
+	<button left_delta="-7" width="214" label="Eliminar de la lista a los seleccionados" name="remove_button" tool_tip="Elimina los residentes seleccionados de la lista de invitaciones."/>
 	<text name="role_text">
 		Elegir qué rol asignarles:
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
index 32473b8133..b4ea0dbeda 100644
--- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
@@ -13,17 +13,17 @@
 	<string name="loading_txt">
 		Cargando...
 	</string>
-	<text name="group_land_heading">
+	<text name="group_land_heading" width="250">
 		Terreno propiedad del grupo
 	</text>
 	<scroll_list name="group_parcel_list">
-		<column label="Parcela" name="name"/>
-		<column label="Región" name="location"/>
-		<column label="Tipo" name="type"/>
-		<column label="Superficie" name="area"/>
+		<column label="Parcela" name="name" width="100"/>
+		<column label="Región" name="location" width="100"/>
+		<column label="Tipo" name="type" width="100"/>
+		<column label="Superficie" name="area" width="81"/>
 		<column label="" name="hidden"/>
 	</scroll_list>
-	<button label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="map_button"/>
+	<button label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="map_button" left="282" width="130"/>
 	<text name="total_contributed_land_label">
 		Contribución total:
 	</text>
@@ -52,7 +52,8 @@
 		m² ([AMOUNT] máx.)
 	</text>
 	<text name="group_over_limit_text">
-		Los miembros del grupo deben contribuir con más créditos de terreno para mantener el terreno en uso.
+		Los miembros del grupo deben contribuir con más créditos de terreno
+para mantener el terreno en uso.
 	</text>
 	<text name="group_money_heading">
 		L$ del grupo
diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml
index 8215575362..1ca673332b 100644
--- a/indra/newview/skins/default/xui/es/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Avisos" name="notices_tab">
 	<text name="help_text">
-		Los avisos son una forma rápida de comunicación dentro
-de un grupo, difundiendo un mensaje y,
-si se quiere, añadiéndole un ítem. Los avisos sólo
-los reciben los miembros del grupo cuyo rol
-tiene adjudicada tal habilidad. Puede desactivar
-los avisos en la pestaña General
+		Los avisos son una forma rápida de comunicación dentro de un grupo, difundiendo un mensaje y, si se quiere, añadiéndole un ítem. Los avisos sólo los reciben los miembros del grupo cuyo rol tiene adjudicada tal habilidad. Puede desactivar los avisos en la pestaña General.
 	</text>
 	<text name="no_notices_text">
 		No hay avisos pasados.
@@ -16,9 +11,9 @@ los avisos en la pestaña General
 		Archivo de avisos del grupo
 	</text>
 	<text name="lbl2">
-		Los avisos se mantienen durante 14 días. Pulse en la lista de abajo el que quiere ver.
-Pulse el botón &apos;Actualizar&apos; para comprobar si se han recibido avisos nuevos.
-Las listas de avisos tienen un límite de 200 avisos por día.
+		Los avisos se mantienen durante 14 días. Pulse en la lista de abajo el que 
+quiere ver. Pulse el botón &apos;Actualizar&apos; para comprobar si se han recibido avisos 
+nuevos. Las listas de avisos tienen un límite de 200 avisos por día.
 	</text>
 	<scroll_list name="notice_list">
 		<column label="Asunto" name="subject"/>
@@ -35,8 +30,8 @@ Las listas de avisos tienen un límite de 200 avisos por día.
 			Crear un aviso
 		</text>
 		<text name="lbl2">
-			Para enviar un aviso, debe escribir un asunto. Puede añadir un ítem
-al aviso arrastrándolo desde su inventario a este panel. 
+			Para enviar un aviso, debe escribir un asunto. Puede añadir un
+ítem al aviso arrastrándolo desde su inventario a este panel. 
 Los ítems anexados deben ser copiables y transferibles,
 y no se puede enviar una carpeta.
 		</text>
diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml
index 8cc1a4ba9d..2739a3da5e 100644
--- a/indra/newview/skins/default/xui/es/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml
@@ -12,7 +12,9 @@
 			Miembros y Roles
 		</text>
 		<text name="static2">
-			Los miembros del grupo tienen asignados roles con distintas capacidades. Estas configuraciones son fácilmente personalizables, para facilitar una mayor flexibilidad y organización.
+			Los miembros del grupo tienen asignados roles con distintas capacidades.
+Estas configuraciones son fácilmente personalizables, para facilitar una 
+mayor flexibilidad y organización.
 		</text>
 	</panel>
 	<panel name="roles_header">
@@ -20,12 +22,14 @@
 			Roles
 		</text>
 		<text name="role_properties_modifiable">
-			Elija un rol de los de abajo. Puede modificar su nombre, su descripción, y la etiqueta de los miembros.
+			Elija un rol de los de abajo. Puede modificar su nombre, su
+descripción, y la etiqueta de los miembros.
 		</text>
 		<text name="role_properties_not_modifiable">
-			Elija un rol de los de abajo para ver sus propiedades, miembros, y qué capacidades tiene asignadas.
+			Elija un rol de los de abajo para ver sus propiedades, miembros, y qué
+capacidades tiene asignadas.
 		</text>
-		<text name="role_actions_modifiable">
+		<text bottom_delta="-28" name="role_actions_modifiable">
 			También puede asignar capacidades al rol.
 		</text>
 		<text name="role_actions_not_modifiable">
@@ -37,29 +41,32 @@
 			Capacidades
 		</text>
 		<text name="static2">
-			Puede ver una descripción de la capacidad, y qué miembros y roles pueden realizarla.
+			Puede ver una descripción de la capacidad, y qué miembros y roles pueden
+realizarla.
 		</text>
 	</panel>
-	<tab_container name="roles_tab_container">
-		<panel label="Miembros" name="members_sub_tab" tool_tip="Miembros">
-			<button label="Buscar" name="search_button"/>
-			<button label="Verlos todos" name="show_all_button"/>
-			<name_list name="member_list">
+	<tab_container height="164" name="roles_tab_container">
+		<panel height="148" label="Miembros" name="members_sub_tab" tool_tip="Miembros">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Buscar" name="search_button" width="75"/>
+			<button label="Verlos todos" name="show_all_button" left_delta="80"/>
+			<name_list name="member_list" bottom_delta="-105" height="104" >
 				<column label="Nombre del miembro" name="name"/>
 				<column label="Cuotas donadas" name="donated"/>
 				<column label="Última conexión" name="online"/>
 			</name_list>
-			<button label="Invitar a un nuevo miembro..." name="member_invite"/>
+			<button label="Invitar a un nuevo miembro..." name="member_invite" width="175"/>
 			<button label="Expulsar del grupo" name="member_eject"/>
 			<string name="help_text">
 				Puede añadir o quitar los roles asignados a los miembros.
 Seleccione varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada uno de ellos.
 			</string>
 		</panel>
-		<panel label="Roles" name="roles_sub_tab">
-			<button label="Buscar" name="search_button"/>
-			<button label="Verlos todos" name="show_all_button"/>
-			<scroll_list name="role_list">
+		<panel height="148" label="Roles" name="roles_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Buscar" name="search_button" width="75"/>
+			<button label="Verlos todos" name="show_all_button" left_delta="80"/>
+			<scroll_list name="role_list" bottom_delta="-104" height="104">
 				<column label="Nombre del rol" name="name"/>
 				<column label="Etiqueta" name="title"/>
 				<column label="Miembros" name="members"/>
@@ -73,10 +80,11 @@ Seleccione varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada u
 				Los roles de &apos;Todos&apos; y &apos;Propietarios&apos; son especiales, y no pueden eliminarse.
 			</string>
 		</panel>
-		<panel label="Capacidades" name="actions_sub_tab">
-			<button label="Buscar" name="search_button"/>
-			<button label="Verlos todos" name="show_all_button"/>
-			<scroll_list name="action_list" tool_tip="Elija una capacidad para verla más en detalle.">
+		<panel height="148" label="Capacidades" name="actions_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Buscar" name="search_button" width="75"/>
+			<button label="Verlos todos" name="show_all_button" left_delta="80"/>
+			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Elija una capacidad para verla más en detalle.">
 				<column label="" name="icon"/>
 				<column label="" name="action"/>
 			</scroll_list>
diff --git a/indra/newview/skins/default/xui/es/panel_groups.xml b/indra/newview/skins/default/xui/es/panel_groups.xml
index 1259ded62f..232de85522 100644
--- a/indra/newview/skins/default/xui/es/panel_groups.xml
+++ b/indra/newview/skins/default/xui/es/panel_groups.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="groups">
-	<text name="groupdesc">
-		El grupo que tiene activado actualmente se muestra en negrilla
+	<scroll_list bottom="50" name="group list"/>
+	<text bottom="16" height="32" name="groupdesc" width="268">
+		El grupo que tiene activado actualmente se
+muestra en negrilla.
 	</text>
-	<text name="groupcount">
+	<text bottom="3" name="groupcount" width="268">
 		Pertenece a [COUNT] grupo/s (de un máximo de [MAX]).
 	</text>
 	<button label="MI/Llamar" name="IM" tool_tip="Abrir una sesión de mensajes instantáneos"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index 0e092e58a2..d4e6cd1aca 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat de texto" name="chat">
 	<text length="1" name="text_box" type="string">
-		Tamaño de la fuente del chat:
+		Tamaño de la fuente
+del chat:
 	</text>
 	<radio_group name="chat_font_size">
 		<radio_item name="radio">
@@ -35,7 +36,7 @@
 	</text>
 	<spinner label="Quitar el chat tras" name="fade_chat_time" label_width="95" width="145" />
 	<text length="1" name="text_box4" type="string" left="297" >
-		(s)
+		(seg.)
 	</text>
 	<text length="1" name="text_box5" type="string">
 		(# líneas)
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index 03eb802117..9ba4fbf334 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -2,13 +2,13 @@
 <panel label="Gráficos" name="Display panel">
 	<button label="?" name="GraphicsPreferencesHelpButton"/>
 	<check_box label="Abrir Second Life en una ventana" name="windowed mode"/>
-	<text_editor name="FullScreenInfo">
+	<text_editor name="FullScreenInfo" width="480">
 		Si no está marcado, el visor se mostrará en pantalla completa cuando inicie sesión.
 	</text_editor>
 	<text name="WindowSizeLabel">
 		Tamaño de la ventana:
 	</text>
-	<combo_box name="windowsize combo">
+	<combo_box left="124" name="windowsize combo">
 		<combo_item name="640x480">
 			640x480
 		</combo_item>
@@ -28,10 +28,11 @@
 	<text name="DisplayResLabel">
 		Resolución:
 	</text>
+	<combo_box left="124" name="fullscreen combo" />
 	<text name="AspectRatioLabel1" tool_tip="ancho / alto">
 		Proporción:
 	</text>
-	<combo_box name="aspect_ratio" tool_tip="ancho / alto">
+	<combo_box  left="124" name="aspect_ratio" tool_tip="ancho / alto">
 		<combo_item length="1" name="4:3(StandardCRT)" type="string">
 			4:3 (Standard CRT)
 		</combo_item>
@@ -45,14 +46,14 @@
 			16:9 (Widescreen)
 		</combo_item>
 	</combo_box>
-	<check_box label="Detectar automáticamente la proporción" name="aspect_auto_detect"/>
+	<check_box label="Detectar automáticamente &#10;la proporción" name="aspect_auto_detect" left="295" />
 	<text name="HigherText">
 		Calidad y
 	</text>
 	<text name="QualityText">
 		Rendimiento:
 	</text>
-	<text name="FasterText">
+	<text name="FasterText" left="95">
 		El más rápido
 	</text>
 	<text name="ShadersPrefText">
@@ -67,11 +68,11 @@
 	<text name="ShadersPrefText4">
 		Ultra
 	</text>
-	<text name="HigherText2">
+	<text name="HigherText2" left="325" >
 		Más alto
 	</text>
-	<text name="QualityText2">
-		Calidad
+	<text name="QualityText2" left="325" >
+		calidad
 	</text>
 	<check_box label="Personalizar" name="CustomSettings"/>
 	<text name="ShadersText">
@@ -112,16 +113,16 @@
 	</text>
 	<slider label="Distancia de dibujo:" name="DrawDistance"/>
 	<slider label="Núm. máx. de partículas:" name="MaxParticleCount"/>
-	<slider label="Calidad del procesamiento:" name="RenderPostProcess"/>
+	<slider label="Calidad del procesamiento:" name="RenderPostProcess" label_width="142"/>
 	<text name="MeshDetailText">
 		Detalle de la malla:
 	</text>
-	<slider label="Objetos:" name="ObjectMeshDetail"/>
-	<slider label="Prims flexibles:" name="FlexibleMeshDetail"/>
-	<slider label="�rboles:" name="TreeMeshDetail"/>
-	<slider label="Avatares:" name="AvatarMeshDetail"/>
-	<slider label="Terreno:" name="TerrainMeshDetail"/>
-	<slider label="Cielo:" name="SkyMeshDetail"/>
+	<slider label="  Objetos:" name="ObjectMeshDetail"/>
+	<slider label="  Prims flexibles:" name="FlexibleMeshDetail"/>
+	<slider label="  �rboles:" name="TreeMeshDetail"/>
+	<slider label="  Avatares:" name="AvatarMeshDetail"/>
+	<slider label="  Terreno:" name="TerrainMeshDetail"/>
+	<slider label="  Cielo:" name="SkyMeshDetail"/>
 	<text name="PostProcessText">
 		Baja
 	</text>
@@ -143,7 +144,7 @@
 	<text name="SkyMeshDetailText">
 		Bajo
 	</text>
-	<text name="LightingDetailText">
+	<text name="LightingDetailText" width="135">
 		Detalles de la iluminación:
 	</text>
 	<radio_group name="LightingDetailRadio">
@@ -155,9 +156,10 @@
 		</radio_item>
 	</radio_group>
 	<text name="TerrainDetailText">
-		Nivel de detalle del terreno:
+		Nivel de detalle del
+ terreno:
 	</text>
-	<radio_group name="TerrainDetailRadio">
+	<radio_group name="TerrainDetailRadio" left_delta="60">
 		<radio_item name="0">
 			Bajo
 		</radio_item>
@@ -165,8 +167,8 @@
 			Alto
 		</radio_item>
 	</radio_group>
-	<button label="Configuraciones recomendadas" name="Defaults"/>
-	<button label="Opciones del hardware" label_selected="Opciones del hardware" name="GraphicsHardwareButton"/>
+	<button label="Configuraciones recomendadas" name="Defaults" width="195" left="110"/>
+	<button label="Opciones del hardware" label_selected="Opciones del hardware" name="GraphicsHardwareButton" left="315"/>
 	<string name="resolution_format">
 		[RES_X] x [RES_Y]
 	</string>
diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
index 3f9e782bd7..220479098b 100644
--- a/indra/newview/skins/default/xui/es/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
@@ -22,14 +22,15 @@
 		Última modificación el miér. 31 de dic. de 1969, 16:00:00
 	</text>
 	<button label="?" name="covenant_help"/>
-	<text_editor name="covenant_editor">
+	<text_editor name="covenant_editor" bottom="-263" height="178" >
 		No se ha aportado un contrato para este estado.
 	</text_editor>
 	<button label="Cambiar" name="reset_covenant"/>
 	<text name="covenant_help_text">
-		Los cambios en el contrato se mostrarán en todas las parcelas del estado.
+		Los cambios en el contrato se mostrarán en todas las parcelas
+      del estado.
 	</text>
-	<text name="covenant_instructions">
+	<text name="covenant_instructions" bottom_delta="-31" >
 		Para cambiar el contrato de este estado, arrastre y suelte una nota.
 	</text>
 	<text name="region_section_lbl">
@@ -75,6 +76,7 @@
 		El terreno comprado en esta región se podrá unir o subdividir.
 	</string>
 	<string name="can_not_change">
-		El terreno comprado en esta región no se podrá unir ni subdividir.
+		El terreno comprado en esta región no se podrá unir ni
+subdividir.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml
index a722235243..a7999cc54d 100644
--- a/indra/newview/skins/default/xui/es/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_debug.xml
@@ -7,13 +7,13 @@
 		desconocida
 	</text>
 	<check_box label="Desactivar los scripts" name="disable_scripts_check" tool_tip="Descativar todos los scripts en esta región"/>
-	<button label="?" name="disable_scripts_help"/>
+	<button label="?" name="disable_scripts_help" left="215"/>
 	<check_box label="Desactivar las colisiones" name="disable_collisions_check" tool_tip="Desactiva las colisiones (no las de avatares) en esta región"/>
-	<button label="?" name="disable_collisions_help"/>
+	<button label="?" name="disable_collisions_help" left="215"/>
 	<check_box label="Desactivar las propiedades físicas" name="disable_physics_check" tool_tip="Desactiva toda la física en esta región"/>
-	<button label="?" name="disable_physics_help"/>
+	<button label="?" name="disable_physics_help" left="215"/>
 	<button label="Aplicar" name="apply_btn"/>
-	<text name="objret_text_lbl">
+	<text name="objret_text_lbl" width="130">
 		Devolver el objeto
 	</text>
 	<text name="resident_text_lbl">
@@ -30,10 +30,10 @@
 	<check_box label="Devolver sólo los objetos que están en terreno de otro" name="return_other_land" tool_tip="Devolver sólo los objetos que están en terreno de otro"/>
 	<check_box label="Devolver los objetos de cualquier región de este estado" name="return_estate_wide" tool_tip="Devolver los objetos de todas las regiones que forman este estado"/>
 	<button label="Devolver" name="return_btn"/>
-	<button label="Listar los objetos que colisionan..." name="top_colliders_btn" tool_tip="Lista de los objetos con más posibles colisiones potenciales"/>
-	<button label="?" name="top_colliders_help"/>
-	<button label="Listar los scripts según su uso..." name="top_scripts_btn" tool_tip="Lista de los objetos que más tiempo emplean ejecutando scripts"/>
-	<button label="?" name="top_scripts_help"/>
+	<button width="280" label="Listar los objetos que colisionan..." name="top_colliders_btn" tool_tip="Lista de los objetos con más posibles colisiones potenciales"/>
+	<button label="?" name="top_colliders_help" left="297"/>
+	<button width="280" label="Listar los scripts según su uso..." name="top_scripts_btn" tool_tip="Lista de los objetos que más tiempo emplean ejecutando scripts"/>
+	<button label="?" name="top_scripts_help" left="297"/>
 	<button label="Reiniciar la región" name="restart_btn" tool_tip="Cuenta atrás de 2 minutos y reiniciar la región"/>
 	<button label="?" name="restart_help"/>
 	<button label="Retrasar el reinicio" name="cancel_restart_btn" tool_tip="Retrasar una hora el reinicio de la región"/>
diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
index 93155d828d..f16ec89cb0 100644
--- a/indra/newview/skins/default/xui/es/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Estado" name="Estate">
 	<text name="estate_help_text">
-		Los cambios en las configuraciones de esta pestaña afectarán a todas
-las regiones de este estado.
+		Los cambios en las configuraciones de esta 
+pestaña afectarán a todas las regiones del estado.
 	</text>
 	<text name="estate_text">
 		Estado:
@@ -24,16 +24,16 @@ las regiones de este estado.
 	<check_box label="Permitir el acceso público" name="externally_visible_check"/>
 	<button label="?" name="externally_visible_help"/>
 	<text name="Only Allow">
-		Impedir el acceso a:
+		Impedir el acceso a Residentes...
 	</text>
-	<check_box label="Residentes sin información de pago archivada" name="limit_payment" tool_tip="Impedir el acceso a los residentes no identificados."/>
-	<check_box label="Residentes de los que no se ha verificado si son adultos" name="limit_age_verified" tool_tip="Impedir el acceso a residentes que no hayan verificado su edad. Para más información, vea  support.secondlife.com"/>
+	<check_box label="sin información de pago archivada" name="limit_payment" tool_tip="Impedir el acceso a los residentes no identificados."/>
+	<check_box label="que no han verificado si son adultos" name="limit_age_verified" tool_tip="Impedir el acceso a residentes que no hayan verificado su edad. Para más información, vea  support.secondlife.com"/>
 	<check_box label="Permitir el chat de voz" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/>
 	<button label="?" name="allow_direct_teleport_help"/>
-	<text name="abuse_email_text">
-		Dirección de correo electrónico para infracciones:
+	<text name="abuse_email_text" width="260">
+		Dirección de correo-e para infracciones:
 	</text>
 	<string name="email_unsupported">
 		Característica no disponible
@@ -63,7 +63,7 @@ las regiones de este estado.
 	<text name="ban_resident_label">
 		Residentes con el acceso prohibido:
 	</text>
-	<button label="?" name="ban_resident_help"/>
+	<button label="?" name="ban_resident_help" right="476"/>
 	<button label="Quitar..." name="remove_banned_avatar_btn"/>
 	<button label="Añadir..." name="add_banned_avatar_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
index 64169e427b..155161489e 100644
--- a/indra/newview/skins/default/xui/es/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general.xml
@@ -30,11 +30,11 @@
 	<button label="?" name="land_resell_help"/>
 	<check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/>
 	<button label="?" name="parcel_changes_help"/>
-	<check_box label="Bloquear el mostrar el terreno en la búsqueda." name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/>
+	<check_box label="Bloquear el mostrar el terreno en &#10;la búsqueda." name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/>
 	<button label="?" name="parcel_search_help"/>
-	<spinner label="Nº máximo de avatares" name="agent_limit_spin"/>
+	<spinner label="Nº máximo de avatares" name="agent_limit_spin" label_width="120" width="180"/>
 	<button label="?" name="agent_limit_help"/>
-	<spinner label="Plus de objetos" name="object_bonus_spin"/>
+	<spinner label="Plus de objetos" name="object_bonus_spin" label_width="120" width="180"/>
 	<button label="?" name="object_bonus_help"/>
 	<text label="Calificación" name="access_text">
 		Calificación:
@@ -54,6 +54,6 @@
 	<button label="Aplicar" name="apply_btn"/>
 	<button label="Teleportar a su Base a un usuario..." name="kick_btn"/>
 	<button label="Teleportar a su Base a todos los usuarios..." name="kick_all_btn"/>
-	<button label="Enviar un mensaje a toda la región..." name="im_btn"/>
-	<button label="Administrar el Punto de Teleporte..." name="manage_telehub_btn"/>
+	<button label="Enviar un mensaje a toda la región..." name="im_btn" width="250" />
+	<button label="Administrar el Punto de Teleporte..." name="manage_telehub_btn" width="210"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
index df333c0c5e..903b826a0b 100644
--- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
@@ -8,9 +8,9 @@
 	</text>
 	<spinner label="Nivel del agua" name="water_height_spin"/>
 	<button label="?" name="water_height_help"/>
-	<spinner label="Límite de elevación del terreno" name="terrain_raise_spin"/>
+	<spinner label="Límite de elevación del &#10;terreno" name="terrain_raise_spin"/>
 	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Límite de bajada del terreno" name="terrain_lower_spin"/>
+	<spinner label="Límite de bajada del &#10;terreno" name="terrain_lower_spin" bottom_delta="-34"/>
 	<button label="?" name="terrain_lower_help"/>
 	<check_box label="Usar el Sol del estado" name="use_estate_sun_check"/>
 	<button label="?" name="use_estate_sun_help"/>
@@ -18,10 +18,10 @@
 	<button label="?" name="fixed_sun_help"/>
 	<slider label="Fase" name="sun_hour_slider"/>
 	<button label="Aplicar" name="apply_btn"/>
-	<button label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
-	<button label="?" name="download_raw_help"/>
-	<button label="Subir un RAW para el terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
-	<button label="?" name="upload_raw_help"/>
-	<button label="Predeterminar este terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los límites de elevación/bajada"/>
-	<button label="?" name="bake_terrain_help"/>
+	<button width="230" label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
+	<button left="246" label="?" name="download_raw_help"/>
+	<button width="230" label="Subir un RAW para el terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
+	<button left="246" label="?" name="upload_raw_help"/>
+	<button width="230" label="Predeterminar este terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los límites de elevación/bajada"/>
+	<button left="246" label="?" name="bake_terrain_help"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml
index d7f42ac41c..5540358f97 100644
--- a/indra/newview/skins/default/xui/es/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml
@@ -6,7 +6,7 @@
 	<text name="region_text">
 		desconocida
 	</text>
-	<text name="detail_texture_text">
+	<text name="detail_texture_text" width="380">
 		Texturas del terreno (se requieren archivos .tga de 512x512 y 24 bites)
 	</text>
 	<text name="height_text_lbl">
diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml
index 1e10ccf992..6da277e93e 100644
--- a/indra/newview/skins/default/xui/es/role_actions.xml
+++ b/indra/newview/skins/default/xui/es/role_actions.xml
@@ -1,186 +1,199 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <role_actions>
 	<action_set
-	     description="Estas habilidades incluyen poderes de adicionar o remover miembros del grupo y permitir que nuevos miembros se junten sin una invitación."
+	     description="Estas capacidades incluyen poderes para añadir o quitar miembros del grupo, y para pemitir que se sumen nuevos miembros sin necesidad de invitación."
 	     name="Membership">
-		<action description="Invitar personas para este grupo"
-		     longdescription="Invite personas para este grupo usando el botón &apos;Invitar nueva persona...&apos; en Miembros &amp; pestaña Funciones &gt; subpestaña Miembros."
+		<action description="Invitar personas al grupo"
+		     longdescription="Invitar a personas al grupo usando el botón &apos;Invitar a un nuevo miembro&apos; en Miembros y Roles &gt; subpestaña Miembros."
 		     name="member invite" value="1" />
-		<action description="Expulsar a miembros de este grupo"
-		     longdescription="Expulse a miembros de este grupo usando el botón &apos;Expulsar del grupo&apos; en Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. Un propietario puede expulsar a cualquiera, excepto a otro propietario. Si usted no es un propietario, un miembro puede a expulsarlo del grupo si, y solamente si, él apenas tiene la función de todos y no otras funciones. Para remover miembros de funciones, necesita tener la habilidad &apos;Remover miembros de funciones&apos;."
+		<action description="Expulsar a miembros del grupo"
+		     longdescription="Expulsar a miembros del grupo usando el botón &apos;Expulsar del grupo&apos; en Miembros y Roles &gt; subpestaña Miembros. Un propietario puede expulsar a cualquiera, excepto a otro propietario. Si usted no es un propietario, un miembro del grupo puede expulsarle sólo si tiene concedida tal capacidad específica. Para quitar capacidades a los miembros, usted debe tener la de &apos;Quitar capacidades a miembros&apos;."
 		     name="member eject"  value="2" />
 		<action
-		     description="Activar/desactivar &apos;Abrir registro&apos; y cambiar &apos;Tasa de suscripción&apos;"
-		     longdescription="Active/desactive &apos;Abrir registro&apos; para permitir que nuevos miembros se unan sin una invitación, y cambie &apos;Tasa de registro&apos; en la sección Preferencia de grupo de la pestaña General."
+		     description="Activar/desactivar &apos;Inscripción libre&apos; y cambiar &apos;Cuota de inscripción&apos;"
+		     longdescription="Activar/desactivar &apos;Inscripción libre&apos; para permitir o no que se unan sin invitación nuevos miembros, y cambiar la &apos;Cuota de inscripción&apos; en la sección Preferencias del grupo de la pestaña General."
 		     name="member options"  value="3" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes de adicionar, remover y cambiar funciones del grupo; adicionar y remover miembros en funciones y designar habilidades a funciones."
+	     description="Estas habilidades incluyen el poder añadir, quitar y cambiar roles, asignarlos a  miembros, y darles capacidades."
 	     name="Roles">
-		<action description="Crear nuevas funciones"
-		     longdescription="Cree nuevas funciones en Miembros &amp; pestaña Funciones &gt; subpestaña Funciones."
+		<action description="Crear nuevos roles"
+		     longdescription="Crear nuevos roles en Miembros y Roles &gt; pestaña Roles &gt; botón Crear un rol nuevo."
 		     name="role create" value="4" />
-		<action description="Borrar funciones"
-		     longdescription="Borra funciones en Miembros &amp; pestaña Funciones &gt; subpestaña Funciones."
+		<action description="Borrar roles"
+		     longdescription="Borrar roles en Miembros y Roles &gt; pestaña Roles &gt; botón Eliminar el rol."
 		     name="role delete" value="5" />
-		<action description="Cambiar nombres de funciones, títulos y descripciones"
-		     longdescription="Cambie el nombre de funciones, títulos y descripciones en la parte inferior de Miembros &amp; pestaña Funciones &gt; subpestaña Funciones después de seleccionar una función."
+		<action description="Cambiar nombres de roles, títulos y descripciones"
+		     longdescription="Cambiar el nombre del rol que elija, su etiqueta y descripción en la parte media de la pestaña Miembros y Roles."
 		     name="role properties" value="6" />
-		<action description="Designar miembros para la función&apos;s del asignador"
-		     longdescription="Designe miembros para funciones en la sección de funciones designadas de Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. Un miembro con este poder puede solamente adicionar miembros para la función que el asignador ya posee."
+		<action description="Designar miembros para el rol del asignador"
+		     longdescription="Designar miembros para un rol en la sección Roles asignados de la pestaña Miembros y Roles &gt; subpestaña Miembros. Un miembro con este poder sólo puede asignar a otros el rol que él posee."
 		     name="role assign member limited" value="7" />
-		<action description="Designar miembros para cualquier función"
-		     longdescription="Designe miembros para cualquier función en la sección de funciones designadas de Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. *AVISO* Cualesquiera miembros en una función con esta habilidad pueden designar a sí propios--y cualesquiera otros miembros no propietarios--para funciones que tienen más poderes que las actuales, promocionándolos a poderes próximos al del propietario. Asegúrese de saber lo que está haciendo antes de designar esta habilidad."
+		<action description="Designar miembros para cualquier rol"
+		     longdescription="Designar miembros para cualquier rol en la sección Roles asignados de la pestaña Miembros y Roles &gt; subpestaña Miembros. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sí mismos -y a otros miembros- roles con mayores poderes de los que actualmente tienen. Potencialmente, podrían elevarse hasta poderes cercanos a los del propietario. Asegúrese de lo que está haciendo antes de otorgar esta capacidad."
 		     name="role assign member" value="8" />
-		<action description="Remover miembros de las funciones"
-		     longdescription="Remueva miembros de funciones en la sección de funciones designadas de Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. Propietarios no pueden&apos; ser removidos."
+		<action description="Quitar capacidades a los miembros"
+		     longdescription="Quitar capacidades a los miembros en la sección Capacidades asignadas de Miembros y Roles &gt; subpestaña Roles. No se pueden quitar a los Propietarios."
 		     name="role remove member" value="9" />
-		<action description="Determinar y remover habilidades en función"
-		     longdescription="Designe y remueva habilidades en funciones en la sección habilidades permitidas de Miembros &amp; pestaña Funciones &gt; subpestaña Funciones. *AVISO* Cualesquiera miembros en una función con esta habilidad pueden designar a sí propios--y cualesquiera otros miembros no propietarios--todas las habilidades, promocionándolos a poderes próximos al del propietario. Asegúrese de saber lo que está haciendo antes de designar esta habilidad."
+		<action description="Añadir o quitar capacidades a los roles"
+		     longdescription="Añadir o quitar capacidades a los roles en la sección Capacidades asignadas de Miembros y Roles &gt; subpestaña Roles. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sí mismos -y a otros miembros- roles con mayores poderes de los que actualmente tienen. Potencialmente, podrían elevarse hasta poderes cercanos a los del propietario. Asegúrese de lo que está haciendo antes de otorgar esta capacidad."
 		     name="role change actions" value="10" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes para modificar esta identidad de grupo, como cambiar la visibilidad pública, presentación y insignia."
+	     description="Estas capacidades incluyen poderes para modificar la identidad del grupo, como su visibilidad pública, su carta o su emblema."
 	     name="Group Identity">
 		<action
-		     description="Cambiar presentación, insignia, &apos;Publicar en la web&apos;, y cuales miembros están públicamente visibles en Informaciones del Grupo."
-		     longdescription="Cambie la presentación, insignia, &apos;Publicar en la web&apos; y cuales miembros están públicamente visibles en  Informaciones del grupo. Es hecho en la pestaña General."
+		     description="Cambiar la carta, emblema, &apos;Mostrar en la búsqueda&apos;, y qué miembros serán visibles en la información del grupo"
+		     longdescription="Cambiar la carta, emblema, &apos;Mostrar en la búsqueda&apos;, y qué miembros serán visibles en la información del grupo de la pestaña General."
 		     name="group change identity" value="11" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes para transferir, modificar y vender terrenos del grupo. Vaya para la ventana Sobre el terreno, haga clic con el botón derecho en el terreno y seleccione &apos;Sobre el terreno...&apos; o haga clic en la información de la parcela en la barra del menú."
+	     description="Estas capacidades incluyen poderes para transferir, modificar y vender terrenos del grupo. Vea el menú Mundo &gt; Acerca del terreno, o pulse con el botón derecho en el terreno y seleccione &apos;Acerca del terreno...&apos;, o pulse en la información de la parcela en la barra superior del menú."
 	     name="Parcel Management">
 		<action description="Transferir  y comprar terreno para el grupo"
-		     longdescription="Transfiere y compre terreno para el grupo. Es hecho en Sobre el terreno &gt; pestaña General."
+		     longdescription="Transferir y comprar terreno para el grupo. Se hace en Acerca del terreno &gt; pestaña General."
 		     name="land deed" value="12" />
-		<action description="Abandonar al terreno para Gobernador Linden"
-		     longdescription="Abandone al terreno para Gobernador Linden. *AVISO* Cualquier miembro en una función con esta habilidad puede  abandonar al terreno perteneciente al grupo en Sobre el terreno &gt; pestaña General, revirtiendo a la posesión Linden sin una venta! Asegúrese de saber lo que está haciendo antes de designar esta habilidad."
+		<action description="Abandonar al terreno a favor de Governor Linden"
+		     longdescription="Abandonar al terreno a favor de Governor Linden. *AVISO* Todos los miembros con esta capacidad pueden abandonar terreno perteneciente al grupo en Acerca del terreno &gt; pestaña General, devolviendo la posesión a Linden ¡gratuitamente! Asegúrese de lo que está haciendo antes de otorgar esta capacidad."
 		     name="land release" value="13" />
-		<action description="Definir terreno para información de venta"
-		     longdescription="Defina informaciones de venta para terreno. *AVISO* Cualquier miembro en una función con esta habilidad puede vender terrenos pertenecientes al grupo en Sobre el terreno &gt; pestaña General ¡cómo quiera! Asegúrese de saber lo que está haciendo antes de designar esta habilidad."
+		<action description="Vender terreno"
+		     longdescription="Vender terreno. *AVISO* Todos los miembros con esta capacidad pueden vender terreno perteneciente al grupo -¡en la forma en que quieran!- en Acerca del terreno &gt; pestaña General. Asegúrese de lo que está haciendo antes de otorgar esta capacidad."
 		     name="land set sale info" value="14" />
-		<action description="Subdividir y unir parcelas"
-		     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
+		<action description="Dividir y unir parcelas"
+		     longdescription="Dividir y unir parcelas. Se hace pulsando con el botón derecho en el terreno, &apos;Modificar el terreno&apos;, y dibujando en el terreno con el ratón lo que se quiere seleccionar. Para dividir, elija la parte que quiere separar y pulse &apos;Subdividir...&apos;. Para unir, seleccione dos o más parcelas contiguas y pulse &apos;Unir...&apos;. "
 		     name="land divide join" value="15" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes para cambiar el nombre de las parcelas y configuraciones de publicación, visibilidad de la búsqueda de directorio y punto de aterrizaje &amp; opciones de ruta de TP."
+	     description="Estas capacidades incluyen poder cambiar el nombre de la parcela y su configuración, así como si se muestra en Buscar y las opciones del punto de llegada y el de teleporte."
 	     name="Parcel Identity">
 		<action
-		     description="Activar/desactivar &apos;Exhibir en locales de encuentro&apos; y definir categoría"
-		     longdescription="Activar/desactivar &apos;Exhibir en locales de encuentro&apos; y configurar una categoría de parcela en Sobre el terreno &gt; pestaña Opciones."
+		     description="Activar/desactivar &apos;Mostrar en Buscar&apos; y el definir la categoría"
+		     longdescription="Activar/desactivar el &apos;Mostrar en Buscar&apos; y en que categoría se mostrará en Acerca del terreno &gt; pestaña Opciones."
 		     name="land find places" value="17" />
 		<action
-		     description="Cambiar nombre de la parcela, descripción, y configuraciones &apos;Publicar en la web&apos;"
-		     longdescription="Cambie el nombre de la parcela, descripción y configuraciones de &apos;Publicar en la web&apos;. Es hecho en Sobre el terreno &gt; pestaña Opciones."
+		     description="Cambiar el nombre de la parcela, la descripción, y la configuración de &apos;Mostrar en Buscar&apos;"
+		     longdescription="Cambiar el nombre y descripción de la parcela, y la configuración de &apos;Mostrar en Buscar&apos;. Se hace en Acerca del terreno &gt; pestaña Opciones."
 		     name="land change identity" value="18" />
-		<action description="Definir punto de aterrizaje y ruta de teletransporte"
-		     longdescription="En una parcela perteneciente al grupo, miembros en una función con esta habilidad pueden definir un punto de aterrizaje para especificar donde los teletransportes llegan y también definir la ruta del teletransporte para un mayor control. Es hecho en Sobre el terreno &gt; pestaña Opciones."
+		<action description="Definir los puntos de llegada y teleporte"
+		     longdescription="En una parcela perteneciente al grupo, los miembros con un rol que tenga esta capacidad pueden precisar el punto de llegada o el de teleporte. Se hace en Acerca del terreno &gt; pestaña Opciones."
 		     name="land set landing point" value="19" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes que afectan opciones de parcela, como &apos;Crear objetos&apos;, &apos;Editar terreno&apos; y música &amp; configuraciones de multimedia."
+	     description="Estas capacidades incluyen poderes que afectan a las opciones de la parcela, como &apos;Crear objetos&apos;, &apos;Editar el terreno&apos; y las configuraciones de la música y los media."
 	     name="Parcel Settings">
-		<action description="Cambiar música &amp; configuraciones de multimedia"
-		     longdescription="Cambie streaming de música y configuraciones de vídeo en Sobre el terreno &gt; pestaña Multimedia."
+		<action description="Cambiar música y configuraciones de los media"
+		     longdescription="Cambiar la música en streaming y las configuraciones de vídeo en Acerca del terreno &gt; pestaña Media."
 		     name="land change media" value="20" />
-		<action description="Activar/desactivar &apos;Editar terreno&apos;"
-		     longdescription="Active/desactive &apos;Editar terreno&apos;. *AVISO* Sobre el terreno &gt; pestaña Opciones &gt; Editar terreno permite a cualquiera alterar las formas de su terreno&apos;, sustituir y mover plantas Linden. Asegúrese de saber lo que está haciendo antes de designar esta habilidad. La edición de terreno es activada/desactivada en Sobre el terreno &gt; pestaña Opciones."
+		<action description="Activar/desactivar &apos;Editar el terreno&apos;"
+		     longdescription="Activar/desactivar &apos;Editar el terreno&apos;. *AVISO* Acerca del terreno &gt; pestaña Opciones &gt; Editar el terreno, permite a cualquiera alterar la forma de su terreno y sustituir y mover plantas Linden. Asegúrese de lo que está haciendo antes de otorgar esta capacidad. La edición del terreno se activada/desactiva en Acerca del terreno &gt; pestaña Opciones."
 		     name="land edit" value="21" />
 		<action
-		     description="Activar/desactivar variados Sobre el Terreno &gt; Opciones de configuraciones"
-		     longdescription="Active/desactive &apos;Seguro (sin daño)&apos;, &apos;Volar&apos;, y permita a otros residentes: &apos;Crear objetos&apos;, &apos;Editar terreno&apos;, &apos;Crear puntos de referencia&apos;, y &apos;Ejecutar scripts&apos; en un terreno perteneciente al grupo en Sobre el terreno &gt; pestaña Opciones."
+		     description="Activar/desactivar varios ítems de Acerca del terreno &gt; Opciones"
+		     longdescription="Activar/desactivar en un terreno del grupo los ítems de Acerca del terreno &gt; pestaña Opciones: &apos;Seguro (sin daño)&apos;, &apos;Volar&apos;, y permitir a otros residentes: &apos;Crear objetos&apos;, &apos;Editar el terreno&apos;, &apos;Crear hitos&apos;, y &apos;Ejecutar scripts&apos;."
 		     name="land options" value="22" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes que permiten a miembros rebasar restricciones en parcelas pertenecientes al grupo."
+	     description="Estas capacidades incluyen poderes que permiten a los miembros rebasar las restricciones de parcelas pertenecientes al grupo."
 	     name="Parcel Powers">
-		<action description="Siempre permitir &apos;Editar terreno&apos;"
-		     longdescription="Miembros en una función con esta habilidad pueden editar terreno en una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."
+		<action description="Permitir siempre &apos;Editar el terreno&apos;"
+		     longdescription="Quien tenga un rol con esta capacidad puede editar el terreno de una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones."
 		     name="land allow edit land" value="23" />
-		<action description="Siempre permitir &apos;Volar&apos;"
-		     longdescription="Miembros en una función con esta habilidad pueden volar sobre una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."
+		<action description="Permitir siempre &apos;Volar&apos;"
+		     longdescription="Quien tenga un rol con esta capacidad puede volar sobre una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones."
 		     name="land allow fly" value="24" />
-		<action description="Siempre permitir &apos;Crear objetos&apos;"
-		     longdescription="Miembros en una función con esta habilidad pueden crear objetos en una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."
+		<action description="Permitir siempre &apos;Crear objetos&apos;"
+		     longdescription="Quien tenga un rol con esta capacidad puede crear objetos en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones."
 		     name="land allow create" value="25" />
-		<action description="Siempre permitir &apos;Crear punto de referencia&apos;"
-		     longdescription="Miembros en una función con esta habilidad pueden poner un punto de referencia en una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."
+		<action description="Permitir siempre &apos;Crear hitos&apos;"
+		     longdescription="Quien tenga un rol con esta capacidad puede crear un hito en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones."
 		     name="land allow landmark" value="26" />
-		<action description="Permitir &apos;Colocar casa aquí&apos; en el terreno del grupo"
-		     longdescription="Miembros en una función con esta habilidad pueden usar el menú Mundo &gt; Definir hogar aquí en una parcela del grupo (definir terreno o transferir para este grupo)."
+		<action description="Permitir &apos;Fijar mi Base aquí&apos; en el terreno del grupo"
+		     longdescription="Quien tenga un rol con esta capacidad puede usar el menú Mundo &gt; Fijar mi Base aquí en una parcela transferida al grupo."
 		     name="land allow set home" value="28" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes de permitir o restringir acceso a parcelas pertenecientes al grupo, incluyendo congelar y expulsar a residentes."
+	     description="Estas capacidades incluyen poderes para permitir o restringir el acceso a parcelas pertenecientes al grupo, incluyendo el congelar y expulsar a residentes."
 	     name="Parcel Access">
-		<action description="Administrar listas de acceso a la parcela"
-		     longdescription="Administre la lista de acceso a la parcela en Sobre el terreno &gt; pestaña Acceso."
+		<action description="Administrar las listas de acceso a la parcela"
+		     longdescription="Administre las listas de acceso a la parcela en Acerca del terreno &gt; pestaña Acceso."
 		     name="land manage allowed" value="29" />
-		<action description="Administrar lista de desterrados de la parcela"
-		     longdescription="Administre la lista de desterrados de la parcela en Sobre el terreno &gt; pestaña Desterrado."
+		<action description="Administrar la lista de residentes con el acceso prohibido"
+		     longdescription="Administrar la lista de residentes con el acceso prohibido a la parcela en Acerca del terreno &gt; pestaña Acceso."
 		     name="land manage banned" value="30" />
-		<action description="Cambiar configuraciones de parcela &apos;Vender pases...&apos;"
-		     longdescription="Cambie configuraciones de &apos;Vender pases...&apos; en Sobre el terreno &gt; pestaña Acceso."
+		<action description="Cambiar en las configuraciones de parcela el &apos;Vender pases a...&apos;"
+		     longdescription="Cambiar la configuración de &apos;Vender pases a...&apos; en Acerca del terreno &gt; pestaña Acceso."
 		     name="land manage passes" value="31" />
 		<action description="Expulsar y congelar residentes en las parcelas"
-		     longdescription="Miembros en una función con esta habilidad pueden lidiar con un residente indeseado en una parcela perteneciente al grupo haciendo clic con el botón derecho sobre él, Más &gt; y seleccionando &apos;Expulsar...&apos; o &apos;Congelar...&apos;."
+		     longdescription="Quien tenga un rol con esta capacidad puede actuar frente a un residente indeseado en una parcela del grupo pulsando con el botón derecho sobre él, Más &gt; y seleccionando &apos;Expulsar...&apos; o &apos;Congelar...&apos;."
 		     name="land admin" value="32" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes de permitir a miembros devolver objetos y poner y mover plantas Linden. Útil para que miembros organicen el paisaje, pero debe ser usado con cuidado, debido a no ser posible deshacer la mudanza de los objetos."
+	     description="Estas capacidades incluyen poderes que permitan a los miembros devolver objetos y poner y mover plantas Linden. Es útil para que miembros organicen el paisaje, pero debe ser usado con cuidado, ya que no se pueden deshacer esos cambios en los objetos."
 	     name="Parcel Content">
 		<action description="Devolver objetos que pertenecen al grupo"
-		     longdescription="Devuelva objetos en parcelas pertenecientes al grupo que pertenecen al grupo en Sobre el terreno &gt; pestaña Objetos."
+		     longdescription="Devolver objetos pertenecientes al grupo en parcelas de su propiedad en Acerca del terreno &gt; pestaña Objetos."
 		     name="land return group owned" value="48" />
 		<action description="Devolver objetos definidos para el grupo"
-		     longdescription="Devuelva objetos en parcelas pertenecientes al grupo en Sobre el terreno &gt; pestaña Objetos."
+		     longdescription="Devuelva objetos en parcelas pertenecientes al grupo en Acerca del terreno &gt; pestaña Objetos."
 		     name="land return group set" value="33" />
 		<action description="Devolver objetos que no pertenecen al grupo"
-		     longdescription="Devuelva objetos en las parcelas pertenecientes a un grupo que está sin grupo en el Sobre el terreno &gt; pestaña Objetos."
+		     longdescription="Devuolver objetos que estén en una parcela del grupo y pertenezcan a alguien que no sea del grupo en Acerca del terreno &gt; pestaña Objetos."
 		     name="land return non group" value="34" />
-		<action description="Enjardinar usando plantas Linden"
-		     longdescription="La habilidad de enjardinar permite poner y mover árboles Linden, plantas y céspedes. Estos ítems pueden ser encontrados en la&apos;s Biblioteca de su inventario &gt; carpeta Objetos o pueden ser criados a través del botón Construir."
+		<action description="Modificar el paisaje usando plantas Linden"
+		     longdescription="La capacidad de modificar el paisaje permite poner y mover árboles Linden, plantas y arbustos. Estos ítems están en la &apos;s Biblioteca de su Inventario &gt; carpeta Objetos, o pueden crearse con el botón Construir."
 		     name="land gardening" value="35" />
 	</action_set>
 	<action_set
-	     description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "
+	     description="Estas capacidades incluyen poderes para tranferir, modificar y vender objetos pertenecientes al grupo. Estos cambios se hacen en la pestaña General de la herramienta de edición. Para verlo, pulse en un objeto con el botón derecho y elija Editar. "
 	     name="Object Management">
-		<action description="Transferir objetos para el grupo"
-		     longdescription="Transfiere objetos para el grupo en Editar herramientas &gt; pestaña General."
+		<action description="Transferir objetos al grupo"
+		     longdescription="Transferir objetos al grupo en Editar &gt; pestaña General."
 		     name="object deed" value="36" />
-		<action description="Manipular (mover, copiar, modificar) objetos del grupo"
-		     longdescription="Manipule (mover,copiar, modificar) objetos pertenecientes al grupo en Editar Herramientas &gt; pestaña General."
+		<action description="Manipular (mover, copiar, y modificar) objetos del grupo"
+		     longdescription="Manipular (mover, copiar, y modificar) objetos pertenecientes al grupo en Editar &gt; pestaña General."
 		     name="object manipulate" value="38" />
-		<action description="Definir objetos pertenecientes al grupo para venta"
-		     longdescription="Defina objetos pertenecientes al grupo para venta en Editar Herramientas &gt; pestaña General."
+		<action description="Vender objetos pertenecientes al grupo"
+		     longdescription="Poner a la venta objetos pertenecientes al grupo para venta en Editar &gt; pestaña General."
 		     name="object set sale" value="39" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes que requieren que miembros paguen deudas y reciban dividendos del grupo, y  restringen acceso al historial de cuenta del grupo."
+	     description="Estas habilidades incluyen poderes para que los miembros paguen deudas del grupo o reciban sus dividendos, y para limitar el acceso al historial de la cuenta del grupo."
 	     name="Accounting">
-		<action description="Pagar débitos y reciber dividendos del grupo"
-		     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
+		<action description="Pagar deudas y recibir dividendos del grupo"
+		     longdescription="Quien tenga un rol con esta capacidad, automáticamente pagará deudas del grupo y recibirá sus dividendos. Esto significa que recibirá una parte de las ventas de terreno de grupo, y que contribuirá a cosas como, por ejemplo, las cuotas por posesión de terreno. "
 		     name="accounting accountable" value="40" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes de permitir enviar, recibir y ver avisos de grupo."
+	     description="Estas habilidades incluyen poderes para enviar, recibir y ver avisos de grupo."
 	     name="Notices">
 		<action description="Enviar aviso"
-		     longdescription="Miembros en una función con esta habilidad pueden enviar avisos en Informaciones de grupo &gt; pestaña Avisos."
+		     longdescription="Quien tenga un rol con esta capacidad puede enviar avisos en Información del grupo &gt; pestaña Avisos."
 		     name="notices send" value="42" />
-		<action description="Reciber nuevos avisos y ver los anteriores"
-		     longdescription="Miembros en una función con esta habilidad pueden recibir los nuevos avisos y ver los anteriores en Informaciones de grupo &gt; pestaña Avisos."
+		<action description="Recibir avisos nuevos y ver los anteriores"
+		     longdescription="Quien tenga un rol con esta capacidad puede recibir los avisos nuevos, y ver los anteriores en Información del grupo &gt; pestaña Avisos."
 		     name="notices receive" value="43" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes de permitir a miembros definir y votar en propuestas y ver historial de votación."
+	     description="Estas habilidades incluyen poderes para permitir a los miembros crear propuestas, votarlas, y ver el historial de votaciones."
 	     name="Proposals">
-		<action description="Crear propuesta"
-		     longdescription="Miembros en una función con esta habilidad pueden crear propuestas para que sean votadas en Informaciones de grupo &gt; pestaña Propuestas."
+		<action description="Hacer una propuesta"
+		     longdescription="Quien tenga un rol con esta capacidad puede crear propuestas para que sean votadas en Información del grupo &gt; pestaña Propuestas."
 		     name="proposal start" value="44" />
 		<action description="Votar en propuestas"
-		     longdescription="Miembros en una función con esta habilidad pueden votar en propuestas en Informaciones de grupo &gt; pestaña Propuestas."
+		     longdescription="Quien tenga un rol con esta capacidad puede votar las propuestas en Información del grupo &gt; pestaña Propuestas."
 		     name="proposal vote" value="45" />
 	</action_set>
+	<action_set
+	     description="Estas capacidades incluyen poderes para permitir o no el aceso a las sesiones de chat del grupo y al chat de voz del mismo." 
+	     name="Chat">
+		<action description="Abrir chat de grupo"
+		     longdescription="Quien tenga un rol con esta capacidad puede abrir sesiones de chat del grupo, tanto de texto como de voz."
+		     name="join group chat" value="16" />
+		<action description="Abrir chat de voz del grupo"
+		     longdescription="Quien tenga un rol con esta capacidad puede abrir sesiones de chat de voz del grupo. NOTA: para acceder al chat de voz debe tenerse la capacidad &apos;Abrir chat de grupo&apos;."
+		     name="join voice chat" value="27" />
+		<action description="Moderar el chat de grupo"
+		     longdescription="Quien tenga esta capacidad puede controlar el acceso y la participaciones en los chats de texto y de voz del grupo."
+		     name="moderate group chat" value="37" />
+	</action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index d627571ae9..be5b752080 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="A propos de Second Life">
 	<text_editor name="credits_editor">
-		Second Life existe grâce aux efforts de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les et de nombreuses autres personnes.
+		Second Life existe grâce aux efforts de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl et de nombreuses autres personnes.
 
-  Tous nos remerciements aux résidents suivants pour avoir testé cette version (la meilleure qui soit jusqu&apos;à présent) :  afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
+  Tous nos remerciements aux résidents suivants pour avoir testé cette version (la meilleure qui soit jusqu&apos;à présent) :  able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
   3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
   APR Copyright (C) 2000-2004 The Apache Software Foundation
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
index 80b40ca5e3..5ed36c983c 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
@@ -36,6 +36,7 @@
 	<text name="covenant_text">
 		Vous devez accepter le règlement du domaine :
 	</text>
+	<text left="470" name="covenant_timestamp_text"/>
 	<text_editor name="covenant_editor">
 		Chargement...
 	</text_editor>
diff --git a/indra/newview/skins/default/xui/fr/floater_customize.xml b/indra/newview/skins/default/xui/fr/floater_customize.xml
index b1d7edbe52..89b3705570 100644
--- a/indra/newview/skins/default/xui/fr/floater_customize.xml
+++ b/indra/newview/skins/default/xui/fr/floater_customize.xml
@@ -183,7 +183,7 @@ votre avatar. Vous pouvez aussi en créer de nouveaux et les porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de chemise, faites-en glisser une de votre inventaire
+				Pour porter une nouvelle chemise, faites-en glisser une de votre inventaire
 jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
@@ -217,7 +217,7 @@ jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porte
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de pantalon, faites-en glisser un de votre inventaire
+				Pour porter un nouveau pantalon, faites-en glisser un de votre inventaire
 jusqu&apos;à votre avatar. Vous pouvez aussi en créer un nouveau et le porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
@@ -244,7 +244,7 @@ jusqu&apos;à votre avatar. Vous pouvez aussi en créer un nouveau et le porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de chaussures, faites-en glisser une paire de votre
+				Pour porter de nouvelles chaussures, faites-en glisser une paire de votre
 inventaire jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
 nouvelle paire et la porter.
 			</text>
@@ -279,7 +279,7 @@ nouvelle paire et la porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de chaussettes, faites-en glisser une paire de votre
+				Pour porter de nouvelles chaussettes, faites-en glisser une paire de votre
 inventaire jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
 nouvelle paire et la porter.
 			</text>
@@ -314,8 +314,8 @@ nouvelle paire et la porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de veste, faites-en glisser une de votre inventaire jusqu&apos;à
-votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
+				Pour porter une nouvelle veste, faites-en glisser une de votre inventaire 
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
@@ -349,7 +349,7 @@ votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de gants, faites-en glisser une paire à partir de votre
+				Pour porter de nouveaux gants, faites-les glisser à partir de votre
 inventaire. Vous pouvez aussi en créer une nouvelle paire et la porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
@@ -383,7 +383,7 @@ inventaire. Vous pouvez aussi en créer une nouvelle paire et la porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de sous-vêtement, faites-en glisser une paire à partir de
+				Pour porter de nouveaux sous-vêtements, faites-les glisser à partir de
 votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
@@ -418,7 +418,7 @@ votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de sous-vêtement, faites-en glisser une paire à partir de
+				Pour porter de nouveaux sous-vêtements, faites-les glisser à partir de
 votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
@@ -453,8 +453,8 @@ votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
 				Emplacement : [PATH]
 			</text>
 			<text length="1" name="not worn instructions" type="string">
-				Pour changer de jupe, faites-en glisser une à partir de votre inventaire.
-Vous pouvez aussi en créer une nouvelle et la porter.
+				Pour porter une nouvelle jupe, faites-en glisser une à partir de votre 
+inventaire. Vous pouvez aussi en créer une nouvelle et la porter.
 			</text>
 			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory.xml b/indra/newview/skins/default/xui/fr/floater_inventory.xml
index 071c0ae133..7173025d18 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory.xml
@@ -29,8 +29,8 @@
 				<menu_item_call label="Nouvelle veste" name="New Jacket"/>
 				<menu_item_call label="Nouvelle jupe" name="New Skirt"/>
 				<menu_item_call label="Nouveaux gants" name="New Gloves"/>
-				<menu_item_call label="Nouveau tricot" name="New Undershirt"/>
-				<menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
+				<menu_item_call label="Nouveaux sous-vêtements (haut)" name="New Undershirt"/>
+				<menu_item_call label="Nouveaux sous-vêtements (bas)" name="New Underpants"/>
 			</menu>
 			<menu name="New Body Parts">
 				<menu_item_call label="Nouvelle silhouette" name="New Shape"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
index 090f5f6bc9..cb7e618232 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
@@ -12,13 +12,13 @@
 	<check_box label="Textures" name="check_texture"/>
 	<check_box label="Photos" name="check_snapshot"/>
 	<button label="Tout" label_selected="Tout" name="All" width="70"/>
-	<button label="Aucun" label_selected="Aucun" name="None" width="70" bottom="-260" left="83"/>
-	<check_box label="Toujours montrer &#10;les dossiers" name="check_show_empty" bottom="-284"/>
-	<check_box label="Depuis la déconnexion" name="check_since_logoff" bottom="-318"/>
+	<button label="Aucun" label_selected="Aucun" name="None" width="70" bottom_delta="0" left="83"/>
+	<check_box label="Toujours montrer &#10;les dossiers" name="check_show_empty" bottom_delta="-20"/>
+	<check_box label="Depuis la déconnexion" name="check_since_logoff" bottom_delta="-36"/>
 	<text length="1" name="- OR -" type="string">
 		Ou il y a...
 	</text>
 	<spinner label="Heures" name="spin_hours_ago"/>
 	<spinner label="Jours" name="spin_days_ago"/>
-	<button label="Fermer" label_selected="Fermer" name="Close"/>
+	<button label="Fermer" label_selected="Fermer" name="Close" bottom_delta="-30"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
index a22d0a2934..8ee3a23b95 100644
--- a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
@@ -11,8 +11,8 @@
 	<text name="note_label_2">
 		[NOTE2]
 	</text>
-	<button label="Commencer" name="start_btn" />
-	<button label="Stop" name="stop_btn" />
-	<button label="Libérer" name="release_btn" />
+	<button label="Commencer" name="start_btn" width="85"/>
+	<button label="Stop" name="stop_btn" left="100"/>
+	<button label="Libérer" name="release_btn"  left="177"/>
 	<button label="Fermer" name="close_btn" />
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
index 5322993b0b..d234059dbb 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -58,6 +58,7 @@ ajoutez des pauses.
 	</radio_group>
 	<check_box label="jusqu&apos;à la fin des animations" name="wait_anim_check" />
 	<check_box label="temps en secondes" name="wait_time_check" />
+	<line_editor left_delta="130" name="wait_time_editor" />
 	<check_box label="Actifs" name="active_check"
 	     tool_tip="Les gestes actifs peuvent être déclenchés en saisissant leur raccourci dans le chat ou en appuyant sur les raccourcis. Les gestes deviennent généralement inactifs lorsqu&apos;il y a un conflit entre les raccourcis." />
 	<button label="Prévisualiser" name="preview_btn" width="86" />
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index f34100f56f..c89939ff8d 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Construire">
 	<button label="" label_selected="" name="button focus" tool_tip="Mise au point"/>
 	<button label="" label_selected="" name="button move" tool_tip="Déplacer"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Modifier"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 959cc5764c..ed46c87403 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -169,7 +169,9 @@
 		<menu_item_separator label="-----------" name="separator4"/>
 		<menu_item_call label="Mise au point sur la sélection" name="Focus on Selection"/>
 		<menu_item_call label="Zoom sur la sélection" name="Zoom to Selection"/>
-		<menu_item_call label="Acheter l&apos;objet" name="Menu Object Take"/>
+		<menu_item_call label="Acheter l&apos;objet" name="Menu Object Take">
+			<on_enable userdata="Acheter,Prendre" name="EnableBuyOrTake"/>
+		</menu_item_call>
 		<menu_item_call label="Prendre une copie" name="Take Copy"/>
 		<menu_item_call label="Remplacer l&apos;objet dans le contenu de l&apos;objet" name="Save Object Back to Object Contents"/>
 		<menu_item_separator label="-----------" name="separator6"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index ac8d0cc605..342f69f5f4 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -2595,7 +2595,7 @@ Pour répéter le didacticiel, veuillez aller sur Help Island Public.
 	<notification name="ImproperPaymentStatus">
 		Vous n&apos;avez pas le statut de paiement approprié pour pénétrer dans cette région.
 	</notification>
-	<notification name="MustGetAgeRgion">
+	<notification name="MustGetAgeRegion">
 		Pour pouvoir pénétrer dans cette région, vous devez avoir procédé à la vérification de votre âge.
 	</notification>
 	<notification name="MustGetAgeParcel">
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index 2ec8bc4dd8..a959638159 100644
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="Informazioni su Second Life">
 	<text_editor name="credits_editor">
-		Second Life è offerto da Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
+		Second Life è offerto da Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
 
-  Si ringraziano i seguenti residenti per aver contribuito a rendere questa versione la migliore possibile: 
+  Si ringraziano i seguenti residenti per aver contribuito a rendere questa versione la migliore possibile: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
   3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
   APR Copyright (C) 2000-2004 The Apache Software Foundation
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index e4ad34bf50..6e70a04cab 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -303,7 +303,7 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 			<string name="search_disabled_permissions_tooltip">
 				Questa opzione è disabilitata perchè tu non puoi modificare le opzioni di questo terreno.
 			</string>
-			<combo_box name="land category with adult">
+			<combo_box name="land category with adult" left="282" width="140">
 				<combo_item name="AnyCategory">
 					Tutte le categorie
 				</combo_item>
@@ -344,7 +344,7 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 					Altro
 				</combo_item>
 			</combo_box>
-			<combo_box name="land category">
+			<combo_box name="land category" left="282" width="140">
 				<combo_item name="AnyCategory">
 					Tutte le categorie
 				</combo_item>
@@ -382,7 +382,7 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 					Altro
 				</combo_item>
 			</combo_box>
-			<button label="?" label_selected="?" name="?"/>
+			<button label="?" label_selected="?" name="?" left="427"/>
 			<check_box label="Contenuto Mature" name="MatureCheck" tool_tip=" "/>
 			<string name="mature_check_mature">
 				Contenuto Mature
diff --git a/indra/newview/skins/default/xui/it/floater_animation_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_preview.xml
index 90b6dfe899..a57a568cdf 100644
--- a/indra/newview/skins/default/xui/it/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_animation_preview.xml
@@ -6,14 +6,14 @@
 	<text name="description_label">
 		Descrizione:
 	</text>
-	<spinner label="Priorità" name="priority" tool_tip="Controlla quali altre animazioni possono essere annullate da questa animazione."/>
+	<spinner label_width="72" width="110" label="Priorità" name="priority" tool_tip="Controlla quali altre animazioni possono essere annullate da questa animazione."/>
 	<check_box label="Ciclica" name="loop_check" tool_tip="Rende questa animazione ciclica."/>
 	<spinner label="In(%)" name="loop_in_point" tool_tip="Imposta il punto nell&apos;animazione in cui ritornare dopo ogni ciclo."/>
 	<spinner label="Out(%)" name="loop_out_point" tool_tip="Imposta il punto nell&apos;animazione in cui terminare dopo ogni ciclo."/>
 	<text name="hand_label">
 		Postura della mano
 	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="Controlla cosa fanno le mani durante l&apos;animazione.">
+	<combo_box left_delta="100"  width="184" name="hand_pose_combo" tool_tip="Controlla cosa fanno le mani durante l&apos;animazione.">
 		<combo_item name="Spread">
 			Aperte
 		</combo_item>
@@ -57,7 +57,7 @@
 	<text name="emote_label">
 		Espressione
 	</text>
-	<combo_box label="" name="emote_combo" tool_tip="Controlla l&apos;espressione del viso durante l&apos;animazione.">
+	<combo_box left_delta="100" width="184" name="emote_combo" tool_tip="Controlla l&apos;espressione del viso durante l&apos;animazione.">
 		<combo_item name="[None]">
 			[None]
 		</combo_item>
@@ -119,10 +119,10 @@
 			Preoccupazione
 		</combo_item>
 	</combo_box>
-	<text name="preview_label">
+	<text name="preview_label" width="250">
 		Vedi anteprima mentre
 	</text>
-	<combo_box label="" name="preview_base_anim" tool_tip="Da usarsi per controllare il comportamento dell&apos;animazione mentre l&apos;avatar svolge azioni abituali.">
+	<combo_box left_delta="154" width="130" name="preview_base_anim" tool_tip="Da usarsi per controllare il comportamento dell&apos;animazione mentre l&apos;avatar svolge azioni abituali.">
 		<combo_item name="Standing">
 			In piedi
 		</combo_item>
@@ -136,14 +136,15 @@
 			Vola
 		</combo_item>
 	</combo_box>
-	<spinner label="Avvio lento (sec)" name="ease_in_time" tool_tip="Tempo (in secondi) in cui le animazioni iniziano a sfumare."/>
-	<spinner label="Arresto lento (sec)" name="ease_out_time" tool_tip="Tempo (in secondi) in cui le animazioni iniziano a sfumare."/>
-	<button label="" name="play_btn" tool_tip="Attiva/sospendi l&apos;animazione."/>
+	<spinner label_width="125" width="192" label="Avvio lento (sec)" name="ease_in_time" tool_tip="Tempo (in secondi) in cui le animazioni iniziano a sfumare."/>
+	<spinner bottom_delta="-20"  label_width="125" left="10"  width="192" label="Arresto lento (sec)" name="ease_out_time" tool_tip="Tempo (in secondi) in cui le animazioni iniziano a sfumare."/>
+	<button bottom_delta="-32" name="play_btn" tool_tip="Attiva/sospendi l&apos;animazione."/>
 	<button label="" name="stop_btn" tool_tip="Ferma la riproduzione dell&apos;animazione"/>
 	<text name="bad_animation_text">
 		Impossibile leggere il file dell&apos;animazione.
 
-Raccomandiamo file di tipo BVH esportati da Poser 4.
+Raccomandiamo file di tipo BVH esportati da
+Poser 4.
 	</text>
 	<button label="Annulla" name="cancel_btn"/>
 	<button label="Importa ([AMOUNT]L$)" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
index 4e63c3b7d6..a223e30fb5 100644
--- a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
@@ -14,13 +14,15 @@
 		</panel>
 		<panel label="Vicino a me" name="NearMePanel">
 			<text name="InstructSelectResident">
-				Seleziona un residente nelle vicinanze:
+				Seleziona un residente
+nelle vicinanze:
 			</text>
-			<button label="Aggiorna la lista" label_selected="Aggiorna l&apos;elenco" name="Refresh"/>
-			<slider label="Range" name="near_me_range"/>
+			<button font="SansSerifSmall" left_delta="6" width="110" label="Aggiorna la lista" label_selected="Aggiorna l&apos;elenco" name="Refresh"/>
+			<slider label="Range" name="near_me_range" bottom_delta="-36"/>
 			<text name="meters">
 				Metri
 			</text>
+		<scroll_list bottom_delta="-169" height="159" name="NearMe"  />
 		</panel>
 	</tab_container>
 	<button label="Seleziona" label_selected="Seleziona" name="Select"/>
diff --git a/indra/newview/skins/default/xui/it/floater_build_options.xml b/indra/newview/skins/default/xui/it/floater_build_options.xml
index 340d70851c..2c60aeda2b 100644
--- a/indra/newview/skins/default/xui/it/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/it/floater_build_options.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="Opzioni della griglia">
-	<spinner label="Unità di misura della griglia (metri)" name="GridResolution"/>
-	<spinner label="Estensione della griglia (metri)" name="GridDrawSize"/>
+	<spinner label="Unità di misura della griglia (metri)" name="GridResolution" width="250" label_width="192"/>
+	<spinner label="Estensione della griglia (metri)" name="GridDrawSize" width="250" label_width="192"/>
 	<check_box label="Abilita sotto-unità di movimento" name="GridSubUnit"/>
 	<check_box label="Mostra piani d&apos;intersezione" name="GridCrossSection"/>
-	<slider label="Trasparenza della griglia" name="GridOpacity"/>
+	<slider label="Trasparenza della griglia" name="GridOpacity" width="250"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_contents.xml b/indra/newview/skins/default/xui/it/floater_buy_contents.xml
index dce10d5493..2836f98970 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_contents.xml
@@ -6,9 +6,9 @@
 	<text name="buy_text">
 		Compra per [AMOUNT]L$ da [NAME]?
 	</text>
-	<button label="Annulla" label_selected="Annulla" name="cancel_btn"/>
-	<button label="Compra" label_selected="Compra" name="buy_btn"/>
-	<check_box label="Indossa adesso l&apos;indumento" name="wear_check"/>
+	<button label="Annulla" label_selected="Annulla" name="cancel_btn" width="73"/>
+	<button label="Compra" label_selected="Compra" name="buy_btn" width="73" left_delta="-77"/>
+	<check_box label="Indossa adesso &#10;l&apos;indumento" name="wear_check" bottom="-234" left_delta="-125"/>
 	<string name="no_copy_text">
 		(non copiabile)
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
index aa840b4de4..a24f0dbe7a 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
@@ -22,14 +22,14 @@
 	<text name="buy_action">
 		[NAME] [PRICE]L$
 	</text>
-	<text name="currency_action">
+	<text name="currency_action" width="45">
 		Compra 
 	</text>
 	<line_editor name="currency_amt">
 		1234
 	</line_editor>
 	<text name="currency_est">
-		L$ per circa [USD]US$
+		L$  per circa [USD]US$
 	</text>
 	<text name="getting_data">
 		Dati in ricezione...
@@ -64,6 +64,6 @@ Devi aumentare l&apos;importo da acquistare.
 	<button label="Cancella" name="cancel_btn"/>
 	<button label="Acquista" name="buy_btn"/>
 	<string name="buy_currency">
-		Compra [LINDENS] L$ per circa [USD] US$
+		acquistare [LINDENS] L$ per circa [USD] US$
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_land.xml b/indra/newview/skins/default/xui/it/floater_buy_land.xml
index 8697a66f86..38919aa1e7 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_land.xml
@@ -18,10 +18,10 @@
 	<text name="estate_name_text">
 		(sconosciuto)
 	</text>
-	<text name="estate_owner_label">
-		Proprietario della regione
+	<text name="estate_owner_label" width="120" right="575">
+		Proprietario della regione:
 	</text>
-	<text name="estate_owner_text">
+	<text name="estate_owner_text" left="580" width="155">
 		(sconosciuto)
 	</text>
 	<text name="resellable_changeable_label">
@@ -36,6 +36,7 @@
 	<text name="covenant_text">
 		Devi accettare il regolamento della regione:
 	</text>
+	<text left="470" name="covenant_timestamp_text"/>
 	<text_editor name="covenant_editor">
 		Attendi...
 	</text_editor>
@@ -96,10 +97,10 @@ venduta con gli oggetti
 	<text name="currency_reason">
 		Possiedi 2.100 L$.
 	</text>
-	<text name="currency_action">
+	<text name="currency_action" width="106">
 		Compra ulteriori L$
 	</text>
-	<line_editor name="currency_amt">
+	<line_editor name="currency_amt" left="174" width="80">
 		1000
 	</line_editor>
 	<text name="currency_est">
diff --git a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
index cac43c9b8a..4c62d4f5a2 100644
--- a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
@@ -4,31 +4,31 @@
 		<panel label="Ciclo giorno/notte" name="Day Cycle">
 			<button label="?" name="WLDayCycleHelp"/>
 			<text name="WL12am">
-				12
+				0:00
 			</text>
 			<text name="WL3am">
-				3
+				3:00
 			</text>
 			<text name="WL6am">
-				6
+				6:00
 			</text>
 			<text name="WL9amHash">
-				9
+				9:00
 			</text>
 			<text name="WL12pmHash">
-				24
+				12:00
 			</text>
 			<text name="WL3pm">
-				15
+				15:00
 			</text>
 			<text name="WL6pm">
-				18
+				18:00
 			</text>
 			<text name="WL9pm">
-				21
+				21:00
 			</text>
 			<text name="WL12am2">
-				12
+				24:00
 			</text>
 			<text name="WL12amHash">
 				|
@@ -57,9 +57,9 @@
 			<text name="WL12amHash2">
 				|
 			</text>
-			<button label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/>
-			<button label="Cancella voce" label_selected="Cancella voce" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
+			<button font="SansSerifSmall" width="96" left="546" label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/>
+			<button font="SansSerifSmall" width="96" left="546" label="Cancella voce" label_selected="Cancella voce" name="WLDeleteKey"/>
+			<text name="WLCurKeyFrameText" width="210" left="17">
 				Impostazioni del fotogramma chiave:
 			</text>
 			<text name="WLCurKeyTimeText">
@@ -84,9 +84,9 @@
 			<text name="DayCycleText3">
 				Anteprima:
 			</text>
-			<button label="Avvia" label_selected="Avvia" name="WLAnimSky"/>
-			<button label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/>
-			<button label="Usa l&apos;ora della proprietà" label_selected="Vai all&apos;ora della proprietà" name="WLUseLindenTime"/>
+			<button width="55" font="SansSerifSmall" label="Avvia" label_selected="Avvia" name="WLAnimSky"/>
+			<button width="55" left_delta="60" font="SansSerifSmall" label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/>
+			<button left_delta="60" width="150" font="SansSerifSmall" label="Usa l&apos;ora della proprietà" label_selected="Vai all&apos;ora della proprietà" name="WLUseLindenTime"/>
 			<button label="Salva il test del giorno" label_selected="Salva il test del giorno" name="WLSaveDayCycle"/>
 			<button label="Carica il test del giorno" label_selected="Carica il test del giorno" name="WLLoadDayCycle"/>
 		</panel>
diff --git a/indra/newview/skins/default/xui/it/floater_env_settings.xml b/indra/newview/skins/default/xui/it/floater_env_settings.xml
index 58fbff5dc9..36f97bda81 100644
--- a/indra/newview/skins/default/xui/it/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/it/floater_env_settings.xml
@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Environment Editor Floater" title="Editor dell&apos;ambiente">
 	<text name="EnvTimeText">
-		Ora del giorno
+		Ora del
+giorno
 	</text>
 	<text name="EnvTimeText2">
 		12:00 PM
 	</text>
 	<text name="EnvCloudText">
-		Intensità delle Nuvole
+		Intensità delle
+Nuvole
 	</text>
 	<text name="EnvWaterColorText">
-		Colore dell&apos;Acqua
+		Colore
+dell&apos;Acqua
 	</text>
 	<color_swatch label="" name="EnvWaterColor" tool_tip="Clicca per aprire la tavolozza dei colori"/>
 	<text name="EnvWaterFogText">
-		Nebbiosità dell&apos;acqua
+		Nebbiosità
+dell&apos;acqua
 	</text>
-	<button label="Usa orario della regione" name="EnvUseEstateTimeButton"/>
+	<button bottom="-144" label="Usa orario della regione" name="EnvUseEstateTimeButton" width="145"/>
 	<button label="Cielo avanzato" name="EnvAdvancedSkyButton"/>
 	<button label="Acqua avanzata" name="EnvAdvancedWaterButton"/>
 	<button label="?" name="EnvSettingsHelpButton"/>
diff --git a/indra/newview/skins/default/xui/it/floater_gesture.xml b/indra/newview/skins/default/xui/it/floater_gesture.xml
index 27008e97a1..997e13ecb5 100644
--- a/indra/newview/skins/default/xui/it/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/it/floater_gesture.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gestures" title="Gesture attive">
 	<text name="help_label">
-		Fai doppio click su una gesture per azionare animazioni e suoni.
+		Fai doppio click su una gesture per azionare animazioni
+e suoni.
 	</text>
-	<scroll_list name="gesture_list">
-		<column label="Frase scatenante" name="trigger"/>
-		<column label="Pulsante" name="shortcut"/>
-		<column label="Nome" name="name"/>
+	<scroll_list bottom_delta="-385" height="360" name="gesture_list">
+		<column label="Frase scatenante" name="trigger" width="106"/>
+		<column label="Pulsante" name="shortcut" width="65"/>
+		<column label="Nome" name="name" width="129"/>
 	</scroll_list>
 	<button label="Nuova" name="new_gesture_btn"/>
 	<button label="Modifica" name="edit_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
index b3179dc534..28a53c45eb 100644
--- a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
@@ -7,7 +7,7 @@
 	<text name="Antialiasing:">
 		Antialiasing:
 	</text>
-	<combo_box label="Antialiasing" name="fsaa">
+	<combo_box label="Antialiasing" name="fsaa" width="94">
 		<combo_item name="FSAADisabled">
 			Disattivato
 		</combo_item>
@@ -26,13 +26,13 @@
 	</combo_box>
 	<spinner label="Gamma:" name="gamma"/>
 	<text name="(brightness, lower is brighter)">
-		(luminosità, più basso = più luminoso, 0=default)
+		(Luminosità, più basso = più luminoso, 0=default)
 	</text>
 	<text name="Enable VBO:">
 		Attiva VBO:
 	</text>
 	<check_box label="Attiva oggetti OpenGL Vertex Buffer" name="vbo" tool_tip="Attivandolo su un hardware moderno aumenta la performance.  Ma, su un vecchio hardware, spesso l&apos;implementazione dei VBO è scarsa e potresti avere dei crash quando è attivato."/>
 	<slider label="Memoria Texture  (MB):" name="GrapicsCardTextureMemory" tool_tip="Quantità di memoria allocata per le texture. Impostata di default sulla memoria della scheda grafica. Ridurla può aumentare la performance, ma può anche rendere le texture sfocate."/>
-	<spinner label="Indice della distanza della nebbia:" name="fog"/>
+	<spinner label="Indice della distanza &#10;della nebbia:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_image_preview.xml b/indra/newview/skins/default/xui/it/floater_image_preview.xml
index 74796a5400..224ab8df75 100644
--- a/indra/newview/skins/default/xui/it/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_image_preview.xml
@@ -7,9 +7,10 @@
 		Descrizione:
 	</text>
 	<text name="preview_label">
-		Anteprima dell&apos;immagine come:
+		Anteprima dell&apos;
+immagine come:
 	</text>
-	<combo_box label="Tipo d&apos;abito" name="clothing_type_combo">
+	<combo_box label="Tipo d&apos;abito" name="clothing_type_combo" left="120" width="166">
 		<combo_item name="Image">
 			Immagine
 		</combo_item>
diff --git a/indra/newview/skins/default/xui/it/floater_inspect.xml b/indra/newview/skins/default/xui/it/floater_inspect.xml
index cbf2935c77..6028c40557 100644
--- a/indra/newview/skins/default/xui/it/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/it/floater_inspect.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="inspect" title="Ispeziona oggetti">
+<floater name="inspect" title="Ispeziona oggetti" min_width="450">
 	<scroll_list name="object_list" tool_tip="Seleziona un oggetto da questo elenco per evidenziarlo inworld">
 		<column label="Nome dell&apos;oggetto" name="object_name"/>
-		<column label="Nome del proprietario" name="owner_name"/>
-		<column label="Nome del creatore" name="creator_name"/>
+		<column label="Proprietario" name="owner_name"/>
+		<column label="Creatore" name="creator_name"/>
 		<column label="Data di creazione" name="creation_date"/>
 	</scroll_list>
-	<button label="Vedi il profilo del proprietario..." label_selected="" name="button owner" tool_tip="Vedi il profilo del proprietario dell&apos;oggetto evidenziato"/>
-	<button label="Vedi il profilo del creatore..." label_selected="" name="button creator" tool_tip="Vedi il profilo del creatore originale dell&apos;oggetto evidenziato"/>
+	<button width="185" label="Vedi il profilo del proprietario..." label_selected="" name="button owner" tool_tip="Vedi il profilo del proprietario dell&apos;oggetto evidenziato"/>
+	<button width="165" left="205" label="Vedi il profilo del creatore..." label_selected="" name="button creator" tool_tip="Vedi il profilo del creatore originale dell&apos;oggetto evidenziato"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
index 6c681e7d1f..50e5fb83d7 100644
--- a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
@@ -30,7 +30,7 @@
 		Tu puoi:
 	</text>
 	<check_box label="Modificare" name="CheckOwnerModify"/>
-	<check_box label="Copiare" name="CheckOwnerCopy"/>
+	<check_box left_delta="88" label="Copiare" name="CheckOwnerCopy"/>
 	<check_box label="Rivendere/Regalare" name="CheckOwnerTransfer"/>
 	<text name="BaseMaskDebug">
 		B:
@@ -49,17 +49,17 @@
 	</text>
 	<check_box label="Condividi con il gruppo" name="CheckShareWithGroup"/>
 	<check_box label="Permetti a tutti di copiare" name="CheckEveryoneCopy"/>
-	<text name="NextOwnerLabel">
+	<text name="NextOwnerLabel" width="230">
 		Il prossimo proprietario può:
 	</text>
 	<check_box label="Modificare" name="CheckNextOwnerModify"/>
-	<check_box label="Copiare" name="CheckNextOwnerCopy"/>
+	<check_box left_delta="88" label="Copiare" name="CheckNextOwnerCopy"/>
 	<check_box label="Rivendere/Regalare" name="CheckNextOwnerTransfer"/>
 	<text name="SaleLabel">
 		Metti l&apos;oggetto:
 	</text>
 	<check_box label="In vendita" name="CheckPurchase"/>
-	<radio_group name="RadioSaleType">
+	<radio_group name="RadioSaleType" left_delta="88" >
 		<radio_item name="radio">
 			Originale
 		</radio_item>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
index 935e1d7049..c2c05b4023 100644
--- a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory Finder" title="Inventario_Cose_recenti">
+<floater name="Inventory Finder" title="Inventario_Cose_recenti" width="165">
 	<check_box label="Animazioni" name="check_animation"/>
 	<check_box label="Biglietti da visita" name="check_calling_card"/>
 	<check_box label="Abiti" name="check_clothing"/>
diff --git a/indra/newview/skins/default/xui/it/floater_joystick.xml b/indra/newview/skins/default/xui/it/floater_joystick.xml
index dcd637f199..ced227a845 100644
--- a/indra/newview/skins/default/xui/it/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/it/floater_joystick.xml
@@ -3,23 +3,24 @@
 	<check_box name="enable_joystick">
 		Abilita Joystick:
 	</check_box>
-	<spinner label="Mapping asse X" name="JoystickAxis1"/>
-	<spinner label="Mapping asse Y" name="JoystickAxis2"/>
-	<spinner label="Mapping asse Z" name="JoystickAxis0"/>
-	<spinner label="Mapping della direzione o Pitch" name="JoystickAxis4"/>
-	<spinner label="Mapping dell&apos;altitudine o Yaw" name="JoystickAxis5"/>
-	<spinner label="Mapping del Roll" name="JoystickAxis3"/>
-	<spinner label="Mapping dello Zoom" name="JoystickAxis6"/>
-	<check_box label="Zoom diretto" name="ZoomDirect"/>
+	<text left="120" name="joystick_type" width="380"/>
+	<spinner label="Mapping: asse X" name="JoystickAxis1" label_width="140" width="180" left="12"/>
+	<spinner label="Mapping: asse Y" name="JoystickAxis2" label_width="134" width="174" left="205"/>
+	<spinner label="Mapping: asse Z" name="JoystickAxis0" label_width="94" width="134" left="390"/>
+	<spinner label="Mapping: direzione o Pitch" name="JoystickAxis4" label_width="140" width="180" left="12"/>
+	<spinner label="Mapping: altitudine o Yaw" name="JoystickAxis5" label_width="134" width="174" left="205"/>
+	<spinner label="Mapping del Roll" name="JoystickAxis3" label_width="94" width="134" left="390"/>
+	<spinner label="Mapping dello Zoom" name="JoystickAxis6" label_width="140" width="180" left="12"/>
+	<check_box label="Zoom diretto" name="ZoomDirect" left="205"/>
 	<check_box label="Cursore 3D" name="Cursor3D"/>
 	<check_box label="Auto livellamento" name="AutoLeveling"/>
-	<text name="Control Modes:">
+	<text name="Control Modes:" left="3" width="113">
 		Modalità di controllo:
 	</text>
 	<check_box name="JoystickAvatarEnabled">
 		Avatar
 	</check_box>
-	<check_box name="JoystickBuildEnabled">
+	<check_box name="JoystickBuildEnabled" left="192">
 		Costruire
 	</check_box>
 	<check_box name="JoystickFlycamEnabled">
@@ -34,14 +35,14 @@
 	<text name="ZScale">
 		Regolazione Z
 	</text>
-	<text name="PitchScale">
-		Regolazione della direzione o Pitch
+	<text name="PitchScale" left="3" width="112">
+		Regolazione: Pitch
 	</text>
-	<text name="YawScale">
-		Regolazione dell&apos;altitudine o Yaw
+	<text name="YawScale" left="3" width="112">
+		Regolazione: Yaw
 	</text>
-	<text name="RollScale">
-		Regolazione del Roll
+	<text name="RollScale" left="3" width="112">
+		Regolazione: Roll
 	</text>
 	<text name="XDeadZone">
 		Angolo morto X
@@ -52,22 +53,22 @@
 	<text name="ZDeadZone">
 		Angolo morto Z
 	</text>
-	<text name="PitchDeadZone">
-		Angolo morto della direzione o Pitch
+	<text name="PitchDeadZone" left="3" width="112">
+		Angolo morto: Pitch
 	</text>
-	<text name="YawDeadZone">
-		Angolo morto dell&apos;altitudine o Yaw
+	<text name="YawDeadZone" left="3" width="112">
+		Angolo morto: Yaw
 	</text>
-	<text name="RollDeadZone">
-		Angolo morto del Roll
+	<text name="RollDeadZone" left="3" width="112">
+		Angolo morto: Roll
 	</text>
 	<text name="Feathering">
 		Smussamento
 	</text>
-	<text name="ZoomScale2">
+	<text name="ZoomScale2" width="135" left="6">
 		Regolazione dello zoom
 	</text>
-	<text name="ZoomDeadZone">
+	<text name="ZoomDeadZone" width="135" left="6">
 		Angolo morto dello zoom
 	</text>
 	<button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults"/>
diff --git a/indra/newview/skins/default/xui/it/floater_lagmeter.xml b/indra/newview/skins/default/xui/it/floater_lagmeter.xml
index d14f12ea4a..af70ad9d31 100644
--- a/indra/newview/skins/default/xui/it/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/it/floater_lagmeter.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_lagmeter" title="Misuratore del lag">
 	<button label="" label_selected="" name="client_lagmeter" tool_tip="Stato del lag del programma in locale"/>
+	<text left="30" name="client_lag_cause" right="-10" />
+	<text left="30" name="network_lag_cause" right="-10" />
+	<text left="30" name="server_lag_cause" right="-32" />
 	<text name="client">
 		Programma in locale:
 	</text>
-	<text name="client_text">
+	<text name="client_text" left="145" font="SansSerifSmall">
 		Normale
 	</text>
 	<button label="" label_selected="" name="network_lagmeter" tool_tip="Stato del lag del network"/>
 	<text name="network">
 		Network:
 	</text>
-	<text name="network_text">
+	<text name="network_text" font="SansSerifSmall">
 		Normale
 	</text>
 	<button label="" label_selected="" name="server_lagmeter" tool_tip="Stato del lag del server"/>
 	<text name="server">
 		Server:
 	</text>
-	<text name="server_text">
+	<text name="server_text" font="SansSerifSmall">
 		Normale
 	</text>
 	<button label="?" name="server_help"/>
@@ -48,10 +51,10 @@
 		Normale, finestra sullo sfondo
 	</string>
 	<string name="client_frame_time_critical_msg">
-		Velocità dei frame del programma in locale al di sotto di [CLIENT_FRAME_RATE_CRITICAL]
+		Velocità dei frame al di sotto di [CLIENT_FRAME_RATE_CRITICAL]
 	</string>
 	<string name="client_frame_time_warning_msg">
-		Velocità dei frame del programma in locale tra [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
+		Velocità dei frame tra [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
 	</string>
 	<string name="client_frame_time_normal_msg">
 		Normale
@@ -117,10 +120,10 @@
 		20
 	</string>
 	<string name="server_frame_time_critical_msg">
-		Velocità del simulatore al di sotto di [SERVER_FRAME_RATE_CRITICAL]
+		Velocità dei frame al di sotto di [SERVER_FRAME_RATE_CRITICAL]
 	</string>
 	<string name="server_frame_time_warning_msg">
-		Velocità del simulatore tra [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
+		Velocità dei frame tra [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
 	</string>
 	<string name="server_frame_time_normal_msg">
 		Normale
diff --git a/indra/newview/skins/default/xui/it/floater_land_holdings.xml b/indra/newview/skins/default/xui/it/floater_land_holdings.xml
index 6ac84b854f..85661c28d7 100644
--- a/indra/newview/skins/default/xui/it/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/it/floater_land_holdings.xml
@@ -7,7 +7,7 @@
 		<column label="Area" name="area"/>
 	</scroll_list>
 	<button label="Teletrasportati" label_selected="Teletrasportati" name="Teleport" tool_tip="Teletrasportati al centro di questo terreno."/>
-	<button label="Mostra sulla mappa" label_selected="Mostra sulla mappa" name="Show on Map" tool_tip="Mostra questo terreno sulla mappa."/>
+	<button width="130" label="Mostra sulla mappa" label_selected="Mostra sulla mappa" name="Show on Map" tool_tip="Mostra questo terreno sulla mappa."/>
 	<text name="contrib_label">
 		Contributi ai tuoi gruppi:
 	</text>
@@ -19,21 +19,21 @@
 		Proprietà di terreni consentite per l&apos;attuale piano di pagamento:
 	</text>
 	<text name="allowed_text">
-		[AREA] metri quadrati
+		[AREA] m²
 	</text>
 	<text name="current_label">
 		Attuale proprietà di terreni:
 	</text>
 	<text name="current_text">
-		[AREA] metri quadrati
+		[AREA] m²
 	</text>
 	<text name="available_label">
 		Quantità disponibile per ulteriori acquisti di terreno:
 	</text>
 	<text name="available_text">
-		[AREA] metri quadrati
+		[AREA] m²
 	</text>
 	<string name="area_string">
-		[AREA] metri quadrati
+		[AREA] m²
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
index 55195a00f1..bb1f6116cf 100644
--- a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="Script: Nuovo script">
 	<button label="Ripristina" label_selected="Ripristina" name="Reset"/>
-	<check_box label="In esecuzione" name="running"/>
-	<check_box label="Mono" name="mono"/>
+	<check_box label="In esecuzione" name="running" left="4"/>
+	<check_box label="Mono" name="mono" left="106"/>
 	<string name="not_allowed">
 		Non sei autorizzato a visualizzare questo script.
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_lsl_guide.xml b/indra/newview/skins/default/xui/it/floater_lsl_guide.xml
index 6a27703ad6..ec62dd087d 100644
--- a/indra/newview/skins/default/xui/it/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/it/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="LSL Wiki">
 	<check_box label="Segui il cursore" name="lock_check"/>
-	<combo_box label="Blocca" name="history_combo"/>
-	<button label="Indietro" name="back_btn"/>
+	<combo_box label="Blocca" name="history_combo" left_delta="120" width="70"/>
+	<button label="Indietro" name="back_btn" left_delta="75"/>
 	<button label="Avanti" name="fwd_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_media_browser.xml b/indra/newview/skins/default/xui/it/floater_media_browser.xml
index 1c906f5a4d..4d3462b348 100644
--- a/indra/newview/skins/default/xui/it/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/it/floater_media_browser.xml
@@ -2,10 +2,11 @@
 <floater name="floater_about" title="Browser multimediale">
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
-			<button label="Indietro" name="back"/>
-			<button label="Avanti" name="forward"/>
-			<button label="Ricarica" name="reload"/>
-			<button label="Vai" name="go"/>
+			<button label="Indietro" name="back" width="75"/>
+			<button label="Avanti" name="forward" left_delta="75"  width="70"/>
+			<button label="Ricarica" name="reload" left_delta="75"/>
+			<combo_box left_delta="75" name="address" width="510"/>
+			<button label="Vai" name="go" left_delta="515"/>
 		</layout_panel>
 		<layout_panel name="parcel_owner_controls">
 			<button label="Invia questo URL al terreno" name="assign"/>
diff --git a/indra/newview/skins/default/xui/it/floater_mute_object.xml b/indra/newview/skins/default/xui/it/floater_mute_object.xml
index 4b7370bad0..6bacdcab41 100644
--- a/indra/newview/skins/default/xui/it/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/it/floater_mute_object.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="mute by name" title="Ignora l&apos;oggetto dal nome">
 	<text name="message">
-		Ignora per nome ha effetti sull&apos;oggetto in chat e IM, non nei suoni.
-Devi scrivere esattamente il nome dell&apos;oggetto.
+		Ignora per nome ha effetti sull&apos;oggetto in chat e IM, non
+nei suoni. Devi scrivere esattamente il nome dell&apos;oggetto.
 	</text>
 	<line_editor name="object_name">
 		Nome dell&apos;oggetto
 	</line_editor>
-	<button label="Ok" name="OK"/>
+	<button label="OK" name="OK"/>
 	<button label="Annulla" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pay.xml b/indra/newview/skins/default/xui/it/floater_pay.xml
index dbf374a67c..4889f97ec7 100644
--- a/indra/newview/skins/default/xui/it/floater_pay.xml
+++ b/indra/newview/skins/default/xui/it/floater_pay.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-	<button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
-	<button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
-	<button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
-	<button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
-	<button label="Paga" label_selected="Paga" name="pay btn"/>
-	<button label="Annulla" label_selected="Annulla" name="cancel btn"/>
-	<text name="payee_label">
+	<button label="1 L$" label_selected="1 L$" name="fastpay 1" left="118" width="80" />
+	<button label="5 L$" label_selected="5 L$" name="fastpay 5" left="210"/>
+	<button label="10 L$" label_selected="10 L$" name="fastpay 10" left="118" width="80" />
+	<button label="20 L$" label_selected="20 L$" name="fastpay 20" left="210"/>
+	<button label="Paga" label_selected="Paga" name="pay btn" left="127"/>
+	<button label="Annulla" label_selected="Annulla" name="cancel btn" left="210"/>
+	<text name="payee_label" left="5" width="105">
 		Paga residente:
 	</text>
-	<text name="payee_name">
+	<text name="payee_name" left="115">
 		[FIRST] [LAST]
 	</text>
-	<text name="fastpay text">
+	<text name="fastpay text" width="110" halign="left">
 		Pagamento veloce:
 	</text>
-	<text name="amount text">
+	<text name="amount text" left="4" >
 		Ammontare:
 	</text>
+	<line_editor left="70" name="amount" width="49"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pay_object.xml b/indra/newview/skins/default/xui/it/floater_pay_object.xml
index 021b2d7647..c41c0ba41e 100644
--- a/indra/newview/skins/default/xui/it/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/it/floater_pay_object.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-	<text name="payee_group">
+	<text name="payee_group" width="100" halign="left">
 		Paga il gruppo:
 	</text>
-	<text name="payee_resident">
+	<text name="payee_resident" width="120" halign="left">
 		Paga il residente:
 	</text>
-	<text name="payee_name">
+	<text name="payee_name" left="120">
 		[FIRST] [LAST]
 	</text>
-	<text name="object_name_label">
+	<text name="object_name_label" left="5" width="110" halign="left">
 		Mediante l&apos;oggetto:
 	</text>
-	<text name="object_name_text">
+	<text name="object_name_text" left="120" >
 		...
 	</text>
-	<text name="fastpay text">
+	<text name="fastpay text" width="115" halign="left">
 		Pagamento diretto:
 	</text>
-	<text name="amount text">
+	<text name="amount text" left="5" halign="left">
 		Ammontare:
 	</text>
-	<button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
-	<button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
-	<button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
-	<button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
+	<button label="1 L$" label_selected="1 L$" name="fastpay 1" left="125" width="70"/>
+	<button label="5 L$" label_selected="5 L$" name="fastpay 5" left="200" width="70"/>
+	<button label="10 L$" label_selected="10 L$" name="fastpay 10" left="125" width="70"/>
+	<button label="20 L$" label_selected="20 L$" name="fastpay 20" left="200" width="70"/>
 	<button label="Paga" label_selected="Paga" name="pay btn"/>
 	<button label="Cancella" label_selected="Cancella" name="cancel btn"/>
+	<line_editor left="74" name="amount" width="50" />
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_postcard.xml b/indra/newview/skins/default/xui/it/floater_postcard.xml
index b8769f5486..947f18ea92 100644
--- a/indra/newview/skins/default/xui/it/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/it/floater_postcard.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Postcard" title="Invia la fotografia via email">
-	<text name="to_label">
+	<text name="to_label" width="135">
 		Email del destinatario:
 	</text>
+	<line_editor name="to_form" left="143" width="127" />
 	<text name="from_label">
 		La tua email:
 	</text>
+	<line_editor name="from_form" left="143" width="127" />
 	<text name="name_label">
 		Il tuo nome:
 	</text>
+	<line_editor name="name_form" left="143" width="127" />
 	<text name="subject_label">
 		Soggetto:
 	</text>
+	<line_editor name="subject_form" left="143" width="127" />
 	<line_editor label="Scrivi il soggetto qui." name="subject_form"/>
 	<text name="msg_label">
 		Messaggio:
@@ -20,7 +24,7 @@
 		Scrivi il messaggio qui.
 	</text_editor>
 	<text name="fine_print">
-		Se il tuo destinatario si registrerà in SL, riceverai il relativo bonus.
+		Se il tuo destinatario si registrerà in Second Life, riceverai il relativo bonus.
 	</text>
 	<button label="Annulla" name="cancel_btn"/>
 	<button label="Invia" name="send_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_preferences.xml b/indra/newview/skins/default/xui/it/floater_preferences.xml
index 726b6dd70b..6277300bee 100644
--- a/indra/newview/skins/default/xui/it/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/it/floater_preferences.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Preferences" title="Preferenze">
+<floater name="Preferences" title="Preferenze" min_width="350" width="646">
 	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
 	<button label="Applica" label_selected="Applica" name="Apply"/>
 	<button label="Informazioni..." label_selected="Informazioni..." name="About..."/>
 	<button label="Aiuto" label_selected="Aiuto" name="Help"/>
+	<tab_container name="pref core" tab_width="146" width="646" />
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_preview_animation.xml b/indra/newview/skins/default/xui/it/floater_preview_animation.xml
index 95a8a96066..e9e0252613 100644
--- a/indra/newview/skins/default/xui/it/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_animation.xml
@@ -3,6 +3,6 @@
 	<text name="desc txt">
 		Descrizione:
 	</text>
-	<button label="Esegui inworld" label_selected="Ferma" name="Anim play btn" tool_tip="Esegui questa animazione così che altri possano vederla."/>
-	<button label="Esegui localmente" label_selected="Ferma" name="Anim audition btn" tool_tip="Esegui questa animazione così che solo tu possa vederla."/>
+	<button left="20" width="131" label="Esegui inworld" label_selected="Ferma" name="Anim play btn" tool_tip="Esegui questa animazione così che altri possano vederla."/>
+	<button left="162" width="125" label="Esegui localmente" label_selected="Ferma" name="Anim audition btn" tool_tip="Esegui questa animazione così che solo tu possa vederla."/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
index 2e3f20a520..abfff9a927 100644
--- a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
@@ -15,15 +15,15 @@
 	<text name="trigger_label">
 		Parole chiave:
 	</text>
-	<text name="replace_text" tool_tip="Sostituisci le parole chiave con questi termini. Per esempio, sostituire la parola chiave &apos;salve&apos; con &apos;ciao&apos; modificherà la chat &apos;Volevo solo dire salve&apos; in &apos;Volevo solo dire ciao&apos; e avvierà la gesture!">
+	<text left="208" name="replace_text" tool_tip="Sostituisci le parole chiave con questi termini. Per esempio, sostituire la parola chiave &apos;salve&apos; con &apos;ciao&apos; modificherà la chat &apos;Volevo solo dire salve&apos; in &apos;Volevo solo dire ciao&apos; e avvierà la gesture!">
 		Sostituisci con:
 	</text>
 	<line_editor name="replace_editor" tool_tip="Sostituisci le parole chiave con questi termini. Per esempio, sostituire la parola chiave &apos;salve&apos; con &apos;ciao&apos; modificherà la chat &apos;Volevo solo dire salve&apos; in &apos;Volevo solo dire ciao&apos; e avvierà la gesture!"/>
 	<text name="key_label">
 		Scorciatoia da tastiera:
 	</text>
-	<combo_box label="Nessuno" name="modifier_combo"/>
-	<combo_box label="Nessuno" name="key_combo"/>
+	<combo_box label="Nessuno" name="modifier_combo" left="156" width="76"/>
+	<combo_box label="Nessuno" name="key_combo" width="76" left_delta="80"/>
 	<text name="library_label">
 		Libreria:
 	</text>
@@ -53,8 +53,9 @@ non aggiunga pause.
 			Stop
 		</radio_item>
 	</radio_group>
-	<check_box label="finché le animazioni sono eseguite" name="wait_anim_check"/>
+	<check_box left="226" label="finché le animazioni sono eseguite" name="wait_anim_check"/>
 	<check_box label="tempo in secondi" name="wait_time_check"/>
+	<line_editor left_delta="114" name="wait_time_editor" />
 	<check_box label="Attiva" name="active_check" tool_tip="Le gesture attivate possono essere eseguite scrivendo in chat la parola chiave o premendo i tasti chiave. Le gesture generalmente si disattivano quando c&apos;è un conflitto nei relativi tasti."/>
 	<button label="Anteprima" name="preview_btn"/>
 	<button label="Salva" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_report_abuse.xml b/indra/newview/skins/default/xui/it/floater_report_abuse.xml
index 99165da253..e7d712de0f 100644
--- a/indra/newview/skins/default/xui/it/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/it/floater_report_abuse.xml
@@ -169,8 +169,9 @@
 		Dettagli:
 	</text>
 	<text name="bug_aviso">
-		Ti preghiamo di essere circostanziato riguardo data, luogo, natura
-dell&apos;abuso, testo rilevante di chat/IM, e, se possibile, indica l&apos;oggetto.
+		Ti preghiamo di essere circostanziato riguardo data,
+luogo, natura dell&apos;abuso, testo rilevante di chat/IM, e,
+se possibile, indica l&apos;oggetto.
 	</text>
 	<text name="incomplete_title">
 		Nota: Segnalazioni incomplete non saranno esaminate.
diff --git a/indra/newview/skins/default/xui/it/floater_script_search.xml b/indra/newview/skins/default/xui/it/floater_script_search.xml
index ebd8ee359f..470fb76135 100644
--- a/indra/newview/skins/default/xui/it/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/it/floater_script_search.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script search" title="Cerca Script">
-	<check_box label="Senza distinzione tra maiuscole e minuscole" name="case_text"/>
-	<button label="Cerca" label_selected="Cerca" name="search_btn"/>
-	<button label="Sostituisci" label_selected="Sostituisci" name="replace_btn"/>
-	<button label="Sostituisci tutto" label_selected="Sostituisci tutto" name="replace_all_btn"/>
-	<text name="txt">
+<floater name="script search" title="Cerca Script" width="320">
+	<check_box label="Senza distinzione tra maiuscole e minuscole" name="case_text" left="65"/>
+	<button label="Cerca" label_selected="Cerca" name="search_btn" width="85"/>
+	<button label="Sostituisci" label_selected="Sostituisci" name="replace_btn" left="100" width="85"/>
+	<button label="Sostituisci tutto" label_selected="Sostituisci tutto" name="replace_all_btn" left="190" width="122"/>
+	<text name="txt" width="60">
 		Cerca
 	</text>
-	<text name="txt2">
+	<text name="txt2" width="60">
 		Sostituisci
 	</text>
+	<line_editor left="65" name="search_text" width="240" />
+	<line_editor left="65" name="replace_text" width="240" />
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_settings_debug.xml b/indra/newview/skins/default/xui/it/floater_settings_debug.xml
index 9bedc69a05..51d0f756f9 100644
--- a/indra/newview/skins/default/xui/it/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/it/floater_settings_debug.xml
@@ -13,5 +13,5 @@
 	<spinner label="x" name="val_spinner_2"/>
 	<spinner label="x" name="val_spinner_3"/>
 	<spinner label="x" name="val_spinner_4"/>
-	<button label="Reimposta i valori di default" name="default_btn"/>
+	<button label="Reimposta i valori di default" name="default_btn" width="210"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_snapshot.xml b/indra/newview/skins/default/xui/it/floater_snapshot.xml
index 7e1bc2cf5d..5999bad514 100644
--- a/indra/newview/skins/default/xui/it/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/it/floater_snapshot.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="Anteprima della fotografia">
+<floater name="Snapshot" title="Anteprima della fotografia" width="247">
 	<text name="type_label">
 		Destinazione della fotografia
 	</text>
-	<radio_group label="Tipo di fotografia" name="snapshot_type_radio">
+	<radio_group label="Tipo di fotografia" name="snapshot_type_radio" width="228">
 		<radio_item name="postcard">
 			Invia via email
 		</radio_item>
@@ -11,7 +11,7 @@
 			Salva nel tuo inventario ([AMOUNT] L$)
 		</radio_item>
 		<radio_item name="local">
-			Salva sul tuo pc
+			Salva sul tuo disco rigido
 		</radio_item>
 	</radio_group>
 	<text name="file_size_label">
@@ -20,7 +20,7 @@
 	<button label="Aggiorna la fotografia" name="new_snapshot_btn"/>
 	<button label="Invia" name="send_btn"/>
 	<button label="Salva ([AMOUNT] L$)" name="upload_btn"/>
-	<flyout_button label="Salva" name="save_btn" tool_tip="Salva l&apos;immagine come file">
+	<flyout_button label="Salva" name="save_btn" tool_tip="Salva l&apos;immagine come file" >
 		<flyout_button_item name="save_item">
 			Salva
 		</flyout_button_item>
@@ -108,14 +108,14 @@
 			BMP
 		</combo_item>
 	</combo_box>
-	<spinner label="Larghezza" name="snapshot_width"/>
-	<spinner label="Altezza" name="snapshot_height"/>
+	<spinner label="Larghezza" name="snapshot_width" label_width="58" width="116"/>
+	<spinner label="Altezza" name="snapshot_height" label_width="41" width="101" left="130"/>
 	<check_box label="Mantieni le proporzioni" name="keep_aspect_check"/>
 	<slider label="Qualità d&apos;immagine" name="image_quality_slider"/>
-	<text name="layer_type_label">
+	<text name="layer_type_label" width="55">
 		Fotografa:
 	</text>
-	<combo_box label="Layer dell&apos;immagine" name="layer_types">
+	<combo_box label="Layer dell&apos;immagine" name="layer_types" left="68" width="165">
 		<combo_item name="Colors">
 			Colori
 		</combo_item>
@@ -127,10 +127,10 @@
 		</combo_item>
 	</combo_box>
 	<check_box label="Mostra l&apos;interfaccia nella fotografia" name="ui_check"/>
-	<check_box label="Mostra i dispositivi indossati nella fotografia" name="hud_check"/>
-	<check_box label="Mantieni aperto dopo aver salvato" name="keep_open_check"/>
-	<check_box label="Blocca l&apos;anteprima (Anteprima a schermo intero)" name="freeze_frame_check"/>
-	<check_box label="Auto-Aggiorna" name="auto_snapshot_check"/>
+	<check_box bottom_delta="-17" label="Mostra i dispositivi indossati nella foto" name="hud_check"/>
+	<check_box bottom_delta="-17" label="Mantieni aperto dopo aver salvato" name="keep_open_check"/>
+	<check_box bottom_delta="-17" label="Blocca l&apos;anteprima &#10;(Anteprima a schermo intero)" name="freeze_frame_check"/>
+	<check_box bottom_delta="-29" label="Auto-Aggiorna" name="auto_snapshot_check"/>
 	<string name="unknown">
 		sconosciuto
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_telehub.xml b/indra/newview/skins/default/xui/it/floater_telehub.xml
index 5de215522d..0c5199dbc7 100644
--- a/indra/newview/skins/default/xui/it/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/it/floater_telehub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="telehub" title="Telehub">
+<floater name="telehub" title="Telehub" min_height="310" height="310" width="286">
 	<text name="status_text_connected">
 		Telehub connesso all&apos;oggetto [OBJECT]
 	</text>
@@ -10,19 +10,23 @@
 		Per rimuovere, clicca Disconnetti.
 	</text>
 	<text name="help_text_not_connected">
-		Seleziona l&apos;oggetto e clicca connetti Telehub.
+		Seleziona l&apos;oggetto e clicca Connetti Telehub.
 	</text>
 	<button label="Connetti Telehub" name="connect_btn"/>
 	<button label="Disconnetti" name="disconnect_btn"/>
-	<text name="spawn_points_text">
+	<text name="spawn_points_text" width="265">
 		Rigenera i punti (posizioni, non oggetti):
 	</text>
-	<button label="Aggiungi punti rigenerazione" name="add_spawn_point_btn"/>
-	<button label="Rimuovi punti rigenerazione" name="remove_spawn_point_btn"/>
+	<scroll_list name="spawn_points_list" width="265" />
+	<button width="165" label="Aggiungi punti rigenerazione" name="add_spawn_point_btn"/>
+	<button width="105" left="175" label="Rimuovi punti" name="remove_spawn_point_btn"/>
 	<text name="spawn_point_help">
-		Seleziona un oggetto e clicca su aggiungi per specificarne la posizione.
+		Seleziona un oggetto e clicca su aggiungi per
+specificarne la posizione.
 Potrai quindi muovere o rimuovere l&apos;oggetto.
 Le posizioni sono relative al centro del telehub.
-Seleziona un elemento per vederne la posizione globale.
+
+Seleziona un elemento per vederne la posizione
+globale.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index a89ae9d803..c7c5890336 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Costruisci" width="288">
 	<button label="" label_selected="" name="button focus" tool_tip="Focus"/>
 	<button label="" label_selected="" name="button move" tool_tip="Muoviti"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Modifica"/>
 	<button label="" label_selected="" name="button create" tool_tip="Crea"/>
 	<button label="" label_selected="" name="button land" tool_tip="Terra"/>
 	<check_box label="Zoom" name="radio zoom"/>
-	<check_box label="Guarda ruotando(Ctrl)" name="radio orbit"/>
+	<check_box label="Guarda ruotando (Ctrl)" name="radio orbit"/>
 	<check_box label="Guarda panoramicamente (Ctrl-Shift)" name="radio pan"/>
 	<check_box label="Muovi" name="radio move"/>
 	<check_box label="Alza (Ctrl)" name="radio lift"/>
@@ -17,9 +17,9 @@
 	<check_box label="Seleziona Texture" name="radio select face"/>
 	<check_box label="Modifica parti unite" name="checkbox edit linked parts"/>
 	<text name="text ruler mode">
-		Modalità regolo di precisione:
+		Modalità:
 	</text>
-	<combo_box name="combobox grid mode">
+	<combo_box name="combobox grid mode" left_delta="48">
 		<combo_item name="World">
 			Globale
 		</combo_item>
@@ -30,11 +30,11 @@
 			Riferito a
 		</combo_item>
 	</combo_box>
-	<check_box label="Ridimensiona simmetricamente" name="checkbox uniform"/>
-	<check_box label="Ridimensiona le Texture" name="checkbox stretch textures"/>
+	<check_box label="Ridimens. simmetricamente" name="checkbox uniform"/>
+	<check_box label="Ridimensiona le texture" name="checkbox stretch textures"/>
 	<check_box label="Usa righello" name="checkbox snap to grid"/>
 	<button label="Opzioni..." label_selected="Opzioni..." name="Options..."/>
-	<text name="text status">
+	<text name="text status" width="280">
 		Trascina per muovere, trascina+maiuscolo per copiare
 	</text>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
@@ -63,23 +63,24 @@
 	<check_box label="Uniforma" name="radio smooth"/>
 	<check_box label="Ondula" name="radio noise"/>
 	<check_box label="Ripristina" name="radio revert"/>
-	<button label="Applica" label_selected="Applica" name="button apply to selection" tool_tip="Modifica il terreno selezionato"/>
+	<button label="Applica" label_selected="Applica" name="button apply to selection" tool_tip="Modifica il terreno selezionato" left="146"/>
 	<text name="Bulldozer:">
 		Bulldozer:
 	</text>
 	<text name="Dozer Size:">
 		Grandezza
 	</text>
+	<volume_slider left="184" name="slider brush size" width="74" />
 	<text name="Strength:">
 		Potenza
 	</text>
-	<text name="obj_count">
+	<text name="obj_count" left="134">
 		Oggetti selezionati: [COUNT]
 	</text>
-	<text name="prim_count">
+	<text name="prim_count" left="134">
 		primitive: [COUNT]
 	</text>
-	<tab_container name="Object Info Tabs">
+	<tab_container name="Object Info Tabs" tab_max_width="150" tab_min_width="30" width="288">
 		<panel label="Generale" name="General">
 			<text name="Name:">
 				Nome:
@@ -121,7 +122,7 @@
 			<string name="text deed">
 				Cedi al gruppo
 			</string>
-			<button label="Cedi al gruppo..." label_selected="Cedi al gruppo..." name="button deed" tool_tip="Gli oggetti condivisi con il gruppo possono essere ceduti da un funzionario del gruppo."/>
+			<button left_delta="152" width="98" label="Cedi al gruppo..." label_selected="Cedi al gruppo..." name="button deed" tool_tip="Gli oggetti condivisi con il gruppo possono essere ceduti da un funzionario del gruppo."/>
 			<check_box label="Permetti a chiunque di spostare" name="checkbox allow everyone move"/>
 			<check_box label="Permetti a chiunque di copiare" name="checkbox allow everyone copy"/>
 			<check_box label="Mostra nella ricerca" name="search_check" tool_tip="Permetti che l&apos;oggetto sia visibile nella ricerca"/>
@@ -144,12 +145,12 @@
 				Il prossimo proprietario può:
 			</text>
 			<check_box label="Modificare" name="checkbox next owner can modify"/>
-			<check_box label="Copiare" name="checkbox next owner can copy"/>
-			<check_box label="Rivendere/Regalare" name="checkbox next owner can transfer"/>
-			<text name="label click action">
-				Se cliccato con il tasto sinistro del mouse
+			<check_box label="Copiare" name="checkbox next owner can copy" left_delta="80"/>
+			<check_box label="Rivendere/Regalare" name="checkbox next owner can transfer" left_delta="67"/>
+			<text name="label click action" width="220">
+				Se cliccato con il tasto sinistro del mouse:
 			</text>
-			<combo_box name="clickaction">
+			<combo_box name="clickaction" width="192">
 				<combo_item name="Touch/grab(default)">
 					Tocca/Afferra (default)
 				</combo_item>
@@ -176,7 +177,7 @@
 				B:
 			</text>
 			<text name="O:">
-				O;
+				O:
 			</text>
 			<text name="G:">
 				G:
@@ -206,7 +207,7 @@
 				Devi selezionare l&apos;intero oggetto per impostare i permessi.
 			</string>
 			<string name="Cost Default">
-				Prezzo:           L$
+				Prezzo:         L$
 			</string>
 			<string name="Cost Total">
 				Prezzo totale:  L$
@@ -351,7 +352,7 @@
 			</text>
 			<spinner label="X" name="Shear X"/>
 			<spinner label="Y" name="Shear Y"/>
-			<text name="advanced_cut">
+			<text name="advanced_cut" width="149">
 				Ritaglia il profilo Inizio e Fine
 			</text>
 			<text name="advanced_dimple">
@@ -398,29 +399,29 @@
 			</combo_box>
 		</panel>
 		<panel label="Caratteristiche" name="Features">
-			<text name="select_single">
+			<text name="select_single" width="280">
 				Seleziona solo un prim per modificarne le caratteristiche.
 			</text>
 			<text name="edit_object">
 				Modifica le caratteristiche dell&apos;oggetto:
 			</text>
 			<check_box label="Flessibilità" name="Flexible1D Checkbox Ctrl" tool_tip="Permette all&apos;oggetto di flettersi rispetto all&apos;asse Z. (solo lato client)"/>
-			<spinner label="Morbidezza" name="FlexNumSections"/>
-			<spinner label="Gravità" name="FlexGravity"/>
-			<spinner label="Elasticità" name="FlexFriction"/>
-			<spinner label="Sventolio" name="FlexWind"/>
-			<spinner label="Tensione" name="FlexTension"/>
-			<spinner label="Forza X" name="FlexForceX"/>
-			<spinner label="Forza Y" name="FlexForceY"/>
-			<spinner label="Forza Z" name="FlexForceZ"/>
+			<spinner label="Morbidezza" name="FlexNumSections" label_width="72" width="135"/>
+			<spinner label="Gravità" name="FlexGravity" label_width="72" width="135"/>
+			<spinner label="Elasticità" name="FlexFriction" label_width="72" width="135"/>
+			<spinner label="Sventolio" name="FlexWind" label_width="72" width="135"/>
+			<spinner label="Tensione" name="FlexTension" label_width="72" width="135"/>
+			<spinner label="Forza X" name="FlexForceX" label_width="72" width="135"/>
+			<spinner label="Forza Y" name="FlexForceY" label_width="72" width="135"/>
+			<spinner label="Forza Z" name="FlexForceZ" label_width="72" width="135"/>
 			<check_box label="Luce" name="Light Checkbox Ctrl" tool_tip="Imposta l&apos;oggetto come sorgente di luce"/>
 			<text name="label color">
 				Colore
 			</text>
 			<color_swatch label="" name="colorswatch" tool_tip="Clicca per aprire la tavolozza dei colori"/>
-			<spinner label="Intensità" name="Light Intensity"/>
-			<spinner label="Raggio" name="Light Radius"/>
-			<spinner label="Attenuazione" name="Light Falloff"/>
+			<spinner label="Intensità" name="Light Intensity" label_width="72" width="135"/>
+			<spinner label="Raggio" name="Light Radius" label_width="72" width="135"/>
+			<spinner label="Attenuazione" name="Light Falloff" label_width="72" width="135" />
 		</panel>
 		<panel label="Texture" name="Texture">
 			<texture_picker label="Texture" name="texture control" tool_tip="Clicca per scegliere un&apos;immagine"/>
@@ -431,11 +432,11 @@
 			<text name="glow label">
 				Bagliore
 			</text>
-			<check_box label="Massima luminosità" name="checkbox fullbright"/>
+			<check_box label="Massima &#10;luminosità" name="checkbox fullbright" bottom_delta="-21"/>
 			<text name="tex gen">
-				Applicazione della texture
+				Applicazione &#10;della texture
 			</text>
-			<combo_box name="combobox texgen">
+			<combo_box name="combobox texgen" bottom_delta="-38">
 				<combo_item name="Default">
 					Default
 				</combo_item>
@@ -443,10 +444,10 @@
 					Planare
 				</combo_item>
 			</combo_box>
-			<text name="label shininess">
+			<text name="label shininess" bottom="-120">
 				Brillantezza
 			</text>
-			<combo_box name="combobox shininess">
+			<combo_box name="combobox shininess" bottom_delta="-22">
 				<combo_item name="None">
 					Nessuna
 				</combo_item>
@@ -460,10 +461,10 @@
 					Alta
 				</combo_item>
 			</combo_box>
-			<text name="label bumpiness">
+			<text name="label bumpiness" bottom="-120">
 				Rilievo
 			</text>
-			<combo_box name="combobox bumpiness">
+			<combo_box name="combobox bumpiness" width="100" bottom_delta="-22">
 				<combo_item name="None">
 					Nessuna
 				</combo_item>
@@ -538,7 +539,9 @@
 			<text name="rpt">
 				Ripetizioni per metro
 			</text>
-			<button label="Applica" label_selected="Applica" name="button apply"/>
+			<spinner left="120" name="TexRot" width="60" />
+			<spinner left="120" name="rptctrl" width="60" />
+			<button label="Applica" label_selected="Applica" name="button apply" left_delta="72"/>
 			<text name="tex offset">
 				Offset
 			</text>
@@ -548,11 +551,12 @@
 				Allinea texture dei media
 (deve prima caricarsi)
 			</text>
-			<button label="Allinea" label_selected="Allinea" name="button align"/>
+			<button label="Allinea" label_selected="Allinea" name="button align" left="160"/>
 		</panel>
 		<panel label="Contenuto" name="Contents">
 			<button label="Nuovo Script" label_selected="Nuovo script..." name="button new script"/>
 			<button label="Permessi..." name="button permissions"/>
+			<panel name="ContentsInventory" width="272" />
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
@@ -560,24 +564,24 @@
 			Informazioni sul terreno
 		</text>
 		<text name="label_area_price">
-			Prezzo: [PRICE] L$ per [AREA] mq.
+			Prezzo: [PRICE] L$ per [AREA] m²
 		</text>
 		<text name="label_area">
-			Area: [AREA] mq.
+			Area: [AREA] m²
 		</text>
-		<button label="Informazioni sul terreno..." label_selected="Informazioni sul terreno..." name="button about land"/>
+		<button label="Informazioni sul terreno..." label_selected="Informazioni sul terreno..." name="button about land" width="156"/>
 		<check_box label="Mostra i proprietari" name="checkbox show owners" tool_tip="Colora i terreni in base ai loro proprietari"/>
-		<button label="?" label_selected="?" name="button show owners help"/>
+		<button label="?" label_selected="?" name="button show owners help" left_delta="120"/>
 		<text name="label_parcel_modify">
 			Modifica il terreno
 		</text>
-		<button label="Suddividi..." label_selected="Suddividi..." name="button subdivide land"/>
-		<button label="Unisci..." label_selected="Unisci..." name="button join land"/>
+		<button label="Suddividi..." label_selected="Suddividi..." name="button subdivide land" width="156"/>
+		<button label="Unisci..." label_selected="Unisci..." name="button join land" width="156"/>
 		<text name="label_parcel_trans">
 			Transazioni del territorio
 		</text>
-		<button label="Acquista il terreno..." label_selected="Acquista il terreno..." name="button buy land"/>
-		<button label="Abbandona il terreno..." label_selected="Abbandona il terreno..." name="button abandon land"/>
+		<button label="Acquista il terreno..." label_selected="Acquista il terreno..." name="button buy land" width="156"/>
+		<button label="Abbandona il terreno..." label_selected="Abbandona il terreno..." name="button abandon land" width="156"/>
 	</panel>
 	<string name="status_rotate">
 		Sposta le fasce colorate per ruotare l&apos;oggetto
diff --git a/indra/newview/skins/default/xui/it/floater_top_objects.xml b/indra/newview/skins/default/xui/it/floater_top_objects.xml
index ff6e9eb730..470e21769c 100644
--- a/indra/newview/skins/default/xui/it/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/it/floater_top_objects.xml
@@ -4,30 +4,33 @@
 		In caricamento...
 	</text>
 	<scroll_list name="objects_list">
-		<column label="Punteggio" name="score"/>
-		<column label="Nome" name="name"/>
-		<column label="Proprietario" name="owner"/>
-		<column label="Ubicazione" name="location"/>
-		<column label="Ora" name="time"/>
-		<column label="Ora (Mono)" name="mono_time"/>
+		<column label="Punteggio" name="score" width="84"/>
+		<column label="Nome" name="name" width="84"/>
+		<column label="Proprietario" name="owner" width="84"/>
+		<column label="Ubicazione" name="location" width="84"/>
+		<column label="Ora" name="time" width="84"/>
+		<column label="Ora (Mono)" name="mono_time" width="84"/>
 	</scroll_list>
+	<line_editor font="SansSerifSmall" left="90" name="id_editor" width="280"/>
+	<line_editor font="SansSerifSmall" left="90" name="object_name_editor" width="280"/>
+	<line_editor font="SansSerifSmall" left="90" name="owner_name_editor" width="280"/>
 	<text name="id_text">
 		ID oggetto:
 	</text>
-	<button label="Mostra segnali luminosi" name="show_beacon_btn"/>
+	<button label="Mostra segnali luminosi" name="show_beacon_btn" width="150"/>
 	<text name="obj_name_text">
 		Nome oggetto:
 	</text>
-	<button label="Filtro" name="filter_object_btn"/>
+	<button label="Filtro" name="filter_object_btn" width="150"/>
 	<text name="owner_name_text">
 		Nome oggetto:
 	</text>
-	<button label="Filtro" name="filter_owner_btn"/>
-	<button label="Restituisci selezionato" name="return_selected_btn"/>
-	<button label="Restituisci tutti" name="return_all_btn"/>
-	<button label="Disabilita selezionato" name="disable_selected_btn"/>
-	<button label="Disabilita per tutti" name="disable_all_btn"/>
-	<button label="Aggiorna" name="refresh_btn"/>
+	<button label="Filtro" name="filter_owner_btn" width="150"/>
+	<button label="Restituisci selezionato" name="return_selected_btn" width="150"/>
+	<button label="Restituisci tutti" name="return_all_btn" left="170"/>
+	<button label="Disabilita selezionato" name="disable_selected_btn" width="150"/>
+	<button label="Disabilita per tutti" name="disable_all_btn" left="170"/>
+	<button label="Aggiorna" name="refresh_btn" width="150"/>
 	<string name="top_scripts_title">
 		Script pesanti
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_tos.xml b/indra/newview/skins/default/xui/it/floater_tos.xml
index 76dbe86ee6..671135b058 100644
--- a/indra/newview/skins/default/xui/it/floater_tos.xml
+++ b/indra/newview/skins/default/xui/it/floater_tos.xml
@@ -4,7 +4,7 @@
 	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
 	<check_box label="Accetto i Termini di Servizio" name="agree_chk"/>
 	<text name="tos_heading">
-		Leggi attentamente i seguenti Termini di Servizio . Per continuare ad entrare in Second Life,
+		Leggi attentamente i seguenti Termini di Servizio. Per continuare ad entrare in Second Life,
 devi accettare l&apos;accordo.
 	</text>
 	<text_editor name="tos_text">
diff --git a/indra/newview/skins/default/xui/it/floater_url_entry.xml b/indra/newview/skins/default/xui/it/floater_url_entry.xml
index 2968b19d80..9ad1a0dce5 100644
--- a/indra/newview/skins/default/xui/it/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/it/floater_url_entry.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="url_entry" title="">
 	<text name="media_label">
-		Media URL:
+		URL Media:
 	</text>
 	<button label="OK" name="ok_btn"/>
 	<button label="Annulla" name="cancel_btn"/>
-	<button label="Cancella" name="clear_btn"/>
+	<button label="Elimina" name="clear_btn"/>
 	<text name="loading_label">
 		In caricamento...
 	</text>
diff --git a/indra/newview/skins/default/xui/it/floater_water.xml b/indra/newview/skins/default/xui/it/floater_water.xml
index 6665d97e2a..33f91ed1c8 100644
--- a/indra/newview/skins/default/xui/it/floater_water.xml
+++ b/indra/newview/skins/default/xui/it/floater_water.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Water Floater" title="Editor avanzato dell&apos;acqua">
-	<text name="KeyFramePresetsText">
+	<text name="KeyFramePresetsText" width="224">
 		Impostazioni predeterminate dell&apos;acqua:
 	</text>
+	<combo_box left_delta="230" name="WaterPresetsCombo" width="150" />
 	<button label="Nuovo" label_selected="Nuovo" name="WaterNewPreset"/>
 	<button label="Salva" label_selected="Salva" name="WaterSavePreset"/>
 	<button label="Cancella" label_selected="Cancella" name="WaterDeletePreset"/>
@@ -11,20 +12,21 @@
 			<text name="BHText">
 				Colore della nebbiosità dell&apos;acqua
 			</text>
-			<button label="?" name="WaterFogColorHelp"/>
+			<button label="?" name="WaterFogColorHelp" left="209"/>
 			<color_swatch label="" name="WaterFogColor" tool_tip="Clicca per aprire la selezione colore"/>
-			<text name="WaterFogDensText">
-				Esponente di densità  della nebbia dell&apos;acqua
+			<text name="WaterFogDensText" font="SansSerifSmall">
+				Esponente di densità della nebbia&#10; dell&apos;acqua
 			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
-			<text name="WaterUnderWaterFogModText">
+			<slider bottom_delta="-40" name="WaterFogDensity"/>
+			<button label="?" name="WaterFogDensityHelp" left="209"/>
+			<text name="WaterUnderWaterFogModText" font="SansSerifSmall" bottom="-140">
 				Regolatore effetto nebbia subacquea
 			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
+			<button label="?" name="WaterUnderWaterFogModHelp" left="209"/>
 			<text name="BDensText">
 				Scala di riflessione delle onde
 			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
+			<button label="?" name="WaterNormalScaleHelp" left="415"/>
 			<text name="BHText2">
 				1
 			</text>
@@ -37,29 +39,31 @@
 			<text name="HDText">
 				Scala Fresnel
 			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
+			<button label="?" name="WaterFresnelScaleHelp" left="415"/>
 			<text name="FresnelOffsetText">
 				Offset Fresnel
 			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
-			<text name="DensMultText">
-				Scala di rifrazione nell&apos;acqua dall&apos;alto
+			<button label="?" name="WaterFresnelOffsetHelp" left="415"/>
+			<text name="DensMultText" font="SansSerifSmall">
+				Scala di rifrazione nell&apos;acqua&#10; dall&apos;alto
 			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
-			<text name="WaterScaleBelowText">
-				Scala di rifrazione nell&apos;acqua dal basso
+			<slider bottom_delta="-40" name="WaterScaleAbove"/>
+			<button label="?" name="WaterScaleAboveHelp" left="650"/>
+			<text name="WaterScaleBelowText" font="SansSerifSmall" bottom="-70">
+				Scala di rifrazione nell&apos;acqua&#10; dal basso
 			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
-			<text name="MaxAltText">
+			<slider bottom_delta="-40" name="WaterScaleBelow"/>
+			<button label="?" name="WaterScaleBelowHelp" left="650"/>
+			<text name="MaxAltText" bottom="-122">
 				Moltiplicatore della sfocatura
 			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
+			<button label="?" name="WaterBlurMultiplierHelp" left="650"/>
 		</panel>
 		<panel label="Immagine" name="Waves">
 			<text name="BHText">
 				Direzione della grande onda
 			</text>
-			<button label="?" name="WaterWave1Help"/>
+			<button label="?" name="WaterWave1Help" left="170"/>
 			<text name="WaterWave1DirXText">
 				X
 			</text>
@@ -69,7 +73,7 @@
 			<text name="BHText2">
 				Direzione della piccola onda
 			</text>
-			<button label="?" name="WaterWave2Help"/>
+			<button label="?" name="WaterWave2Help" left="170"/>
 			<text name="WaterWave2DirXText">
 				X
 			</text>
diff --git a/indra/newview/skins/default/xui/it/floater_windlight_options.xml b/indra/newview/skins/default/xui/it/floater_windlight_options.xml
index aa99e1d883..5076c777dc 100644
--- a/indra/newview/skins/default/xui/it/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/it/floater_windlight_options.xml
@@ -4,15 +4,15 @@
 		Cieli predefiniti:
 	</text>
 	<button label="Nuovo" label_selected="Nuovo" name="WLNewPreset"/>
-	<button label="Salva" label_selected="Salva" name="WLSavePreset"/>
-	<button label="Elimina" label_selected="Elimina" name="WLDeletePreset"/>
-	<button label="Editor del ciclo giorno/notte" label_selected="Editor del ciclo giorno/notte" name="WLDayCycleMenuButton"/>
+	<button label="Salva" label_selected="Salva" name="WLSavePreset" left_delta="72"/>
+	<button label="Elimina" label_selected="Elimina" name="WLDeletePreset" left_delta="72"/>
+	<button font="SansSerifSmall"  width="165" left_delta="85" label="Editor del ciclo giorno/notte" label_selected="Editor del ciclo giorno/notte" name="WLDayCycleMenuButton"/>
 	<tab_container name="WindLight Tabs">
 		<panel label="Atmosfera" name="Atmosphere">
 			<text name="BHText">
 				Blu dell&apos;Orizzonte
 			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
+			<button label="?" name="WLBlueHorizonHelp" left="189"/>
 			<text name="BHText2">
 				R
 			</text>
@@ -25,14 +25,14 @@
 			<text name="BHText5">
 				I
 			</text>
-			<text name="BDensText">
+			<text name="BDensText" font="SansSerifSmall">
 				Altezza della Foschia all&apos;Orizzonte
 			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
+			<button label="?" name="WLHazeHorizonHelp" left="189" />
 			<text name="BDensText2">
 				Densità del Blu
 			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
+			<button label="?" name="WLBlueDensityHelp" />
 			<text name="BHText6">
 				R
 			</text>
@@ -52,15 +52,15 @@
 			<text name="DensMultText">
 				Moltiplicatore di Densità
 			</text>
-			<button label="?" name="WLDensityMultHelp"/>
+			<button label="?" name="WLDensityMultHelp" left="645"/>
 			<text name="WLDistanceMultText">
 				Moltiplicatore della Distanza
 			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
+			<button label="?" name="WLDistanceMultHelp" left="645"/>
 			<text name="MaxAltText">
 				Altitudine Massima
 			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
+			<button label="?" name="WLMaxAltitudeHelp" left="645"/>
 		</panel>
 		<panel label="Illuminazione" name="Lighting">
 			<text name="SLCText">
@@ -151,15 +151,15 @@
 			<text name="WLCloudCoverageText">
 				Copertura delle Nuvole
 			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
+			<button label="?" name="WLCloudCoverageHelp" left="415"/>
 			<text name="WLCloudScaleText">
 				Altitudine delle Nuvole
 			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
+			<button label="?" name="WLCloudScaleHelp" left="415"/>
 			<text name="WLCloudDetailText">
 				Dettagli Nuvole (XY/ Densità)
 			</text>
-			<button label="?" name="WLCloudDetailHelp"/>
+			<button label="?" name="WLCloudDetailHelp" left="415"/>
 			<text name="BHText8">
 				X
 			</text>
@@ -170,17 +170,17 @@
 				D
 			</text>
 			<text name="WLCloudScrollXText">
-				Scorrimento delle nuvole X
+				Scorrimento delle X
 			</text>
 			<button label="?" name="WLCloudScrollXHelp"/>
 			<check_box label="Blocca" name="WLCloudLockX"/>
 			<text name="WLCloudScrollYText">
-				Scorrimento delle nuvole Y
+				Scorrimento delle Y
 			</text>
 			<button label="?" name="WLCloudScrollYHelp"/>
 			<check_box label="Blocca" name="WLCloudLockY"/>
 			<check_box label="Mostra le Nuvole Classiche" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
+			<button label="?" name="WLClassicCloudsHelp" left="645"/>
 		</panel>
 	</tab_container>
 	<string name="WLDefaultSkyNames">
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 3dd4e6a94b..5741b3931d 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -165,7 +165,9 @@
 		<menu_item_separator label="-----------" name="separator4"/>
 		<menu_item_call label="Focalizza la selezione" name="Focus on Selection"/>
 		<menu_item_call label="Fai zoom sulla selezione" name="Zoom to Selection"/>
-		<menu_item_call label="Compra l&apos;oggetto" name="Menu Object Take"/>
+		<menu_item_call label="Compra l&apos;oggetto" name="Menu Object Take">
+			<on_enable userdata="Compra,Prendi" name="EnableBuyOrTake"/>
+		</menu_item_call>
 		<menu_item_call label="Prendi una copia" name="Take Copy"/>
 		<menu_item_call label="Salva nuovamente l&apos;oggetto nel contenuto dell&apos;oggetto" name="Save Object Back to Object Contents"/>
 		<menu_item_separator label="-----------" name="separator6"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 786bfdf7ef..cc4a3e305a 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -174,7 +174,7 @@ Vuoi davvero dare i diritti di modifica ai residenti selezionati?
 Non si possono rimuovere membri da quel ruolo.
 I membri devono dimettersi volontariamente dal ruolo.
 Confermi l&apos;operazione?
-		<usetemplate ignoretext="Quando si aggiungono membri al ruolo di proprietario" name="okcancelignore" notext="No" yestext="Si"/>
+		<usetemplate ignoretext="Quando si aggiungono membri al ruolo di proprietario del gruppo." name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="AssignDangerousActionWarning">
 		Stai per aggiungere il potere &apos;[ACTION_NAME]&apos; al ruolo &apos;[ROLE_NAME]&apos;.
@@ -195,7 +195,7 @@ Aggiungi questo potere a &apos;[ROLE_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="ClickPublishHelpLand">
-		Selezionare &quot;Pubblica in Ricerca&quot;
+		Selezionare &apos;Pubblica in Ricerca&apos;
 Marcando questo campo si mostrerà:
 - questo terreno nei risultati di ricerca
 - gli oggetti pubblici di questo terreno
@@ -225,7 +225,7 @@ Marcando questo campo si mostrerà:
 		Non puoi rendere questo terreno visibile nella ricerca perchè è in una regione che non lo consente.
 	</notification>
 	<notification name="ClickPublishHelpAvatar">
-		Scegliendo &quot;Mostra in Ricerca&quot; verrà mostrato:
+		Scegliendo &apos;Mostra in Ricerca&apos; verrà mostrato:
 - il mio profilo nei risultati della ricerca
 - un link al mio profilo nelle pagine pubbliche del gruppo
 	</notification>
@@ -383,7 +383,7 @@ Hai bisogno di un account per entrare in [SECOND_LIFE]. Ne vuoi creare uno adess
 Compila il tuo annuncio e clicca &apos;Pubblica...&apos; per aggiungerlo al database.
 Ti verrà chiesto un prezzo da pagare quando clicchi su Pubblica.
 Pagare un prezzo più alto fa sì che il tuo annuncio compaia più in alto nella lista, e che sia più facile da trovare quando la gente ricerca per parole chiavi.
-		<usetemplate ignoretext="Mentre si aggiunge un annuncio" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		<usetemplate ignoretext="Quando si aggiunge una inserzione." name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="DeleteClassified">
 		Cancella annuncio &apos;[NAME]&apos;?
@@ -493,14 +493,14 @@ Vuoi visitare [_URL] per maggiori informazioni?
 		<url name="url" option="0">
 			http://secondlife.com/support/sysreqs.php?lang=it
 		</url>
-		<usetemplate ignoretext="Mentre sto individuando hardware non supportato" name="okcancelignore" notext="No" yestext="Si"/>
+		<usetemplate ignoretext="Quando sto individuando hardware non supportato." name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="UnknownGPU">
 		Il tuo sistema contiene una scheda grafica che attualmente non supportiamo.
 Questo succede spesso con nuovi prodotti che non siamo riusciti a verificare. Probabilmente Second Life funzionerà correttamente ma forse dovrai modificare le impostazioni grafiche in modo appropriato.
 (Modifica &gt; Preferenze &gt; Grafica).
 		<form name="form">
-			<ignore name="ignore" text="Mentre stavo valutando una scheda grafica sconosciuta"/>
+			<ignore name="ignore" text="Quando sto valutando una scheda grafica sconosciuta"/>
 		</form>
 	</notification>
 	<notification name="DisplaySettingsNoShaders">
@@ -736,7 +736,7 @@ Spiacenti, ma non hai accesso nel luogo di destinazione richiesto.
 Gli oggetti da te indossati non sono ancoa arrivati. Attendi ancora qualche secondo o scollegati e ricollegati prima di provare a teleportarti.
   </notification>
   <notification name="too_many_uploads_tport">
-La gestione dati della regione è al momento occupata e la tua richiesta di teletrasporto non può essere soddisfatta entro breve tempo. Per favore prova di nuovo tra qualche minuto o spostati in un&apos;area meno affollata.
+Il server della regione è al momento occupato e la tua richiesta di teletrasporto non può essere soddisfatta entro breve tempo. Per favore prova di nuovo tra qualche minuto o spostati in un&apos;area meno affollata.
   </notification>
   <notification name="expired_tport">
 Spiacenti, il sistema non riesce a soddisfare la tua richiesta di teletrasporto entro un tempo ragionevole. Riprova tra qualche minuto.
@@ -1127,7 +1127,7 @@ Il tuo avatar è stato spostato in una regione vicina.
 		I tuoi vestiti stanno ancora scaricandosi.
 Puoi usare [SECOND_LIFE] normalmente e gli altri utenti ti vedranno correttamente.
 		<form name="form">
-			<ignore name="ignore" text="se gli abiti ci impiegano troppo tempo a scaricarsi"/>
+			<ignore name="ignore" text="Qualora gli abiti impieghino troppo tempo a caricarsi."/>
 		</form>
 	</notification>
 	<notification name="FirstRun">
@@ -1150,9 +1150,9 @@ Puoi controllare la tua connessione internet e riprovare fra qualche minuto, opp
 	<notification name="WelcomeChooseSex">
 		Il tuo avatar apparirà fra un attimo.
 
-Usa le frecce per camminare.
-Premi F1 in qualunque momento per aiuto o per apprendere altre cose su [SECOND_LIFE].
-Scegli l&apos;avatar maschile o femminile. Puoi sempre cambiare idea più tardi.
+Usa le frecce per muoverti.
+Premi F1 in qualunque momento per la guida o per apprendere altre cose di [SECOND_LIFE].
+Scegli un avatar maschile o femminile. Puoi sempre cambiare idea più tardi.
 		<usetemplate name="okcancelbuttons" notext="Femminile" yestext="Maschile"/>
 	</notification>
 	<notification name="NotEnoughCurrency">
@@ -1190,13 +1190,13 @@ Scegli solo un oggetto e riprova.
 		Impossibile impostare le texture della regione:
 La texture del terreno [TEXTURE_NUM] ha una profondità di bit pari a [TEXTURE_BIT_DEPTH] non corretta.
 
-Sostituisci la texture [TEXTURE_NUM] con una a 24-bit 512x512 o una immagine più piccola e quindi clicca nuovamente su &quot;Applica&quot;.
+Sostituisci la texture [TEXTURE_NUM] con una a 24-bit 512x512 o una immagine più piccola e quindi clicca nuovamente su &apos;Applica&apos;.
 	</notification>
 	<notification name="InvalidTerrainSize">
 		Impossibile impostare le texture di regione:
 La texture del terreno [TEXTURE_NUM] è troppo grande se a [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
 
-Sostituisci la texture [TEXTURE_NUM] con una a 24-bit 512x512 oppure con una immagine più piccola e quindi clicca di nuovo &quot;Applica&quot;.
+Sostituisci la texture [TEXTURE_NUM] con una a 24-bit 512x512 oppure con una immagine più piccola e quindi clicca di nuovo &apos;Applica&apos;.
 	</notification>
 	<notification name="RawUploadStarted">
 		Importazione iniziata. Può impiegare fino a due minuti, a seconda della velocità della tua connessione.
@@ -1285,53 +1285,53 @@ Vuoi avviarne lo scaricamento nella tua cartella applicazioni?
 	<notification name="DeedObjectToGroup">
 		La cessione di questo oggetto farà in modo che il gruppo:
 * Riceva i L$ pagati all&apos;oggetto
-		<usetemplate ignoretext="Quando cedi oggetti ai gruppi" name="okcancelignore" notext="Annulla" yestext="Cedi"/>
+		<usetemplate ignoretext="Quando cedi oggetti ai gruppi." name="okcancelignore" notext="Annulla" yestext="Cedi"/>
 	</notification>
 	<notification name="WebLaunchExternalTarget">
 		Apri il tuo browser web per vedere questo contenuto?
-		<usetemplate ignoretext="Quando apri il browser di sistema per vedere una pagina web" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		<usetemplate ignoretext="Quando apri il browser di sistema per vedere una pagina web." name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchJoinNow">
 		Vuoi andare su www.secondlife.com per gestire il tuo account?
-		<usetemplate ignoretext="Quando lanci il browser web per gestire il tuo account" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		<usetemplate ignoretext="Quando lanci il browser web per gestire il tuo account." name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchBugReport101">
 		Visita la Wiki di [SECOND_LIFE] per imparare a segnalare un bug correttamente.
-		<usetemplate ignoretext="Quando lanci il browser web per vedere la Wiki di segnalazione bug base" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		<usetemplate ignoretext="Quando lanci il browser web per vedere come segnalare bug nella wiki." name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchSecurityIssues">
 		Visita la Wiki di [SECOND_LIFE] per i dettagli su come segnalare un problema di sicurezza.
-		<usetemplate ignoretext="Quando lanci il browser web per vedere la Wiki sui problemi di sicurezza" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		<usetemplate ignoretext="Quando lanci il browser web per vedere la Wiki sui problemi di sicurezza." name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchQAWiki">
 		Visita il controllo di qualità Wiki [SECOND_LIFE].
-		<usetemplate ignoretext="Quando lanci il browser web per vedere il controllo di qualità Wiki" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		<usetemplate ignoretext="Quando lanci il browser web per vedere il controllo di qualità Wiki." name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchPublicIssue">
 		Visita il registro pubblico dei problemi di [SECOND_LIFE], dove puoi segnalare bug ed altri problemi.
-		<usetemplate ignoretext="Quando lanci il browser web per vedere il registro pubblico dei problemi" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
+		<usetemplate ignoretext="Quando lanci il browser web per vedere il registro pubblico dei problemi." name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
 	</notification>
 	<notification name="WebLaunchPublicIssueHelp">
 		Visita la Wiki di [SECOND_LIFE] per le informazioni su come usare il registro pubblico dei problemi.
-		<usetemplate ignoretext="Quando lanci il browser web per vedere la Wiki del registro pubblico dei problemi" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
+		<usetemplate ignoretext="Quando lanci il browser web per vedere la Wiki del registro pubblico dei problemi." name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
 	</notification>
 	<notification name="WebLaunchSupportWiki">
 		Vai al blog ufficiale Linden, per le ultime notizie ed informazioni.
-		<usetemplate ignoretext="Quando lanci il browser web per vedere il blog" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		<usetemplate ignoretext="Quando lanci il browser web per vedere il blog." name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchLSLGuide">
 		Vai alla guida dello scripting per l&apos;aiuto sullo scripting?
-		<usetemplate ignoretext="Quando lanci il browser web per vedere la guida dello scripting" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		<usetemplate ignoretext="Quando lanci il browser web per vedere la guida dello scripting." name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchLSLWiki">
 		Vai al portale LSL per aiuto sullo scripting?
-		<usetemplate ignoretext="Quando lanci il browser web per vedere il portale LSL" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
+		<usetemplate ignoretext="Quando lanci il browser web per vedere il portale LSL." name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
 	</notification>
 	<notification name="ReturnToOwner">
 		Confermi di voler restituire gli oggetti selezionati ai loro proprietari? Gli oggetti trasferibili ceduti al gruppo, verranno restituiti ai proprietari precedenti.
 
 *ATTENZIONE* Gli oggetti ceduti non trasferibili verranno cancellati!
-		<usetemplate ignoretext="Quando restituisci gli oggetti ai loro proprietari" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		<usetemplate ignoretext="Quando restituisci gli oggetti ai loro proprietari." name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="GroupLeaveConfirmMember">
 		Sei attualmente un membro del gruppo [GROUP].
@@ -1369,7 +1369,7 @@ Vuoi cancellare quell&apos;elemento?
 	<notification name="BusyModeSet">
 		Impostata la modalità &apos;Occupato&apos;.
 La chat e i messaggi verranno nascosti. I messaggi IM riceveranno la risposta impostata per la modalità &apos;Occupato&apos;. Tutte le offerte di teleport verranno declinate. Tutte le offerte di inventario andranno nel cestino.
-		<usetemplate ignoretext="Quando si imposta la modalità occupato" name="okignore" yestext="OK"/>
+		<usetemplate ignoretext="Quando imposti la modalità &apos;occupato&apos;." name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Sei membro di troppi gruppi per poterti unire ad uno nuovo.
@@ -1442,7 +1442,7 @@ Per abbandonare un gruppo seleziona l&apos;opzione &apos;Gruppi..&apos; dal menu
 	</notification>
 	<notification name="TeleportFromLandmark">
 		Confermi di volerti teleportare?
-		<usetemplate ignoretext="Quando ti teleporti da un landmark nell&apos;inventario" name="okcancelignore" notext="Annulla" yestext="Teleportati"/>
+		<usetemplate ignoretext="Quando ti teleporti da un landmark dell&apos;inventario." name="okcancelignore" notext="Annulla" yestext="Teleportati"/>
 	</notification>
 	<notification label="Manda un messaggio a tutti nella tua proprietà" name="MessageEstate">
 		Scrivi un annuncio breve che verrà mandato a tutti quelli che sono in questo momento nella tua proprietà.
@@ -1526,7 +1526,7 @@ Vuoi andare alla Knowledge Base per ulteriori informazioni sulle categorie di ac
      name="okcancelignore"
      yestext="Vai alla Knowledge Base"
 	 notext="Chiudi"
-	 ignoretext="Quando l&apos;entrata nella regione è bloccata a causa delle categorie di accesso"/>
+	 ignoretext="Quando l&apos;entrata nella regione è bloccata a causa delle categorie di accesso."/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
 		Non sei ammesso in questa regione a causa della tua categoria d&apos;accesso.
@@ -1543,7 +1543,7 @@ Puoi cliccare su &apos;Cambia le preferenze&apos; per aumentare subito le tue pr
        default="true"
        name="Cancel"
        text="Chiudi"/>
-       <ignore name="ignore" text="Quando l&apos;entrata nella regione è bloccata a causa delle preferenze sulle categorie di accesso"/>
+       <ignore name="ignore" text="Quando l&apos;entrata in una regione è bloccata a causa delle preferenze delle categorie di accesso."/>
     </form>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
@@ -1565,7 +1565,7 @@ Vuoi andare alla Knowledge Base per maggiori informazioni sulle categorie di acc
      name="okcancelignore"
      yestext="Vai alla Knowledge Base"
 	 notext="Chiudi"
-	 ignoretext="Quando la presa di possesso della terra è bloccata a causa delle categorie di accesso"/>
+	 ignoretext="Quando l&apos;acquisizione della terra è bloccata a causa delle categorie di accesso."/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
 		Non puoi prendere possesso di questa terra a causa della tua categoria di accesso.
@@ -1578,7 +1578,7 @@ Puoi cliccare su &apos;Cambia le preferenze&apos; per aumentare subito le tue pr
      name="okcancelignore"
      yestext="Cambia le preferenze"
 	 notext="Chiudi"
-	 ignoretext="Quando la presa di possesso della terra è bloccata a causa delle preferenze sulle categorie di accesso"/>
+	 ignoretext="Quando l&apos;acquisizione della terra è bloccata a causa delle preferenze delle categorie di accesso."/>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
 		Non puoi acquistare questo terreno a causa della tua categoria di accesso. Questo può essere dovuto ad una mancanza di informazioni valide che confermino la tua età.
@@ -1599,7 +1599,7 @@ Vuoi andare alla Knowledge Base per maggiori informazioni sulle categorie di acc
      name="okcancelignore"
      yestext="Vai alla Knowledge Base"
 	 notext="Chiudi"
-	 ignoretext="Quando un acquisto di terra è bloccato a causa delle categorie di accesso"/>
+	 ignoretext="Quando un acquisto di terra è bloccato a causa delle categorie di accesso."/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
 		Non puoi acquistare questa land a causa della tua categoria di accesso.
@@ -1612,7 +1612,7 @@ Puoi cliccare su &apos;Cambia le preferenze&apos; per aumentare subito le tue pr
      name="okcancelignore"
      yestext="Cambia le preferenze"
 	 notext="Chiudi"
-	 ignoretext="Quando un acquisto di terra è bloccato a causa delle preferenze sulle categorie di accesso"/>
+	 ignoretext="Quando un acquisto di terra è bloccato a causa delle preferenze sulle categorie di accesso."/>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		&quot;Hai selezionato troppi prims.  Seleziona [MAX_PRIM_COUNT] o meno prims e riprova.&quot;
@@ -1757,9 +1757,9 @@ Se questa opzione è selezionato i compratori possono rivendere i loro terreni i
 Impostazione base: Non consentire
 	</notification>
 	<notification label="Disabilita gli script" name="HelpRegionDisableScripts">
-		Se le prestazioni di una sim sono basse, probabilmente è colpa di uno script. Apri la &apos;barra delle statistiche&apos; (Ctrl-Shift-1). Controlla il FPS della fisica del simulatore.
-Se è più basso di 45, apri il pannello &quot;Tempi&quot; collocato ln fondo alla &apos;barra delle statistiche&apos; 
-Se il tempo per gli script è di 25 ms o più alto, clicca sul bottone &apos;individua script pesanti&apos;. Ti verrà dato il nome e l&apos;ubicazione degli script che probabilmente causano una cattiva prestazione.
+		Se le prestazioni di una sim sono basse, probabilmente è colpa di uno script. Apri la &apos;Barra delle statistiche&apos; (Ctrl-Shift-1). Controlla il FPS della fisica del simulatore.
+Se è più basso di 45, apri il pannello &apos;Time&apos; (Tempi) collocato ln fondo alla &apos;Barra delle statistiche&apos; 
+Se il tempo per gli script è di 25 ms o più alto, clicca sul bottone &apos;Visualizza l&apos;elenco degli script più pesanti...&apos;. Ti verrà dato il nome e l&apos;ubicazione degli script che probabilmente causano una cattiva prestazione.
 
 Selezionare la casella della disabilitazione script e, premendo il bottone applica, disabilitare temporaneamente tutti gli script in questa regione. Questo è necessario per poterti recare verso l&apos;ubicazione dello script definito nell&apos;elenco come &apos;script più pesante&apos;. Una volta arrivato all&apos;oggetto, studia lo script per capire se è quello che sta causando il problema. Potresti dover contattare il proprietario dello script oppure cancellare o restituire l&apos;oggetto.
 Disabilita la casella e quindi premere applica per riattivare gli script nella regione.
@@ -1768,10 +1768,10 @@ Impostazione base: spento
 	</notification>
 	<notification label="Disabilita le collisioni" name="HelpRegionDisableCollisions">
 		Quando le prestazioni della sim sono basse, può darsi che la colpa sia di oggetti fisici.
-Apri la &apos;barra delle statistiche&apos; (Ctrl-Shift-1).
+Apri la &apos;Barra delle statistiche&apos; (Ctrl-Shift-1).
 Controlla il FPS della fisica del simulatore.
-Se è più basso di 45, apri il pannello &quot;Tempi&quot; collocato in fondo alla &apos;barra delle statistiche&apos;.
-Se il tempo della sim (fisica) risulta 20 ms o più, clicca sul bottone &quot;mostra gli oggetti che collidono di più&quot;.
+Se è più basso di 45, apri il pannello &apos;Time&apos; (Tempi) collocato in fondo alla &apos;Barra delle statistiche&apos;.
+Se il tempo della sim (fisica) risulta 20 ms o più, clicca sul bottone &apos;mostra gli oggetti che collidono di più&apos;.
 Ti verranno dati il nome e l&apos;ubicazione degli oggetti fisici che possono causare una cattiva prestazione.
 
 Selezionare la casella disabilita collisioni e, premendo il bottone applica, disabilitare temporaneamente le collisioni oggetto-oggetto. Questo è necessario per poterti recare verso l&apos;ubicazione dell&apos;oggetto che sta collidendo eccessivamente.
@@ -1791,11 +1791,11 @@ Impostazione base: spento
 	</notification>
 	<notification label="Oggetti con maggiori collisioni" name="HelpRegionTopColliders">
 		Mostra una lista di oggetti che sperimentano la maggior quantità di potenziali collisioni oggetto-oggetto.  Questi oggetti possono abbassare le prestazioni.
-Seleziona Vista &gt; Barra Statistiche e guarda sotto Simulatore &gt; Tempi &gt; Tempo Sim (fisica) per controllare se un tempo di più di 20 ms è impiegato nella fisica.
+Seleziona Visualizza &gt; Barra della statistiche e guarda sotto Simulator (Simulatore) &gt; Time (Tempi) &gt; Physics Time (Tempo Sim fisica) per controllare se un tempo di più di 20 ms è impiegato nella fisica.
 	</notification>
 	<notification label="Script pesanti" name="HelpRegionTopScripts">
 		Mostra una lista degli oggetti che occupano la maggior parte del loro tempo eseguendo script LSL.  Questi oggetti possono abbassare le prestazioni.
-Seleziona Vista &gt; Barra statistiche e guarda sotto Simulatore &gt; Tempi &gt; Tempo Script per controllare se un tempo di più di 20 ms è impiegato per gli script.
+Seleziona Visualizza &gt; Barra della statistiche e guarda sotto Simulator (Simulatore) &gt; Time (Tempi) &gt; Script Time (Tempo Script) per controllare se un tempo di più di 20 ms è impiegato per gli script.
 	</notification>
 	<notification label="Fai ripartire la regione" name="HelpRegionRestart">
 		Fai ripartire i processi del server che gestisce questa regione dopo un avvertimento di due minuti.  Tutti i residenti nella regione verranno scollegati.
@@ -1898,7 +1898,7 @@ Impostazione base: spento
 
 Un regolamento può essere usato per comunicare regole, linee guida, informazioni culturali o semplicemente ciò che ti aspetti dal possibile compratore. Questo può includere impostazioni in zone, regolamenti architettonici, opzioni di pagamento o qualunque altra informazione che ritieni importante che il nuovo proprietario debba aver visto e accettato prima dell&apos;acquisto.
 
-Il compratore deve accettare il regolamento selezionando la casella appropriata per poter completare l&apos;acquisto. I regolamenti delle proprietà sono sempre visibili nella finestra &quot;Informazioni sul terreno&quot; in tutti gli appezzamenti in cui è stato impostato.
+Il compratore deve accettare il regolamento selezionando la casella appropriata per poter completare l&apos;acquisto. I regolamenti delle proprietà sono sempre visibili nella finestra &apos;Informazioni sul terreno&apos; in tutti gli appezzamenti in cui è stato impostato.
 	</notification>
 	<notification label="Impossibile comprare oggetti" name="BuyObjectOneOwner">
 		Impossibile comprare oggetti da proprietari diversi nello stesso momento.
@@ -1959,7 +1959,7 @@ Il contenuto verrà copiato nel tuo inventario.
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmPurchase">
-		Questa transazione farà:
+		Questa transazione ti permetterà di:
 [ACTION]
 
 Confermi di voler procedere all&apos;acquisto?
@@ -1987,19 +1987,19 @@ Hai aggiornato l&apos;ubicazione di questo preferito ma gli altri dettagli conse
 Questi elementi verranno trasferiti nel tuo inventario, ma non copiati.
 
 Trasferisci gli elementi nell&apos;inventario?
-		<usetemplate ignoretext="Quando si trasferiscono, dagli oggetti all&apos;inventario, elementi non copiabili" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		<usetemplate ignoretext="Quando si trasferiscono elementi non copiabili, dagli oggetti all&apos;inventario." name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="MoveInventoryFromScriptedObject">
 		Hai selezionato elementi dell&apos;inventario non copiabili.  Questi elementi verranno trasferiti nel tuo inventario, non verranno copiati.
 Dato che questo oggetto è scriptato, il trasferimento di questi elementi nel tuo inventario potrebbe causare un malfunzionamento degli script.
 
 Trasferisci gli elementi nell&apos;inventario?
-		<usetemplate ignoretext="Quando si trasferiscono oggetti scriptati non copiabili nell&apos;inventario" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		<usetemplate ignoretext="Quando si trasferiscono oggetti scriptati non copiabili nell&apos;inventario." name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ClickActionNotPayable">
 		Attenzione: L&apos;azione di pagamento automatico al click è stata impostata, ma funzionerà solo se aggiungi uno script con un evento money().
 		<form name="form">
-			<ignore name="ignore" text="Quando imposti il &quot;Pagamento&quot; di oggetti senza l&apos;evento money()"/>
+			<ignore name="ignore" text="Quando imposti il &apos;Pagamento&apos; di oggetti senza l&apos;evento money()"/>
 		</form>
 	</notification>
 	<notification name="OpenObjectCannotCopy">
@@ -2007,7 +2007,7 @@ Trasferisci gli elementi nell&apos;inventario?
 	</notification>
 	<notification name="WebLaunchAccountHistory">
 		Vai nel sito web di Second Life per vedere il tuo estratto conto?
-		<usetemplate ignoretext="Quando carichi la pagina web dell&apos;estratto conto" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
+		<usetemplate ignoretext="Quando carichi la pagina web dell&apos;estratto conto." name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
 	</notification>
 	<notification name="ClickOpenF1Help">
 		Visita il sito di supporto di Second Life?
@@ -2104,7 +2104,7 @@ La Linden Lab
 		C&apos;è già un oggetto indossato in questo punto del corpo.
 Vuoi sostituirlo con l&apos;oggetto selezionato?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Quando avviene la sostituzione di un oggetto indossato già esistente"/>
+			<ignore name="ignore" save_option="true" text="Quando avviene la sostituzione di un oggetto indossato già esistente."/>
 			<button name="Yes" text="OK"/>
 			<button name="No" text="Annulla"/>
 		</form>
@@ -2114,14 +2114,14 @@ Vuoi sostituirlo con l&apos;oggetto selezionato?
 
 Desideri abbandonare la modalità &apos;Occupato&apos; prima di completare questa transazione?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Quando avviene il pagamento di una persona o oggetto in modalità &apos;Occupato&apos;"/>
+			<ignore name="ignore" save_option="true" text="Quando avviene il pagamento di una persona o di un oggetto in modalità &apos;Occupato&apos;."/>
 			<button name="Yes" text="OK"/>
 			<button name="No" text="Abbandona"/>
 		</form>
 	</notification>
 	<notification name="ConfirmEmptyTrash">
 		Confermi di volere permanentemente rimuovere il contenuto del tuo cartella Cestino?
-		<usetemplate ignoretext="Quando svuoti la cartella cestino del tuo inventario" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		<usetemplate ignoretext="Quando svuoti la cartella cestino del tuo inventario." name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		Confermi di voler pulire la cache del tuo browser?
@@ -2137,7 +2137,7 @@ Desideri abbandonare la modalità &apos;Occupato&apos; prima di completare quest
 	</notification>
 	<notification name="ConfirmEmptyLostAndFound">
 		Confermi di volere rimuovere permanentemente il contenuto della tua cartalla Persi e ritrovati?
-		<usetemplate ignoretext="Quando cancelli la cartella persi e ritrovati del tuo inventario" name="okcancelignore" notext="No" yestext="Si"/>
+		<usetemplate ignoretext="Quando cancelli la cartella degli oggetti perduti e ritrovati del tuo inventario." name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="CopySLURL">
 		Lo SLURL seguente è stato copiato nei tuoi appunti:
@@ -2145,7 +2145,7 @@ Desideri abbandonare la modalità &apos;Occupato&apos; prima di completare quest
 
 Lo puoi inserire in una pagina web per dare ad altri modo di accedere a questo posto o puoi provare a copiarla nella barra indirizzi del tuo browser web.
 		<form name="form">
-			<ignore name="ignore" text="Quando copi lo SLURL negli appunti"/>
+			<ignore name="ignore" text="Quando copi uno SLURL negli appunti."/>
 		</form>
 	</notification>
 	<notification name="GraphicsPreferencesHelp">
@@ -2196,30 +2196,30 @@ Dettaglio del terreno: Imposta la quantità di dettagli che vuoi vedere per le t
 	<notification name="EnvSettingsHelpButton">
 		Queste impostazioni modificano il modo in cui l&apos;ambiente viene visto localmente sul tuo computer.  La tua scheda grafica deve supportare gli effetti atmosferici per poter accedere a tutte le impostazioni.
 
-Modifica il cursore &quot;Ora del Giorno &quot; per cambiare la fase giornaliera locale sul client.
+Modifica il cursore &apos;Ora del Giorno&apos; per cambiare la fase giornaliera locale sul client.
 
-Modifica il cursore &quot;Intensità delle nuvole&quot; per controllare la quantità di nuvole che coprono il cielo.
+Modifica il cursore &apos;Intensità delle nuvole&apos; per controllare la quantità di nuvole che coprono il cielo.
 
-Scegli un colore nella tavolozza colori per il &quot;colore dell&apos;acqua&quot; per cambiare il colore dell&apos;acqua.
+Scegli un colore nella tavolozza colori per il &apos;colore dell&apos;acqua&apos; per cambiare il colore dell&apos;acqua.
 
-Modifica il cursore &quot;Nebbiosità dell&apos;acqua&quot; per controllare quanto densa è la nebbia sott&apos;acqua.
+Modifica il cursore &apos;Nebbiosità dell&apos;acqua&apos; per controllare quanto densa è la nebbia sott&apos;acqua.
 
-Clicca &quot;Usa l&apos;ora della proprietà&quot; per sincronizzare il tempo del giorno con l&apos;ora del giorno della regione e collegarle stabilmente.
+Clicca &apos;Usa l&apos;ora della proprietà&apos; per sincronizzare il tempo del giorno con l&apos;ora del giorno della regione e collegarle stabilmente.
 
-Clicca &quot;Cielo avanzato&quot; per visualizzare un editor con le impostazioni avanzate per il cielo.
+Clicca &apos;Cielo avanzato&apos; per visualizzare un editor con le impostazioni avanzate per il cielo.
 
-Clicca &quot;Acqua Avanzata&quot; per visualizzare un editor con le impostazini avanzate per l&apos;acqua.
+Clicca &apos;Acqua Avanzata&apos; per visualizzare un editor con le impostazini avanzate per l&apos;acqua.
 	</notification>
 	<notification name="HelpDayCycle">
 		L&apos;editor del Ciclo Giorno/Notte permette di controllare il cielo durante il ciclo giornaliero di Second Life. Questo è il ciclo che è usato dal cursore dell&apos;editor base dell&apos;ambiente.
 
-L&apos;editor del ciclo giorno/notte funziona impostando i fotogrammi chiave. Questi sono nodi (rappresentati da tacche grige sul grafico temporale) che hanno delle preregolazioni associate del cielo. Man mano che l&apos;ora del giorno procede, il cielo di WindLight&quot;si anima&quot; interpolando i valori fra questi fotogrammi chiave.
+L&apos;editor del ciclo giorno/notte funziona impostando i fotogrammi chiave. Questi sono nodi (rappresentati da tacche grige sul grafico temporale) che hanno delle preregolazioni associate del cielo. Man mano che l&apos;ora del giorno procede, il cielo di WindLight&apos;si anima&apos; interpolando i valori fra questi fotogrammi chiave.
 
 La freccia gialla sopra la linea del tempo rappresenta la tua vista corrente, basata sull&apos;ora del giorno. Cliccandola e spostandola vedrai come il giorno si animerebbe. Si può aggiungere o cancellare fotogrammi chiave cliccando sui tasti &apos;Aggiungi Fotogramma Chiave&apos; e &apos;Cancella Fotogramma Chiave&apos; alla destra della linea del tempo.
 
 Si possono impostare le posizioni temporali dei fotogrammi chiave spostandole lungo la linea del tempo o impostando il loro valore a mano nella finestra di impostazione dei fotogrammi chiave. All&apos;interno della finestra di impostazione si può associare il fotogramma chiave con le impostazioni corrispondenti di Wind Light.
 
-La durata del ciclo definisce la durata complessiva di un &quot;giorno&quot;. Impostando questo ad un valore basso (per esempio, 2 minuti) tutto il ciclo di 24 ore verrà completato in solo 2 minuti reali! Una volta soddisfatto dell tua linea del tempo e le impostazioni dei fotogrammi chiave, usa i bottoni Play e Stop per vederne in anteprima i risultati. Attenzione: si può sempre spostare la freccia gialla indicatrice del tempo sopra la linea del tempo per vedere il ciclo animarsi interattivamente. Scegliendo invece il pulsanto &apos;Usa il tempo della regione&apos; ci si sincronizza con il le durate del ciclo definite per questa regione.
+La durata del ciclo definisce la durata complessiva di un &apos;giorno&apos;. Impostando questo ad un valore basso (per esempio, 2 minuti) tutto il ciclo di 24 ore verrà completato in solo 2 minuti reali! Una volta soddisfatto dell tua linea del tempo e le impostazioni dei fotogrammi chiave, usa i bottoni Play e Stop per vederne in anteprima i risultati. Attenzione: si può sempre spostare la freccia gialla indicatrice del tempo sopra la linea del tempo per vedere il ciclo animarsi interattivamente. Scegliendo invece il pulsanto &apos;Usa il tempo della regione&apos; ci si sincronizza con il le durate del ciclo definite per questa regione.
 
 Una volta soddisfatto del ciclo giornaliero, puoi salvarlo o ricaricarlo con i bottoni &apos;Salva test del giorno&apos; e &apos;Carica il test del giorno&apos;. Attualmente è possibile definire un solo ciclo giorno/notte
 	</notification>
@@ -2239,7 +2239,7 @@ E&apos; utile per simulare scene con un livello alto di fumo e di inquinamento d
 E&apos; anche utile per simulare la nebbia e la foschia al mattino.
 	</notification>
 	<notification name="HelpDensityMult">
-		Il moltiplicatore di densità può essere usato per influenzare la densità atmosferica generale. Con valori bassi, crea la sensazione di &quot;aria sottile&quot;, con valori alti crea un effetto molto pesante, annebbiato.
+		Il moltiplicatore di densità può essere usato per influenzare la densità atmosferica generale. Con valori bassi, crea la sensazione di &apos;aria sottile&apos;, con valori alti crea un effetto molto pesante, annebbiato.
 	</notification>
 	<notification name="HelpDistanceMult">
 		Modifica la distanza percepita da WindLight.
@@ -2248,7 +2248,7 @@ Valori più grandi di 1 simulano distanze più grandi per effetti atmosferici pi
 	</notification>
 	<notification name="HelpMaxAltitude">
 		Altitudine Massima modifica i calcoli di altezza che fa WindLight quando calcola l&apos;illuminazione atmosferica.
-In periodi successivi del giorno, è utile per modificare quanto &quot;profondo&quot; appaia il tramonto.
+In periodi successivi del giorno, è utile per modificare quanto &apos;profondo&apos; appaia il tramonto.
 	</notification>
 	<notification name="HelpSunlightColor">
 		Modifica il colore e l&apos;intensità della luce diretta nella scena.
@@ -2257,8 +2257,8 @@ In periodi successivi del giorno, è utile per modificare quanto &quot;profondo&
 		Modifica il colore e l&apos;intensità della luce atmosferica ambientale nella scena.
 	</notification>
 	<notification name="HelpSunGlow">
-		Il cursore Dimensione controlla la dimensione del sole.
-Lo slider &quot;Focus&quot; controlla quanto è offuscato il sole sopra il cielo.
+		Il cursore Grandezza controlla la dimensione del sole.
+Il cursore Focus controlla quanto è offuscato il sole sopra il cielo.
 	</notification>
 	<notification name="HelpSceneGamma">
 		Modifica la distribuzione di luci e ombre nello schermo.
@@ -2392,7 +2392,7 @@ D (Densità) controlla quanto gonfie o spezzettate appaiono le nuvole.
 	</notification>
 	<notification name="AutoWearNewClothing">
 		Vuoi indossare automaticamente i vestiti che crei?
-		<usetemplate ignoretext="Indossa automaticamente i nuovi vestiti." name="okcancelignore" notext="No" yestext="Si"/>
+		<usetemplate ignoretext="Quando Indossi automaticamente nuovi vestiti." name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="NotAgeVerified">
 		La tua età deve essere verificata per poter entrare in questo territorio.
@@ -2402,7 +2402,7 @@ Vuoi visitare il sito di Second Life per verificare la tua eta?
 		<url name="url" option="0">
 			https://secondlife.com/account/verification.php
 		</url>
-		<usetemplate ignoretext="Avviso per mancanza della verifica dell&apos;età" name="okcancelignore" notext="No" yestext="Si"/>
+		<usetemplate ignoretext="Quando hai un avviso per mancanza della verifica dell&apos;età." name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Questo terreno richiede che tu abbia registrato le tue informazioni di pagamento prima che tu possa accedervi.
@@ -2412,7 +2412,7 @@ Vuoi visitare il sito di Second Life per impostarle?
 		<url name="url" option="0">
 			https://secondlife.com/account/index.php?lang=it
 		</url>
-		<usetemplate ignoretext="Avviso per mancanza di informazioni di pagamento registrato" name="okcancelignore" notext="No" yestext="Si"/>
+		<usetemplate ignoretext="Quando hai un avviso per mancanza di informazioni di pagamento registrate." name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="MissingString">
 		La stringa [STRING_NAME] non è presente in strings.xml
@@ -2673,7 +2673,7 @@ Vai alla &apos;Help Island Public&apos; per ripetere il tutorial.
 	<notification name="ImproperPaymentStatus">
 		Non hai una impostazioni di pagamento corrette per entrare in questa regione.
 	</notification>
-	<notification name="MustGetAgeRgion">
+	<notification name="MustGetAgeRegion">
 		Devi avere un&apos;età verificata per entrare in questa regione.
 	</notification>
 	<notification name="MustGetAgeParcel">
diff --git a/indra/newview/skins/default/xui/it/panel_friends.xml b/indra/newview/skins/default/xui/it/panel_friends.xml
index 78e0d542f3..e2eb3dd6e7 100644
--- a/indra/newview/skins/default/xui/it/panel_friends.xml
+++ b/indra/newview/skins/default/xui/it/panel_friends.xml
@@ -16,5 +16,5 @@
 	<button label="Teleport..." name="offer_teleport_btn" tool_tip="Offri a questo amico un teleport per dove sei tu ora"/>
 	<button label="Paga..." name="pay_btn" tool_tip="Dai Linden dollar (L$) a questo amico"/>
 	<button label="Rimuovi..." name="remove_btn" tool_tip="Rimuovi questa persona dalla tua lista amici"/>
-	<button label="Aggiungi come amico..." name="add_btn" tool_tip="Offri amicizia ad un residente"/>
+	<button label="Aggiungi..." name="add_btn" tool_tip="Offri amicizia ad un residente"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml
index cc044a2e56..2c04ec776c 100644
--- a/indra/newview/skins/default/xui/it/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_general.xml
@@ -48,7 +48,7 @@ Passa il mouse sulle opzioni per un aiuto aggiuntivo.
 		<check_box label="Mostra nella ricerca" name="show_in_group_list" tool_tip="Lascia che i residenti vedano questo gruppo nella ricerca."/>
 		<check_box label="Iscrizione libera" name="open_enrollement" tool_tip="Imposta se questo gruppo permette ai nuovi membri di unirsi senza essere invitati."/>
 		<check_box label="Tassa di iscrizione: L$" name="check_enrollment_fee" tool_tip="Imposta se richiedere una tassa di iscrizione per unirsi al gruppo."/>
-		<spinner name="spin_enrollment_fee" tool_tip="I nuovi membri devono pagare questa tassa per unirsi al gruppo. La tassa di iscrizione è selezionata."/>
+		<spinner width="60" left_delta="136" name="spin_enrollment_fee" tool_tip="I nuovi membri devono pagare questa tassa per unirsi al gruppo. La tassa di iscrizione è selezionata."/>
 		<combo_box name="group_mature_check" tool_tip="Imposta se le informazioni sul tuo gruppo sono da considerarsi Mature.">
 			<combo_item name="select_mature">
 				- Seleziona -
diff --git a/indra/newview/skins/default/xui/it/panel_group_invite.xml b/indra/newview/skins/default/xui/it/panel_group_invite.xml
index d75b3a46e8..cc426f7cd2 100644
--- a/indra/newview/skins/default/xui/it/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_invite.xml
@@ -2,8 +2,8 @@
 <panel label="Invita una persona" name="invite_panel">
 	<text name="help_text">
 		Puoi selezionare più di un residente 
-da invitare nel tuo gruppo. Clicca su &apos;Scelta
-residenti&apos; per iniziare.
+da invitare nel tuo gruppo. Clicca su
+&apos;Scelta residenti&apos; per iniziare.
 	</text>
 	<button label="Scelta residenti" name="add_button" tool_tip=""/>
 	<name_list name="invitee_list" tool_tip="Tieni premuto il tasto ctrl e clicca i nomi dei residenti per avere una selezione multipla."/>
diff --git a/indra/newview/skins/default/xui/it/panel_group_land_money.xml b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
index 907ce8ea5a..5f54d8cd25 100644
--- a/indra/newview/skins/default/xui/it/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
@@ -13,7 +13,7 @@
 	<string name="loading_txt">
 		Attendi...
 	</string>
-	<text name="group_land_heading">
+	<text name="group_land_heading" width="250">
 		Terra posseduta dal gruppo
 	</text>
 	<scroll_list name="group_parcel_list">
@@ -22,24 +22,24 @@
 		<column label="Tipo" name="type"/>
 		<column label="Area" name="area"/>
 	</scroll_list>
-	<button label="Mostra sulla mappa" label_selected="Mostra sulla mappa" name="map_button"/>
+	<button label="Mostra sulla mappa" label_selected="Mostra sulla mappa" name="map_button" left="282" width="130"/>
 	<text name="total_contributed_land_label">
 		Total Contribution:
 	</text>
 	<text name="total_contributed_land_value">
-		[AREA] metri quadri
+		[AREA] m²
 	</text>
 	<text name="total_land_in_use_label">
 		Terra totale in uso:
 	</text>
 	<text name="total_land_in_use_value">
-		[AREA] metri quadri
+		[AREA] m²
 	</text>
 	<text name="land_available_label">
 		Terra disponibile:
 	</text>
 	<text name="land_available_value">
-		[AREA] metri quadri
+		[AREA] m²
 	</text>
 	<text name="your_contribution_label">
 		Il tuo contributo:
@@ -48,10 +48,11 @@
 		Non è possibile impostare i tuoi contributi in terra.
 	</string>
 	<text name="your_contribution_max_value">
-		metri quadri ([AMOUNT] massimo)
+		m² ([AMOUNT] massimo)
 	</text>
 	<text name="group_over_limit_text">
-		I membri del gruppo devono contribuire con più crediti per mantenere la quantità  di terra in uso.
+		I membri del gruppo devono contribuire con più crediti per mantenere
+la quantità  di terra in uso.
 	</text>
 	<text name="group_money_heading">
 		L$ del gruppo
@@ -66,15 +67,15 @@
 			<text_editor name="group_money_details_text">
 				Calcolo...
 			</text_editor>
-			<button label="&lt; Precedente" label_selected="&lt; Precedente" name="earlier_details_button" tool_tip="Vai ai dettagli precedenti"/>
-			<button label="Successivo &gt;" label_selected="Successivo &gt;" name="later_details_button" tool_tip="Vai ai dettagli successivi"/>
+			<button width="90" label="&lt; Precedente" label_selected="&lt; Precedente" name="earlier_details_button" tool_tip="Vai ai dettagli precedenti"/>
+			<button left_delta="260" width="90" label="Successivo &gt;" label_selected="Successivo &gt;" name="later_details_button" tool_tip="Vai ai dettagli successivi"/>
 		</panel>
 		<panel label="Vendite" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
 				Calcolo...
 			</text_editor>
-			<button label="&lt; Precedente" label_selected="&lt; Precedente" name="earlier_sales_button" tool_tip="Vai ai dettagli precedenti"/>
-			<button label="Successivo &gt;" label_selected="Successivo &gt;" name="later_sales_button" tool_tip="Vai ai dettagli successivi"/>
+			<button width="90" label="&lt; Precedente" label_selected="&lt; Precedente" name="earlier_sales_button" tool_tip="Vai ai dettagli precedenti"/>
+			<button left_delta="260" width="90" label="Successivo &gt;" label_selected="Successivo &gt;" name="later_sales_button" tool_tip="Vai ai dettagli successivi"/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_notices.xml b/indra/newview/skins/default/xui/it/panel_group_notices.xml
index 7f1f37d67e..6bf0f1e8c0 100644
--- a/indra/newview/skins/default/xui/it/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_notices.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Notice" name="notices_tab">
 	<string name="help_text">
-		Le notice sono un modo veloce per comunicare in un 
-gruppo diffondendo un messaggio e recapitando un 
-eventuale oggetto allegato. Le notice arrivano solo ai
-membri del gruppo il cui ruolo è abilitato a riceverli.
-Puoi disattivare la ricezione delle notice
-nella finestra principale.
+		Le notice sono un modo veloce per comunicare in un gruppo diffondendo un messaggio e recapitando un eventuale oggetto allegato. Le notice arrivano solo ai membri del gruppo il cui ruolo è abilitato a riceverli.
+Puoi disattivare la ricezione delle notice nella finestra principale.
 	</string>
 	<string name="no_notices_text">
 		Non ci sono vecchie notice.
@@ -16,9 +12,9 @@ nella finestra principale.
 		Archivio delle notice del gruppo
 	</text>
 	<text name="lbl2">
-		Le notice sono conservate per 14 giorni. Clicca la notice qui sotto che desideri leggere.
-Clicca il bottone &apos;Aggiorna&apos; per controllare se sono arrivate nuove notice.
-Il numero delle notice è limitato a 200 notice per gruppo al giorno.
+		Le notice sono conservate per 14 giorni. Clicca la notice qui sotto che desideri 
+leggere. Clicca il bottone &apos;Aggiorna&apos; per controllare se sono arrivate nuove 
+notice. Il numero delle notice è limitato a 200 notice per gruppo al giorno.
 	</text>
 	<scroll_list name="notice_list">
 		<column label="Oggetto" name="subject"/>
@@ -36,19 +32,22 @@ Il numero delle notice è limitato a 200 notice per gruppo al giorno.
 		</text>
 		<text name="lbl2">
 			Devi scrivere l&apos;oggetto della notice per poterla inviare.
-Puoi aggiungere un solo allegato alla notice trascinandolo
-dal tuo inventario in questa finestra. L&apos;allegato deve essere copiabile e cedibile,
-e non puoi allegare una cartella.
+Puoi aggiungere un solo allegato alla notice trascinandolo dal 
+tuo inventario in questa finestra. L&apos;allegato deve essere 
+copiabile e cedibile, e non puoi allegare una cartella.
 		</text>
-		<text name="lbl3">
+		<text name="lbl3" left="20">
 			Oggetto:
 		</text>
-		<text name="lbl4">
+		<line_editor name="create_subject" width="251" left_delta="61"/>
+		<text name="lbl4" left="15" width="60">
 			Messaggio:
 		</text>
-		<text name="lbl5">
+		<text_editor name="create_message" left_delta="66" width="330"/>
+		<text name="lbl5" width="68">
 			Allega:
 		</text>
+		<line_editor name="create_inventory_name" width="190" left_delta="74"/>
 		<button label="Rimuovi allegato" label_selected="Rimuovi allegato" name="remove_attachment"/>
 		<button label="Invia la notice" label_selected="Invia la notice" name="send_notice"/>
 		<panel name="drop_target" tool_tip="Trascina un oggetto dall&apos;inventario sulla casella del messaggio per inviarlo con la notice. Devi avere il permesso di copia e trasferimento dell&apos;oggetto per poterlo inviare con la notice."/>
@@ -58,7 +57,7 @@ e non puoi allegare una cartella.
 			Notice archiviate
 		</text>
 		<text name="lbl2">
-			Per mandare una nuova notice, clicca il bottone &apos;Crea una nuova notice&apos; qui sopra.
+			Per mandare una nuova notice, clicca &apos;Crea una nuova notice&apos; qui sopra.
 		</text>
 		<text name="lbl3">
 			Oggetto:
diff --git a/indra/newview/skins/default/xui/it/panel_group_roles.xml b/indra/newview/skins/default/xui/it/panel_group_roles.xml
index 2629b91db5..8dfdd5a46e 100644
--- a/indra/newview/skins/default/xui/it/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_roles.xml
@@ -12,8 +12,9 @@
 			Membri &amp; Ruoli
 		</text>
 		<text name="static2">
-			I membri del Gruppo hanno ricevuto ruoli con delle abilità. Queste impostazioni possono 
-essere facilmente personalizzate, permettendo una maggiore organizzazione e flessibilità.
+			I membri del Gruppo hanno ricevuto ruoli con delle abilità. Queste
+impostazioni possono essere facilmente personalizzate, permettendo 
+una maggiore organizzazione e flessibilità.
 		</text>
 	</panel>
 	<panel name="roles_header">
@@ -21,12 +22,14 @@ essere facilmente personalizzate, permettendo una maggiore organizzazione e fles
 			Ruoli
 		</text>
 		<text name="role_properties_modifiable">
-			Seleziona un ruolo qui sotto. È possibile modificarne il nome, la descrizione e il titolo.
+			Seleziona un ruolo qui sotto. È possibile modificarne il nome,
+la descrizione e il titolo.
 		</text>
 		<text name="role_properties_not_modifiable">
-			Seleziona un ruolo qui sotto per vederne le proprietà, i membri e i permessi abilitati.
+			Seleziona un ruolo qui sotto per vederne le proprietà, i membri
+e i permessi abilitati.
 		</text>
-		<text name="role_actions_modifiable">
+		<text bottom_delta="-28" name="role_actions_modifiable">
 			Puoi anche assegnare abilità al ruolo.
 		</text>
 		<text name="role_actions_not_modifiable">
@@ -42,16 +45,17 @@ essere facilmente personalizzate, permettendo una maggiore organizzazione e fles
 eseguire tali abilità.
 		</text>
 	</panel>
-	<tab_container name="roles_tab_container">
-		<panel label="Membri" name="members_sub_tab" tool_tip="Membri">
-			<button label="Cerca" name="search_button"/>
-			<button label="Mostra tutti" name="show_all_button"/>
-			<name_list name="member_list">
+	<tab_container height="164" name="roles_tab_container">
+		<panel height="148" label="Membri" name="members_sub_tab" tool_tip="Membri">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Cerca" name="search_button" width="75"/>
+			<button label="Mostra tutti" name="show_all_button" left_delta="80"/>
+			<name_list name="member_list" bottom_delta="-105" height="104" >
 				<column label="Nome del membro" name="name"/>
 				<column label="Contributo donato" name="donated"/>
 				<column label="Ultimo accesso" name="online"/>
 			</name_list>
-			<button label="Invita un nuovo membro ..." name="member_invite"/>
+			<button label="Invita un nuovo membro..." name="member_invite" width="165"/>
 			<button label="Espellere dal gruppo" name="member_eject"/>
 			<string name="help_text">
 				Puoi aggiungere o rimuovere i ruoli assegnati ai membri. 
@@ -59,10 +63,11 @@ Seleziona più membri tenendo premuto il tasto Ctrl e
 cliccando sui loro nomi.
 			</string>
 		</panel>
-		<panel label="Ruoli" name="roles_sub_tab">
-			<button label="Cerca" name="search_button"/>
-			<button label="Mostra tutti" name="show_all_button"/>
-			<scroll_list name="role_list">
+		<panel height="148" label="Ruoli" name="roles_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Cerca" name="search_button" width="75"/>
+			<button label="Mostra tutti" name="show_all_button" left_delta="80"/>
+			<scroll_list name="role_list" bottom_delta="-104" height="104">
 				<column label="Nome del ruolo" name="name"/>
 				<column label="Titolo" name="title"/>
 				<column label="Membri" name="members"/>
@@ -79,10 +84,11 @@ compresi il ruolo base o &apos;Membro&apos; e il ruolo del Capogruppo.
 				I ruoli &apos;Membro&apos; e &apos;Capogruppo&apos; sono ruoli speciali e non possono essere eliminati.
 			</string>
 		</panel>
-		<panel label="Abilità" name="actions_sub_tab">
-			<button label="Cerca" name="search_button"/>
-			<button label="Visualizza tutto" name="show_all_button"/>
-			<scroll_list name="action_list" tool_tip="Seleziona una abilità per vederne maggiori dettagli."/>
+		<panel height="148" label="Abilità" name="actions_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Cerca" name="search_button" width="75"/>
+			<button label="Visualizza tutto" name="show_all_button" left_delta="80"/>
+			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Seleziona una abilità per vederne maggiori dettagli."/>
 			<string name="help_text">
 				Le abilità permettono ai membri nei ruoli di fare cose specifiche
 in questo gruppo. C&apos;è una vasta gamma di abilità.
diff --git a/indra/newview/skins/default/xui/it/panel_groups.xml b/indra/newview/skins/default/xui/it/panel_groups.xml
index 75bccb71a3..43fd36710e 100644
--- a/indra/newview/skins/default/xui/it/panel_groups.xml
+++ b/indra/newview/skins/default/xui/it/panel_groups.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="groups">
-	<text name="groupdesc">
-		Il tuo gruppo attualmente attivo è visualizzato in grassetto.
+	<scroll_list bottom="50" name="group list"/>
+	<text bottom="16" height="32" name="groupdesc" width="268">
+		Il tuo gruppo attualmente attivo è visualizzato
+in grassetto.
 	</text>
-	<text name="groupcount">
-		Appartieni a [COUNT] gruppi (su un massimo di [MAX]).
+	<text bottom="3" name="groupcount" width="268">
+		Appartieni a [COUNT] gruppo/i (su un massimo di [MAX]).
 	</text>
 	<button label="IM/Chiama" name="IM" tool_tip="Apri una sessione di IM/Instant Messages"/>
 	<button label="Informazioni" name="Info"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index fd20b11c02..26ee03e0eb 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -49,7 +49,7 @@ chat:
 	<check_box label="Chiudi la barra chat dopo aver premuto invio" name="close_chat_on_return_check"/>
 	<check_box label="Le frecce muovono comunque l&apos;avatar quando si sta scrivendo" name="arrow_keys_move_avatar_check"/>
 	<check_box label="Mostra orario nella chat principale" name="show_timestamps_check"/>
-	<check_box label="Simula la battitura tasti quando chatti" name="play_typing_animation"/>
+	<check_box label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
 	<text name="text_box7">
 		Chat con vignette:
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index 6ae5b6bb2f..f1c91e78e6 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -2,8 +2,8 @@
 <panel label="Grafica" name="Display panel">
 	<button label="?" name="GraphicsPreferencesHelpButton"/>
 	<check_box label="Esegui Second Life in una finestra" name="windowed mode"/>
-	<text_editor name="FullScreenInfo">
-		Se deselezionato, il viewer partirà a schermo intero all&apos;avvio.
+	<text_editor name="FullScreenInfo" width="480">
+		Se deselezionato, all&apos;avvio il programma partirà a schermo intero.
 	</text_editor>
 	<text name="WindowSizeLabel">
 		Dimensione della finestra:
@@ -68,7 +68,7 @@
 		Ultra
 	</text>
 	<text name="HigherText2">
-		più alto
+		Più alto
 	</text>
 	<text name="QualityText2">
 		Qualità
@@ -77,8 +77,8 @@
 	<text name="ShadersText">
 		Effetti grafici:
 	</text>
-	<check_box label="Bump Mapping (piccoli rilievi) e scintillii" name="BumpShiny"/>
-	<check_box label="Effetti grafici base" name="BasicShaders" tool_tip="Disabilite questa opzione può evitare che qualche scheda grafica vada in crash."/>
+	<check_box label="Piccoli rilievi e scintillii" name="BumpShiny"/>
+	<check_box label="Effetti grafici base" name="BasicShaders" tool_tip="Disabilitare questa opzione può evitare che qualche scheda grafica vada in crash."/>
 	<check_box label="Effetti grafici atmosferici" name="WindLightUseAtmosShaders"/>
 	<check_box label="Riflessi dell&apos;acqua" name="Reflections"/>
 	<text name="ReflectionDetailText">
@@ -110,18 +110,18 @@
 	<text name="DrawDistanceMeterText2">
 		m
 	</text>
-	<slider label="Distanza di disegno:" name="DrawDistance"/>
-	<slider label="Conteggio massimo particelle:" name="MaxParticleCount"/>
-	<slider label="Qualità in post-produzione:" name="RenderPostProcess"/>
+	<slider label="Distanza di disegno:" name="DrawDistance" label_width="158" width="255"/>
+	<slider label="Conteggio massimo particelle:" name="MaxParticleCount" label_width="158" width="262" />
+	<slider label="Qualità in post-produzione:" name="RenderPostProcess" label_width="158" width="223"/>
 	<text name="MeshDetailText">
 		Dettagli reticolo:
 	</text>
-	<slider label="Oggetti:" name="ObjectMeshDetail"/>
-	<slider label="Prims flessibili:" name="FlexibleMeshDetail"/>
-	<slider label="Alberi:" name="TreeMeshDetail"/>
-	<slider label="Avatar:" name="AvatarMeshDetail"/>
-	<slider label="Terreno:" name="TerrainMeshDetail"/>
-	<slider label="Cielo:" name="SkyMeshDetail"/>
+	<slider label="  Oggetti:" name="ObjectMeshDetail"/>
+	<slider label="  Prims flessibili:" name="FlexibleMeshDetail"/>
+	<slider label="  Alberi:" name="TreeMeshDetail"/>
+	<slider label="  Avatar:" name="AvatarMeshDetail"/>
+	<slider label="  Terreno:" name="TerrainMeshDetail"/>
+	<slider label="  Cielo:" name="SkyMeshDetail"/>
 	<text name="PostProcessText">
 		Basso
 	</text>
@@ -148,7 +148,7 @@
 	</text>
 	<radio_group name="LightingDetailRadio">
 		<radio_item name="SunMoon">
-			Sole e luna solamente
+			Solo il sole e la luna
 		</radio_item>
 		<radio_item name="LocalLights">
 			Luci locali
diff --git a/indra/newview/skins/default/xui/it/panel_region_covenant.xml b/indra/newview/skins/default/xui/it/panel_region_covenant.xml
index 802156ea0b..9dfecde317 100644
--- a/indra/newview/skins/default/xui/it/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_covenant.xml
@@ -22,15 +22,17 @@
 		Ultima modifica Merc 31 Dic 1969 16:00:00
 	</text>
 	<button label="?" name="covenant_help"/>
-	<text_editor name="covenant_editor">
+	<text_editor name="covenant_editor"  bottom="-247" height="162" >
 		Per questa proprietà non è stato emesso alcun regolamento.
 	</text_editor>
 	<button label="Ripristina" name="reset_covenant"/>
-	<text name="covenant_help_text">
-		Le modifiche nel regolamento saranno visibili su tutti i terreni della proprietà.
+	<text  bottom="-25" name="covenant_help_text">
+		Le modifiche nel regolamento saranno visibili su tutti i terreni
+      della proprietà.
 	</text>
-	<text name="covenant_instructions">
-		Trascina e rilascia una notecard per cambiare il regolamento di questa proprietà.
+	<text  bottom_delta="-36" name="covenant_instructions">
+		Trascina e rilascia una notecard per cambiare il regolamento di
+      questa proprietà.
 	</text>
 	<text name="region_section_lbl">
 		Regione:
@@ -38,31 +40,31 @@
 	<text name="region_name_lbl">
 		Nome:
 	</text>
-	<text name="region_name_text">
+	<text name="region_name_text" left="126">
 		leyla
 	</text>
 	<text name="region_landtype_lbl">
 		Tipo:
 	</text>
-	<text name="region_landtype_text">
+	<text name="region_landtype_text" left="126">
 		Mainland / Homestead
 	</text>
-	<text name="region_maturity_lbl">
+	<text name="region_maturity_lbl" width="115">
 		Categoria di accesso:
 	</text>
-	<text name="region_maturity_text">
+	<text name="region_maturity_text" left="126">
 		Adult
 	</text>
 	<text name="resellable_lbl">
 		Rivendita:
 	</text>
-	<text name="resellable_clause">
+	<text name="resellable_clause" left="126">
 		La terra in questa regione non può essere rivenduta.
 	</text>
 	<text name="changeable_lbl">
 		Suddividi:
 	</text>
-	<text name="changeable_clause">
+	<text name="changeable_clause" left="126">
 		La terra in questa regione non può essere unita/suddivisa.
 	</text>
 	<string name="can_resell">
@@ -72,9 +74,11 @@
 		Un terreno acquistato in questa regione non può essere rivenduto.
 	</string>
 	<string name="can_change">
-		Un terreno acquistato in questa regione può essere unito o suddiviso.
+		Un terreno acquistato in questa regione può essere unito o
+suddiviso.
 	</string>
 	<string name="can_not_change">
-		Un terreno acquistato in questa regione non può essere unito o suddiviso.
+		Un terreno acquistato in questa regione non può essere unito o
+suddiviso.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_debug.xml b/indra/newview/skins/default/xui/it/panel_region_debug.xml
index fddc14e85c..85fb968ab4 100644
--- a/indra/newview/skins/default/xui/it/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Debug - individuazione errori" name="Debug">
+<panel label="Debug" name="Debug">
 	<text name="region_text_lbl">
 		Regione:
 	</text>
@@ -13,7 +13,7 @@
 	<check_box label="Disabilita la fisica" name="disable_physics_check" tool_tip="Disabilita tutta la fisica dei corpi in questa regione"/>
 	<button label="?" name="disable_physics_help"/>
 	<button label="Applica" name="apply_btn"/>
-	<text name="objret_text_lbl">
+	<text name="objret_text_lbl" width="130">
 		Restituisci oggetti
 	</text>
 	<text name="resident_text_lbl">
@@ -30,10 +30,10 @@
 	<check_box label="Restituisci solo gli oggetti che sono sulle terre altrui" name="return_other_land" tool_tip="Restituisci solo gli oggetti che sono in terreni appartenenti a qualcun altro"/>
 	<check_box label="Restituisci gli oggetti in ogni regione di questi possedimenti" name="return_estate_wide" tool_tip="Restituisci tutti gli oggetti nelle varie regioni che costituiscono l&apos;insieme dei possedimenti terrieri"/>
 	<button label="Restituisci" name="return_btn"/>
-	<button label="Visualizza l&apos;elenco dei maggiori collidenti..." name="top_colliders_btn" tool_tip="Elenco degli oggetti che stanno potenzialmente subendo le maggiori collisioni"/>
-	<button label="?" name="top_colliders_help"/>
-	<button label="Visualizza l&apos;elenco degli script più pesanti..." name="top_scripts_btn" tool_tip="Elenco degli oggetti che impiegano più tempo a far girare gli script"/>
-	<button label="?" name="top_scripts_help"/>
+	<button width="280" label="Visualizza l&apos;elenco dei maggiori collidenti..." name="top_colliders_btn" tool_tip="Elenco degli oggetti che stanno potenzialmente subendo le maggiori collisioni"/>
+	<button label="?" name="top_colliders_help" left="297"/>
+	<button width="280" label="Visualizza l&apos;elenco degli script più pesanti..." name="top_scripts_btn" tool_tip="Elenco degli oggetti che impiegano più tempo a far girare gli script"/>
+	<button label="?" name="top_scripts_help" left="297"/>
 	<button label="Riavvia la regione" name="restart_btn" tool_tip="Dai 2 minuti di tempo massimo e fai riavviare la regione"/>
 	<button label="?" name="restart_help"/>
 	<button label="Ritarda il riavvio" name="cancel_restart_btn" tool_tip="Ritarda il riavvio della regione di un&apos;ora"/>
diff --git a/indra/newview/skins/default/xui/it/panel_region_estate.xml b/indra/newview/skins/default/xui/it/panel_region_estate.xml
index a27e3a716c..5b95b7378b 100644
--- a/indra/newview/skins/default/xui/it/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_estate.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Proprietà immobiliari" name="Estate">
 	<text name="estate_help_text">
-		I cambiamenti alle impostazioni in questa finestra avranno effetto su tutte
-le regioni della proprietà.
+		I cambiamenti alle impostazioni in questa finestra 
+avranno effetto su tutte le regioni della proprietà.
 	</text>
-	<text name="estate_text">
+	<text name="estate_text" width="140">
 		Proprietà immobiliari:
 	</text>
 	<text name="estate_name">
@@ -24,15 +24,15 @@ le regioni della proprietà.
 	<check_box label="Permetti accesso pubblico" name="externally_visible_check"/>
 	<button label="?" name="externally_visible_help"/>
 	<text name="Only Allow">
-		Limita l&apos;accesso a:
+		Limita l&apos;accesso a residenti...
 	</text>
-	<check_box label="residenti che hanno dato informazioni di pagamento" name="limit_payment" tool_tip="Blocca residenti non identificati."/>
+	<check_box label="che hanno dato info. di pagamento" name="limit_payment" tool_tip="Blocca residenti non identificati."/>
 	<check_box label="Adulti con età verificata" name="limit_age_verified" tool_tip="Blocca residenti che non hanno verificato la loro età. Per maggiori informazioni vai a support.secondlife.com."/>
 	<check_box label="Permetti la chat voice" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Permetti teleport diretto" name="allow_direct_teleport"/>
 	<button label="?" name="allow_direct_teleport_help"/>
-	<text name="abuse_email_text">
+	<text name="abuse_email_text" width="230">
 		Indirizzo email per la denuncia di abuso:
 	</text>
 	<string name="email_unsupported">
@@ -40,8 +40,8 @@ le regioni della proprietà.
 	</string>
 	<button label="?" name="abuse_email_address_help"/>
 	<button label="Applica" name="apply_btn"/>
-	<button label="Espelli persona dalle proprietà..." name="kick_user_from_estate_btn"/>
-	<button label="Manda un messaggio ai residenti di tutte le tue proprietà..." name="message_estate_btn"/>
+	<button font="SansSerifSmall" label="Espelli persona dalle proprietà..." name="kick_user_from_estate_btn"/>
+	<button font="SansSerifSmall" label="Manda un messaggio di le proprietà..." name="message_estate_btn"/>
 	<text name="estate_manager_label">
 		Manager delle proprietà:
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_region_general.xml b/indra/newview/skins/default/xui/it/panel_region_general.xml
index fffe51770e..d3afc1c63a 100644
--- a/indra/newview/skins/default/xui/it/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_general.xml
@@ -3,19 +3,19 @@
 	<text name="region_text_lbl">
 		Regione:
 	</text>
-	<text name="region_text">
+	<text name="region_text" left="70">
 		sconosciuta
 	</text>
 	<text name="version_channel_text_lbl">
 		Versione:
 	</text>
-	<text name="version_channel_text">
+	<text name="version_channel_text" left="70">
 		sconosciuta
 	</text>
 	<text name="region_type_lbl">
 		Tipo:
 	</text>
-	<text name="region_type">
+	<text name="region_type" left="70">
 		sconosciuto
 	</text>
 	<check_box label="Proibisci la modifica del terreno" name="block_terraform_check"/>
@@ -27,19 +27,19 @@
 	<check_box label="Limita gli urti" name="restrict_pushobject"/>
 	<button label="?" name="restrict_pushobject_help"/>
 	<check_box label="Abilita la rivendita del terreno" name="allow_land_resell_check"/>
-	<button label="?" name="land_resell_help"/>
+	<button label="?" name="land_resell_help" left="260"/>
 	<check_box label="Abilita unione/suddivisione del terreno" name="allow_parcel_changes_check"/>
-	<button label="?" name="parcel_changes_help"/>
+	<button label="?" name="parcel_changes_help" left="260" />
 	<check_box label="Proibisci che il terreno appaia nelle ricerche" name="block_parcel_search_check" tool_tip="Permetti che le persone vedano questa regione e le sue suddivisioni nei risultati delle ricerche"/>
-	<button label="?" name="parcel_search_help"/>
-	<spinner label="Limite massimo di avatar" name="agent_limit_spin"/>
+	<button label="?" name="parcel_search_help" left="260"/>
+	<spinner label="Limite massimo di avatar" name="agent_limit_spin" label_width="135" width="190"/>
 	<button label="?" name="agent_limit_help"/>
-	<spinner label="Bonus di oggetti" name="object_bonus_spin"/>
+	<spinner label="Bonus di oggetti" name="object_bonus_spin" label_width="135" width="190"/>
 	<button label="?" name="object_bonus_help"/>
-	<text label="Maturità" name="access_text">
+	<text label="Maturità" name="access_text" width="120">
 		Categoria di accesso:
 	</text>
-	<combo_box label="Mature" name="access_combo">
+	<combo_box label="Mature" name="access_combo" left="126" width="74">
 		<combo_item name="Adult">
 			Adult
 		</combo_item>
@@ -55,5 +55,5 @@
 	<button label="Teletrasporta a casa un utente..." name="kick_btn"/>
 	<button label="Teletrasporta a casa tutti gli utenti..." name="kick_all_btn"/>
 	<button label="Invia messaggio alla regione..." name="im_btn"/>
-	<button label="Gestisci snodo di teleport..." name="manage_telehub_btn"/>
+	<button label="Gestisci snodo di teleport..." name="manage_telehub_btn" width="210"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
index 70072275eb..92044bae11 100644
--- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
@@ -8,9 +8,9 @@
 	</text>
 	<spinner label="Altezza dell&apos;acqua" name="water_height_spin"/>
 	<button label="?" name="water_height_help"/>
-	<spinner label="Limite di altezza del terreno" name="terrain_raise_spin"/>
+	<spinner label="Limite di altezza del &#10;terreno" name="terrain_raise_spin"/>
 	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Limite di abbassamento del terreno" name="terrain_lower_spin"/>
+	<spinner label="Limite di abbassamento &#10;del terreno" name="terrain_lower_spin" bottom_delta="-34"/>
 	<button label="?" name="terrain_lower_help"/>
 	<check_box label="Usa il sole della regione" name="use_estate_sun_check"/>
 	<button label="?" name="use_estate_sun_help"/>
@@ -22,6 +22,6 @@
 	<button label="?" name="download_raw_help"/>
 	<button label="Carica terreno RAW..." name="upload_raw_btn" tool_tip="Disponibile solo per i proprietari del terreno, non per i manager"/>
 	<button label="?" name="upload_raw_help"/>
-	<button label="Trasforma il terreno" name="bake_terrain_btn" tool_tip="Imposta il terreno corrente come punto medio per i limiti di innalzamento/abbassamento"/>
-	<button label="?" name="bake_terrain_help"/>
+	<button width="170" label="Trasforma il terreno" name="bake_terrain_btn" tool_tip="Imposta il terreno corrente come punto medio per i limiti di innalzamento/abbassamento"/>
+	<button left="190" label="?" name="bake_terrain_help"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_texture.xml b/indra/newview/skins/default/xui/it/panel_region_texture.xml
index 4e39db9b1d..254700e9f1 100644
--- a/indra/newview/skins/default/xui/it/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_texture.xml
@@ -6,7 +6,7 @@
 	<text name="region_text">
 		sconosciuto
 	</text>
-	<text name="detail_texture_text">
+	<text name="detail_texture_text" width="380">
 		Texture del terreno (è necessario siano 512x512, 24 bit .tga files)
 	</text>
 	<text name="height_text_lbl">
@@ -48,10 +48,10 @@
 		Questi valori rappresentano l&apos;intervallo di miscelazione delle texture qui sopra.
 	</text>
 	<text name="height_text_lbl11">
-		Misurato in metri, il valore più BASSO corrisponde all&apos;altezza MASSIMA della Texture #1,
+		Misurato in metri, il valore più BASSO corrisponde all&apos;altezza MASSIMA della
 	</text>
 	<text name="height_text_lbl12">
-		e il valore più ALTO all&apos;altezza MINIMA della Texture #4.
+		  Texture #1, e il valore più ALTO all&apos;altezza MINIMA della Texture #4.
 	</text>
 	<button label="Applica" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index d7884cfbdb..1cf12cbdca 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -17,7 +17,7 @@
 		Un precedente tentativo di login è fallito. Tentativo di connessione [NUMBER]
 	</string>
 	<string name="LoginPrecaching">
-		Sto caricando SecondLife...
+		Sto caricando Second Life...
 	</string>
 	<string name="LoginInitializingBrowser">
 		Inizializzazione del browser web incorporato...
diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml
index 4ef802dc5b..57e81bc41e 100644
--- a/indra/newview/skins/default/xui/it/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/it/teleport_strings.xml
@@ -25,7 +25,7 @@ www.secondlife.com/support
 			Gli oggetti da te indossati non sono ancoa arrivati. Attendi ancora qualche secondo o scollegati e ricollegati prima di provare a teleportarti.
 		</message>
 		<message name="too_many_uploads_tport">
-			La gestione dati della regione è al momento occupata e la tua richiesta di teletrasporto non può essere soddisfatta entro breve tempo. Per favore prova di nuovo tra qualche minuto o spostati in un&apos;area meno affollata.
+			Il server della regione è al momento occupato e la tua richiesta di teletrasporto non può essere soddisfatta entro breve tempo. Per favore prova di nuovo tra qualche minuto o spostati in un&apos;area meno affollata.
 		</message>
 		<message name="expired_tport">
 			Spiacenti, il sistema non riesce a soddisfare la tua richiesta di teletrasporto entro un tempo ragionevole. Riprova tra qualche minuto.
@@ -42,34 +42,34 @@ www.secondlife.com/support
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
-			In invio verso la destinazione.
+			In invio a destinazione.
 		</message>
 		<message name="redirecting">
 			In reindirizzamento ad una nuova destinazione.
 		</message>
 		<message name="relaying">
-			In ritrasmissione alla destinazione.
+			In reinvio a destinazione.
 		</message>
 		<message name="sending_home">
-			In invio la richiesta di ubicazione casa.
+			In invio verso la destinazione casa.
 		</message>
 		<message name="sending_landmark">
-			In invio la richiesta della destinazione del landmark.
+			In invio verso la destinazione del landmark.
 		</message>
 		<message name="completing">
 			Teletrasporto completato
 		</message>
 		<message name="resolving">
-			Destinazione in elaborazione.
+			Elaborazione della destinazione in corso...
 		</message>
 		<message name="contacting">
-			Si sta contattando la nuova regione.
+			Contattando la nuova regione.
 		</message>
 		<message name="arriving">
-			In arrivo...
+			In arrivo a destinazione...
 		</message>
 		<message name="requesting">
-			Teletrasporto in avvio...
+			Avvio teletrasporto....
 		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index ffdbec666d..9306a6c6af 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Second Life����">
 	<text_editor name="credits_editor">
-		Second Life�� Philip�Tessa�Andrew�Cory�James�Ben�Char�Charlie�Colin�Dan�Daniel�Doug�Eric�Hamlet�Haney�Eve�Hunter�Ian�Jeff�Jennifer�Jim�John�Lee�Mark�Peter�Phoenix�Richard�Robin�Xenon�Steve�Tanya�Eddie�Avi�Frank�Bruce�Aaron�Alice�Bob�Debra�Eileen�Helen�Janet�Louie�Leviathania�Stefan�Ray�Kevin�Tom�Mikeb�MikeT�Burgess�Elena�Tracy�Bill�Todd�Ryan�Zach�Sarah�Nova�Tim�Stephanie�Michael�Evan�Nicolas�Catherine�Rachelle�Dave�Holly�Bub�Kelly�Magellan�Ramzi�Don�Sabin�Jill�Rheya�Jeska�Torley�Kona�Callum�Charity�Ventrella�Jack�Vektor�Iris�Chris�Nicole�Mick�Reuben�Blue�Babbage�Yedwab�Deana�Lauren�Brent�Pathfinder�Chadrick�Altruima�Jesse�Teeny�Monroe�Icculus�David�Tess�Lizzie�Patsy�Isaac�Lawrence�Cyn�Bo�Gia�Annette�Marius�Tbone�Jonathan�Karen�Ginsu�Satoko�Yuko�Makiko�Thomas�Harry�Seth�Alexei�Brian�Guy�Runitai�Ethan�Data�Cornelius�Kenny�Swiss�Zero�Natria�Wendy�Stephen�Teeple�Thumper�Lucy�Dee�Mia�Liana�Warren�Branka�Aura�beez�Milo�Hermia�Red�Thrax�Joe�Sally�Magenta�Mogura�Paul�Jose�Rejean�Henrik�Lexie�Amber�Logan�Xan�Nora�Morpheus�Donovan�Leyla�MichaelFrancis�Beast�Cube�Bucky�Joshua�Stryfe�Harmony�Teresa�Claudia�Walker�Glenn�Fritz�Fordak�June�Cleopetra�Jean�Ivy�Betsy�Roosevelt�Spike�Ken�Which�Tofu�Chiyo�Rob�Zee�dustin�George�Del�Matthew�Cat�Jacqui�Lightfoot�Adrian�Viola�Alfred�Noel�Irfan�Sunil�Yool�Rika�Jane�Xtreme�Frontier�a2�Neo�Siobhan�Yoz�Justin�Elle�Qarl�Benjamin�Isabel�Gulliver�Everett�Christopher�Izzy�Stephany�Garry�Sejong�Sean�Tobin�Iridium�Meta�Anthony�Jeremy�JP�Jake�Maurice�Madhavi�Leopard�Kyle�Joon�Kari�Bert�Belinda�Jon�Kristi�Bridie�Pramod�KJ�Socrates�Maria�Ivan�Aric�Yamasaki�Adreanne�Jay�MitchK�Ceren�Coco�Durl�Jenny�Periapse�Kartic�Storrs�Lotte�Sandy�Rohn�Colossus�Zen�BigPapi�Brad�Pastrami�Kurz�Mani�Neuro�Jaime�MJ�Rowan�Sgt�Elvis�Gecko�Samuel�Sardonyx�Leo�Bryan�Niko�Soft�Poppy�Rachel�Aki�Angelo�Banzai�Alexa�Sue�CeeLo�Bender�CG�Gillian�Pelle�Nick�Echo�Zara�Christine�Shamiran�Emma�Blake�Keiko�Plexus�Joppa�Sidewinder�Erica�Ashlei�Twilight�Kristen�Brett�Q�Enus�Simon�Bevis�Kraft�Kip�Chandler�Ron�LauraP�Ram�KyleJM�Scouse�Prospero�Melissa�Marty�Nat�Hamilton�Kend�Lordan�Jimmy�Kosmo�Seraph�Green�Ekim�Wiggo�JT�Rome�Doris�Miz�Benoc�Whump�Trinity�Patch�Kate�TJ�Bao�Joohwan�Christy�Sofia�Matias�Cogsworth�Johan�Oreh�Cheah�Angela�Brandy�Mango�Lan�Aleks�Gloria�Heidy�Mitchell�Space�Colton�Bambers�Einstein�Maggie�Malbers�Rose�Winnie�Stella�Milton�Rothman�Niall�Marin�Allison�Katie�Dawn�Katt�Dusty�Kalpana�Judy�Andrea�Ambroff�Infinity�Gail�Rico�Raymond�Yi�William�Christa�M�Teagan�Scout�Molly�Dante�Corr�Dynamike�Usi�Kaylee�Vidtuts�Lil�Danica�Sascha�Kelv�Jacob�Nya�Rodney�Brandon�Elsie�Blondin�Grant�Katrin�Nyx�Gabriel�Locklainn�Claire�Devin�Minerva�Monty�Austin�Bradford�Si�Keira�H�Caitlin�Dita�Makai�Jenn�Ann�Meredith�Clare�Joy�Praveen�Cody�Edmund�Ruthe�Sirena�Gayathri�Spider�FJ�Davidoff�Tian�Jennie�Louise�Oskar�Landon�Noelle�Jarv�Ingrid�Al�Sommer�Doc�Aria�Huin�Gray�Lili�Vir�DJ�Yang�T�Simone�Maestro�Scott�Charlene�Quixote�Amanda�Susan�Zed�Anne�Enkidu�Esbee�Joroan�Katelin�Roxie�Tay�Scarlet�Kevin�Johnny�Wolfgang�Andren�Bob�Howard�Merov�Rand�Ray�Michon�Newell�Galen�Dessie�Les����他多数�人��よ��作��れ���。
+		Second Life�� Philip�Tessa�Andrew�Cory�James�Ben�Char�Charlie�Colin�Dan�Daniel�Doug�Eric�Hamlet�Haney�Eve�Hunter�Ian�Jeff�Jennifer�Jim�John�Lee�Mark�Peter�Phoenix�Richard�Robin�Xenon�Steve�Tanya�Eddie�Avi�Frank�Bruce�Aaron�Alice�Bob�Debra�Eileen�Helen�Janet�Louie�Leviathania�Stefan�Ray�Kevin�Tom�Mikeb�MikeT�Burgess�Elena�Tracy�Bill�Todd�Ryan�Zach�Sarah�Nova�Tim�Stephanie�Michael�Evan�Nicolas�Catherine�Rachelle�Dave�Holly�Bub�Kelly�Magellan�Ramzi�Don�Sabin�Jill�Rheya�Jeska�Torley�Kona�Callum�Charity�Ventrella�Jack�Vektor�Iris�Chris�Nicole�Mick�Reuben�Blue�Babbage�Yedwab�Deana�Lauren�Brent�Pathfinder�Chadrick�Altruima�Jesse�Teeny�Monroe�Icculus�David�Tess�Lizzie�Patsy�Isaac�Lawrence�Cyn�Bo�Gia�Annette�Marius�Tbone�Jonathan�Karen�Ginsu�Satoko�Yuko�Makiko�Thomas�Harry�Seth�Alexei�Brian�Guy�Runitai�Ethan�Data�Cornelius�Kenny�Swiss�Zero�Natria�Wendy�Stephen�Teeple�Thumper�Lucy�Dee�Mia�Liana�Warren�Branka�Aura�beez�Milo�Hermia�Red�Thrax�Joe�Sally�Magenta�Mogura�Paul�Jose�Rejean�Henrik�Lexie�Amber�Logan�Xan�Nora�Morpheus�Donovan�Leyla�MichaelFrancis�Beast�Cube�Bucky�Joshua�Stryfe�Harmony�Teresa�Claudia�Walker�Glenn�Fritz�Fordak�June�Cleopetra�Jean�Ivy�Betsy�Roosevelt�Spike�Ken�Which�Tofu�Chiyo�Rob�Zee�dustin�George�Del�Matthew�Cat�Jacqui�Lightfoot�Adrian�Viola�Alfred�Noel�Irfan�Sunil�Yool�Rika�Jane�Xtreme�Frontier�a2�Neo�Siobhan�Yoz�Justin�Elle�Qarl�Benjamin�Isabel�Gulliver�Everett�Christopher�Izzy�Stephany�Garry�Sejong�Sean�Tobin�Iridium�Meta�Anthony�Jeremy�JP�Jake�Maurice�Madhavi�Leopard�Kyle�Joon�Kari�Bert�Belinda�Jon�Kristi�Bridie�Pramod�KJ�Socrates�Maria�Ivan�Aric�Yamasaki�Adreanne�Jay�MitchK�Ceren�Coco�Durl�Jenny�Periapse�Kartic�Storrs�Lotte�Sandy�Rohn�Colossus�Zen�BigPapi�Brad�Pastrami�Kurz�Mani�Neuro�Jaime�MJ�Rowan�Sgt�Elvis�Gecko�Samuel�Sardonyx�Leo�Bryan�Niko�Soft�Poppy�Rachel�Aki�Angelo�Banzai�Alexa�Sue�CeeLo�Bender�CG�Gillian�Pelle�Nick�Echo�Zara�Christine�Shamiran�Emma�Blake�Keiko�Plexus�Joppa�Sidewinder�Erica�Ashlei�Twilight�Kristen�Brett�Q�Enus�Simon�Bevis�Kraft�Kip�Chandler�Ron�LauraP�Ram�KyleJM�Scouse�Prospero�Melissa�Marty�Nat�Hamilton�Kend�Lordan�Jimmy�Kosmo�Seraph�Green�Ekim�Wiggo�JT�Rome�Doris�Miz�Benoc�Whump�Trinity�Patch�Kate�TJ�Bao�Joohwan�Christy�Sofia�Matias�Cogsworth�Johan�Oreh�Cheah�Angela�Brandy�Mango�Lan�Aleks�Gloria�Heidy�Mitchell�Space�Colton�Bambers�Einstein�Maggie�Malbers�Rose�Winnie�Stella�Milton�Rothman�Niall�Marin�Allison�Katie�Dawn�Katt�Dusty�Kalpana�Judy�Andrea�Ambroff�Infinity�Gail�Rico�Raymond�Yi�William�Christa�M�Teagan�Scout�Molly�Dante�Corr�Dynamike�Usi�Kaylee�Vidtuts�Lil�Danica�Sascha�Kelv�Jacob�Nya�Rodney�Brandon�Elsie�Blondin�Grant�Katrin�Nyx�Gabriel�Locklainn�Claire�Devin�Minerva�Monty�Austin�Bradford�Si�Keira�H�Caitlin�Dita�Makai�Jenn�Ann�Meredith�Clare�Joy�Praveen�Cody�Edmund�Ruthe�Sirena�Gayathri�Spider�FJ�Davidoff�Tian�Jennie�Louise�Oskar�Landon�Noelle�Jarv�Ingrid�Al�Sommer�Doc�Aria�Huin�Gray�Lili�Vir�DJ�Yang�T�Simone�Maestro�Scott�Charlene�Quixote�Amanda�Susan�Zed�Anne�Enkidu�Esbee�Joroan�Katelin�Roxie�Tay�Scarlet�Kevin�Johnny�Wolfgang�Andren�Bob�Howard�Merov�Rand�Ray�Michon�Newell�Galen�Dessie�Les�Michon�Jenelle�Geo�Siz�Shapiro�Pete�Calyle�Selene�Allen�Phoebe�Goldin�Kimmora�Dakota�Slaton�Lindquist�Zoey�Hari�Othello�Rohit�Sheldon�Petra�Viale�Gordon�Kaye�Pink�Ferny�Emerson�Davy�Bri�Chan�Juan�Robert�Terrence�Nathan�Carl����他多数�人��よ��作��れ���。
 
-  ���ージョンを�れ���最高�も���るよ���力を�����以下��人�皆様�深�感������。 afon shepherd�Aimee Trescothick�Alexandrea Fride�Alissa Sabre�Amber DeCuir�Asuka Neely�Auron Forcella�Blue Revolution�Bocan Undercroft�Boroondas Gupte�Brandon Shinobu�Bri Gufler�Buckaroo Mu�Celierra Darling�Christos Atlantis�Coder Kas�Cummere Mayo�dakota schwade�Dirk Talamasca�Dizzy Banjo�Drew Dwi�Duckling Kwak�Ellla McMahon�Erikah Jameson�Erinyse Planer�Eyana Yohkoh�Ezian Ecksol�Faron Karu�Fenoe Lowey�Fox Hwasung�Francisca Biedermann�Gally Young�Gellan Glenelg�Geneko Nemeth�Glenn Rotaru�Hagar Qinan�Harleen Gretzky�Holger Gilruth�hotrodjohnny gears�IAm Zabelin�Inigo Catteneo�Iustinian Tomsen�Jacek Antonell�James Benedek�Jim Kupferberg�Joeseph Albanese�JPT62089 Agnon�Kardargo Adamczyk�Kirstenlee Cinquetti�Latif Khalifa�lea Parnall�Lex Neva�Lillith Anatine�Lilly Zenovka�Lim Catteneo�Lindal Kidd�Mark Rosenbaum�MasterJ Chaplin�McCabe Maxsted�Melvin Starbrook�Meni Kaiousei�Mero Collas�Minakothegothicgeisha Kamachi�Moon Metty�neofilo aabye�Neutron Chesnokov�Nomad Ingwer�norritt Xi�Opensource Obscure�Oracle Weatherwax�Ourasi Ferraris�Pabl0 Roffo�Peyton Aleixandre�Phli Foxchase�Psi Merlin�r2d2 Wunderlich�Regi Yifu�Saijanai Kuhn�Sandor Balczo�Sarkan Dreamscape�Scree Raymaker�Sedona Mills�Selena Beale�Sheet Spotter�Shibari Twine�Silver Key�Simon Kline�SLB Wirefly�Stacy Wombat�Sugarcult Dagger�Tayra Dagostino�Tetsuryu Vlodovic�ThaBiGGDoGG Richez�Timo Gufler�tx Oh�wayfinder wishbringer�Wizzytoe McCullough�Wundur Primbee�Yann Dufaux�Yuu Nakamichi�Aminom Marvin�Andred Qinan�arminasx saiman�caroline apollo�Iskar Ariantho�Jenika Connolly�Maghnus Balogh�Nefertiti Nefarious�RodneyLee Jessop
+  ���ージョンを�れ���最高�も���るよ���力を�����以下��人�皆様�深�感������。 able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
   3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
   APR Copyright (C) 2000-2004 The Apache Software Foundation
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
index 1ea10324b3..8bf660d71d 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_buy_contents" title="コンテンツを購入">
-	<text name="contains_text">
+<floater name="floater_buy_contents" title="コンテンツを購入" width="340" min_width="340">
+	<text name="contains_text" width="320">
 		[NAME]�内容：
 	</text>
-	<text name="buy_text">
+	<scroll_list name="item_list" width="310"/>
+	<text name="buy_text" width="320">
 		コンテンツを[NAME]�らL$[AMOUNT]�購入����？
 	</text>
-	<button label="�り消�" label_selected="�り消�" name="cancel_btn" />
-	<button label="購入" label_selected="購入" name="buy_btn" />
-	<check_box label="今���を�る" name="wear_check" />
+	<button label="�り消�" label_selected="�り消�" name="cancel_btn" width="73"/>
+	<button label="購入" label_selected="購入" name="buy_btn" width="73" left_delta="-77"/>
+	<check_box label="今���を�る" name="wear_check" left_delta="-125"/>
 	<text name="no_copy_text">
 		(コピー��)
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index ba51e7263d..0612d309b9 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
@@ -36,6 +36,7 @@
 	<text name="covenant_text">
 		�動産約款���������：
 	</text>
+	<text left="470" name="covenant_timestamp_text"/>
 	<text_editor name="covenant_editor">
 		ロード中．．．
 	</text_editor>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 0b03a04f3e..81f221a933 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="制作">
 	<button label="" label_selected="" name="button focus" tool_tip="フォーカス"/>
 	<button label="" label_selected="" name="button move" tool_tip="動��"/>
 	<button label="" label_selected="" name="button edit" tool_tip="編集"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml
index 8286d29973..693446b21a 100644
--- a/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml
@@ -6,6 +6,6 @@
 		アイテムを別���存：
 	</text>
 	<line_editor name="name ed">
-		新�[DESC]
+		New [DESC]
 	</line_editor>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index c994995ed2..c69c2e305a 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -169,7 +169,9 @@
 		<menu_item_separator label="-----------" name="separator4"/>
 		<menu_item_call label="�択対象�視点移動" name="Focus on Selection"/>
 		<menu_item_call label="�択範囲�ズームイン" name="Zoom to Selection"/>
-		<menu_item_call label="オブジェクトを購入" name="Menu Object Take"/>
+		<menu_item_call label="オブジェクトを購入" name="Menu Object Take">
+			<on_enable userdata="購入,�る" name="EnableBuyOrTake"/>
+		</menu_item_call>
 		<menu_item_call label="コピーを�る" name="Take Copy"/>
 		<menu_item_call label="オブジェクトをオブジェクト・コンテンツ�戻���存" name="Save Object Back to Object Contents"/>
 		<menu_item_separator label="-----------" name="separator6"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index c20a4f50b4..1d3e206d92 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -2869,7 +2869,7 @@ Second Life �ウェブサイト�アクセス���設定����？
 	<notification name="ImproperPaymentStatus">
 		��地域（リージョン）�入る������支払�ステータス��り��ん。
 	</notification>
-	<notification name="MustGetAgeRgion">
+	<notification name="MustGetAgeRegion">
 		��地域（リージョン）�入る��年齢確�済���る必���り��。
 	</notification>
 	<notification name="MustGetAgeParcel">
@@ -3200,7 +3200,7 @@ Mac�場���Cmd-Opt-Shift-Dを押������。
 		[FIRST] [LAST]���物を渡����� 無視設定�自動的�解除�れ���。
 	</notification>
 	<notification name="VoiceInviteGroup">
-		[NAME]��グループ[GROUP]��ボイス�ャットコール��加����。
+		[NAME]�� グループ[GROUP]��ボイス�ャットコール��加����。
 コール��加�る��「��入れる�をクリック��招待を断る���「拒��をクリック������。��コールを���る人をミュート��る場��「ミュート�をクリック������。
 		<form name="form">
 			<button name="Accept" text="��入れる"/>
@@ -3209,7 +3209,7 @@ Mac�場���Cmd-Opt-Shift-Dを押������。
 		</form>
 	</notification>
 	<notification name="VoiceInviteAdHoc">
-		[NAME]��会議�ャット�ボイス�ャットコール��加����。
+		[NAME]�� 会議�ャット�ボイス�ャットコール��加����。
 コール��加�る��「��入れる�をクリック��招待を断る���「拒��をクリック������。 ��ユーザーをミュート（消声）�る場��「ミュート�をクリック������。
 		<form name="form">
 			<button name="Accept" text="��入れる"/>
@@ -3218,7 +3218,7 @@ Mac�場���Cmd-Opt-Shift-Dを押������。
 		</form>
 	</notification>
 	<notification name="InviteAdHoc">
-		[NAME]�����を会議�ャット�招待�����。
+		[NAME]�� ���を会議�ャット�招待�����。
 �ャット��加�る��「��入れる�をクリック��招待を断る���「拒��をクリック������。��ユーザーをミュート（消声）�る場��「ミュート�をクリック������。
 		<form name="form">
 			<button name="Accept" text="��入れる"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index f55dbf9009..019d42c40a 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
@@ -52,7 +52,8 @@
 		平方メートル ([AMOUNT]最大)
 	</text>
 	<text name="group_over_limit_text">
-		使用中�土地をサ�ート�る���グループ・メン�ー��ら�多��土地クレジットを�供�る必���り��。
+		使用中�土地をサ�ート�る���グループ・メン�ー��ら�多
+��土地クレジットを�供�る必���り��。
 	</text>
 	<text name="group_money_heading">
 		グループL$
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index c93aeacc95..03e22dd9a2 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -43,7 +43,7 @@
 		[VERSION]
 	</text>
 	<text name="forgot_password_text" left="-230" width="220">
-		�����パスワードを�忘れ���?
+		�����パスワードを�忘れ���？
 	</text>
 	<text name="forgot_password_url">
 		http://secondlife.com/account/request.php
diff --git a/indra/newview/skins/default/xui/nl/floater_about.xml b/indra/newview/skins/default/xui/nl/floater_about.xml
index d981ac2c8c..1e9551bb85 100644
--- a/indra/newview/skins/default/xui/nl/floater_about.xml
+++ b/indra/newview/skins/default/xui/nl/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="Over Second Life">
 	<text_editor name="credits_editor">
-		Second Life wordt u aangeboden door Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
+		Second Life wordt u aangeboden door Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
 
-Een &apos;Dank u&apos; voor de volgende bewoners voor het helpen zorgdragen dat dit de beste versie tot nu toe is: 
+Een &apos;Dank u&apos; voor de volgende bewoners voor het helpen zorgdragen dat dit de beste versie tot nu toe is: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
 APR Copyright (C) 2000-2004 The Apache Software Foundation
diff --git a/indra/newview/skins/default/xui/nl/floater_about_land.xml b/indra/newview/skins/default/xui/nl/floater_about_land.xml
index a3e3b246fe..f2aa9ff47c 100644
--- a/indra/newview/skins/default/xui/nl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/nl/floater_about_land.xml
@@ -147,31 +147,31 @@
 			<text name="region_name_lbl">
 				Naam:
 			</text>
-			<text name="region_name_text">
+			<text name="region_name_text" left="114">
 				leyla
 			</text>
 			<text name="region_landtype_lbl">
 				Type:
 			</text>
-			<text name="region_landtype_text">
+			<text name="region_landtype_text" left="114">
 				Mainland / Homestead
 			</text>
 			<text name="region_maturity_lbl">
 				Inhoudscategorie:
 			</text>
-			<text name="region_maturity_text">
+			<text name="region_maturity_text" left="114">
 				Adult
 			</text>
 			<text name="resellable_lbl">
 				Doorverkopen:
 			</text>
-			<text name="resellable_clause">
+			<text name="resellable_clause" left="114">
 				Land in deze regio mag niet worden doorverkocht.
 			</text>
 			<text name="changeable_lbl">
 				Opsplitsen:
 			</text>
-			<text name="changeable_clause">
+			<text name="changeable_clause" left="114" width="340">
 				Land in deze regio mag niet worden samengevoegd/opgesplitst.
 			</text>
 			<string name="can_resell">
@@ -405,7 +405,7 @@ of opgedeeld.
 				(none)
 			</string>
 			<button width="70" label="Instellen" label_selected="Instellen" name="Set" tool_tip="Stelt het landingspunt in waar bezoekers arriveren. Wordt ingesteld op uw avatar&apos;s positie binnen dit perceel."/>
-			<button width="70" left="311" label="Opschonen" label_selected="Opschonen" name="Clear" tool_tip="Landingspunt leegmaken"/>
+			<button width="80" left="311" label="Opschonen" label_selected="Opschonen" name="Clear" tool_tip="Landingspunt leegmaken"/>
 			<text name="Teleport Routing: ">
 				Teleport routering:
 			</text>
diff --git a/indra/newview/skins/default/xui/nl/floater_buy_contents.xml b/indra/newview/skins/default/xui/nl/floater_buy_contents.xml
index 0c513c923a..df0614b3d2 100644
--- a/indra/newview/skins/default/xui/nl/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/nl/floater_buy_contents.xml
@@ -6,7 +6,7 @@
 	<text name="buy_text">
 		Koop voor L$[AMOUNT] van [NAME]?
 	</text>
-	<button label="Annuleren" label_selected="Annuleren" name="cancel_btn"/>
+	<button label="Annuleren" label_selected="Annuleren" name="cancel_btn" width="73"/>
 	<button label="Koop" label_selected="Koop" name="buy_btn"/>
 	<check_box label="Draag kleding nu" name="wear_check"/>
 	<string name="no_copy_text">
diff --git a/indra/newview/skins/default/xui/nl/floater_buy_land.xml b/indra/newview/skins/default/xui/nl/floater_buy_land.xml
index 69726fc2c8..ab4bec7787 100644
--- a/indra/newview/skins/default/xui/nl/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/nl/floater_buy_land.xml
@@ -36,10 +36,11 @@
 	<text name="covenant_text">
 		U moet instemmen met het estate convenant:
 	</text>
+	<text left="470" name="covenant_timestamp_text"/>
 	<text_editor name="covenant_editor">
 		Laden...
 	</text_editor>
-	<check_box label="Ik ga akkoord met het hierboven beschreven convenant." name="agree_covenant"/>
+	<check_box label="Ik ga akkoord met het hierboven &#10;beschreven convenant." name="agree_covenant"/>
 	<text name="info_parcel_label">
 		Perceel:
 	</text>
diff --git a/indra/newview/skins/default/xui/nl/floater_color_picker.xml b/indra/newview/skins/default/xui/nl/floater_color_picker.xml
index 24b242e15c..25294e17e2 100644
--- a/indra/newview/skins/default/xui/nl/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/nl/floater_color_picker.xml
@@ -18,13 +18,14 @@
 	<text name="l_val_text">
 		Lum:
 	</text>
-	<check_box label="Meteen toepassen" name="apply_immediate"/>
+	<check_box label="Direct toepassen" name="apply_immediate"/>
 	<button label="Annuleren" label_selected="Annuleren" name="cancel_btn"/>
 	<button label="Selecteer" label_selected="Selecteer" name="select_btn"/>
 	<text name="Current color:">
 		Huidige kleur:
 	</text>
 	<text name="(Drag below to save.)">
-		(Sleep naar beneden om op te slaan.)
+		(Sleep naar beneden 
+ om op te slaan.)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_customize.xml b/indra/newview/skins/default/xui/nl/floater_customize.xml
index 7354c91047..de42aa85e3 100644
--- a/indra/newview/skins/default/xui/nl/floater_customize.xml
+++ b/indra/newview/skins/default/xui/nl/floater_customize.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="Uiterlijk" width="504">
-	<tab_container name="customize tab container" tab_min_width="106" width="502">
+<floater name="floater customize" title="Uiterlijk" width="551">
+	<tab_container name="customize tab container" tab_min_width="120" width="549">
 		<panel label="Lichaamsdelen" name="body_parts_placeholder"/>
-		<panel label="Postuur" name="Shape" left="112" width="389">
+		<panel label="Postuur" name="Shape" left="124" width="389">
 			<button label="Herstel" label_selected="Herstel" name="Revert"/>
 			<button label="Lichaam" label_selected="Lichaam" name="Body"/>
 			<button label="Hoofd" label_selected="Hoofd" name="Head"/>
@@ -51,10 +51,10 @@ te slepen. Ook kunt u zelf van begin af aan een nieuwe creëren en dragen.
 			<button label="Opslaan als..." label_selected="Opslaan als..." name="Save As"/>
 		</panel>
 		<panel label="Huid" name="Skin">
-			<button width="88" label="Huidskleur" label_selected="Huidskleur" name="Skin Color"/>
-			<button width="88" label="Gezichtsdetail" label_selected="Gezichtsdetail" name="Face Detail"/>
-			<button width="88" label="Make-up" label_selected="Make-up" name="Makeup"/>
-			<button width="88" label="Lichaam detail" label_selected="Lichaam detail" name="Body Detail"/>
+			<button width="104" label="Huidskleur" label_selected="Huidskleur" name="Skin Color"/>
+			<button width="104" label="Gezichtsdetail" label_selected="Gezichtsdetail" name="Face Detail"/>
+			<button width="104" label="Make-up" label_selected="Make-up" name="Makeup"/>
+			<button width="104" label="Lichaam detail" label_selected="Lichaam detail" name="Body Detail"/>
 			<text name="title">
 				[DESC]
 			</text>
@@ -80,9 +80,9 @@ slepen. Ook kunt u zelf van begin af aan een nieuwe creëren en dragen.
 			<text name="Item Action Label">
 				Huid:
 			</text>
-			<texture_picker width="88" label="Hoofd tatoeages" name="Head Tattoos" tool_tip="Klik om een afbeelding te kiezen"/>
-			<texture_picker width="88" label="Bovenste tatoeage" name="Upper Tattoos" tool_tip="Klik om een afbeelding te kiezen"/>
-			<texture_picker width="88" label="Onderste tatoeages" name="Lower Tattoos" tool_tip="Klik om een afbeelding te kiezen"/>
+			<texture_picker width="104" label="Hoofd tatoeages" name="Head Tattoos" tool_tip="Klik om een afbeelding te kiezen"/>
+			<texture_picker width="104" label="Bovenste tatoeage" name="Upper Tattoos" tool_tip="Klik om een afbeelding te kiezen"/>
+			<texture_picker width="104" label="Onderste tatoeages" name="Lower Tattoos" tool_tip="Klik om een afbeelding te kiezen"/>
 			<button label="Nieuwe huid maken" label_selected="Nieuwe huid maken" name="Create New"/>
 			<button label="Opslaan" label_selected="Opslaan" name="Save"/>
 			<button label="Opslaan als..." label_selected="Opslaan als..." name="Save As"/>
@@ -356,7 +356,7 @@ te slepen. Ook kunt u zelf van begin af aan nieuwe creëren en dragen.
 			</text>
 			<texture_picker label="Stof" name="Fabric" tool_tip="Klik om een afbeelding te kiezen"/>
 			<color_swatch label="Kleur/tint" name="Color/Tint" tool_tip="Klik om de kleurkiezer te openen"/>
-			<button label="Nieuwe handschoenen maken" label_selected="Nieuwe handschoenen maken" name="Create New" width="180"/>
+			<button label="Nieuwe handschoenen maken" label_selected="Nieuwe handschoenen maken" name="Create New" width="190"/>
 			<button label="Uitdoen" label_selected="Uitdoen" name="Take Off"/>
 			<button label="Opslaan" label_selected="Opslaan" name="Save"/>
 			<button label="Opslaan als..." label_selected="Opslaan als..." name="Save As"/>
@@ -466,7 +466,7 @@ slepen. Ook kunt u zelf van begin af aan een nieuwe creëren en dragen.
 			<button label="Herstel" label_selected="Herstel" name="Revert"/>
 		</panel>
 	</tab_container>
-	<scroll_container left="207" name="panel_container"/>
+	<scroll_container left="254" name="panel_container"/>
 	<button label="Annuleren" label_selected="Annuleren" name="Cancel"/>
 	<button label="OK" label_selected="OK" name="Ok"/>
 	<button label="Maak kleding..." label_selected="Maak kleding..." name="Make Outfit" left="110"/>
diff --git a/indra/newview/skins/default/xui/nl/floater_env_settings.xml b/indra/newview/skins/default/xui/nl/floater_env_settings.xml
index d212f544c5..d66c0b2205 100644
--- a/indra/newview/skins/default/xui/nl/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/nl/floater_env_settings.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Environment Editor Floater" title="Omgeving editor">
-	<text name="EnvTimeText">
-		Tijd van de dag
+	<text bottom="-42" name="EnvTimeText">
+		Tijd van de 
+dag
 	</text>
-	<text name="EnvTimeText2">
+	<text bottom_delta="-36" name="EnvTimeText2">
 		0:00
 	</text>
 	<text name="EnvCloudText">
diff --git a/indra/newview/skins/default/xui/nl/floater_inspect.xml b/indra/newview/skins/default/xui/nl/floater_inspect.xml
index d4fa75d94f..96c9d59f90 100644
--- a/indra/newview/skins/default/xui/nl/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/nl/floater_inspect.xml
@@ -2,10 +2,10 @@
 <floater name="inspect" title="Objecten inspecteren">
 	<scroll_list name="object_list" tool_tip="Selecteer een object van deze lijst om het in-wereld te markeren">
 		<column label="Objectnaam" name="object_name"/>
-		<column label="Eigenaarnaam" name="owner_name"/>
-		<column label="Makernaam:" name="creator_name"/>
+		<column label="Eigenaar" name="owner_name"/>
+		<column label="Maker" name="creator_name"/>
 		<column label="Aanmaakdatum" name="creation_date"/>
 	</scroll_list>
-	<button label="Bekijk eigenaarprofiel..." label_selected="" name="button owner" tool_tip="Bekijk het profiel van de eigenaar van het gemarkeerde object"/>
-	<button label="Bekijk makerprofiel..." label_selected="" name="button creator" tool_tip="Bekijk het profiel van de originele maker van het gemarkeerde object"/>
+	<button label="Toon profiel eigenaar..." label_selected="" name="button owner" tool_tip="Bekijk het profiel van de eigenaar van het gemarkeerde object"/>
+	<button label="Toon profiel maker..." label_selected="" name="button creator" tool_tip="Bekijk het profiel van de originele maker van het gemarkeerde object"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_joystick.xml b/indra/newview/skins/default/xui/nl/floater_joystick.xml
index 27556a89f8..dcdddd0492 100644
--- a/indra/newview/skins/default/xui/nl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/nl/floater_joystick.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="Joystick configuratie">
-	<check_box name="enable_joystick">
-		Joystick inschakelen
+	<check_box name="enable_joystick" width="80">
+		Joystick inschakelen:
 	</check_box>
+	<text left="146" name="joystick_type" width="360"/>
 	<spinner label="X-as mapping" name="JoystickAxis1"/>
 	<spinner label="Y-as mapping" name="JoystickAxis2"/>
 	<spinner label="Z-as mapping" name="JoystickAxis0"/>
@@ -52,7 +53,7 @@
 	<text name="ZDeadZone">
 		Z dode zone
 	</text>
-	<text name="PitchDeadZone">
+	<text name="PitchDeadZone" left="4" width="110">
 		Stampen dode zone
 	</text>
 	<text name="YawDeadZone">
@@ -70,9 +71,9 @@
 	<text name="ZoomDeadZone">
 		Zoom dode zone
 	</text>
-	<button label="SpaceNavigator standaardwaarden" name="SpaceNavigatorDefaults"/>
+	<button label="SpaceNavigator standaardwaarden" name="SpaceNavigatorDefaults" width="200" font="SansSerifSmall"/>
 	<button label="OK" label_selected="OK" name="ok_btn"/>
-	<button label="Annuleren" label_selected="Annuleren" name="cancel_btn"/>
+	<button label="Annuleren" label_selected="Annuleren" name="cancel_btn" left_delta="110"/>
 	<string name="JoystickMonitor">
 		Joystick monitor
 	</string>
diff --git a/indra/newview/skins/default/xui/nl/floater_mute_object.xml b/indra/newview/skins/default/xui/nl/floater_mute_object.xml
index efc12f29e2..ca3b34c3a2 100644
--- a/indra/newview/skins/default/xui/nl/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/nl/floater_mute_object.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="mute by name" title="Negeer object op naam">
-	<text name="message">
-		Negeer op naam heeft alleen invloed op object chat en IM, niet op geluiden. U dient de naam van het object exact te typen.
+	<text name="message" bottom_delta="-40">
+		Negeer op naam heeft alleen invloed op object chat
+en IM, niet op geluiden. U dient de naam van het object 
+exact te typen.
 	</text>
-	<line_editor name="object_name">
+	<line_editor name="object_name" bottom_delta="-58">
 		Object naam
 	</line_editor>
 	<button label="Ok" name="OK"/>
diff --git a/indra/newview/skins/default/xui/nl/floater_openobject.xml b/indra/newview/skins/default/xui/nl/floater_openobject.xml
index 58ca71505a..10b502be1c 100644
--- a/indra/newview/skins/default/xui/nl/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/nl/floater_openobject.xml
@@ -3,6 +3,6 @@
 	<text name="object_name">
 		[DESC]:
 	</text>
-	<button label="Kopiëren naar inventaris" label_selected="Kopiëren naar inventaris" name="copy_to_inventory_button"/>
-	<button label="Kopiëren en dragen" label_selected="Kopiëren en dragen" name="copy_and_wear_button"/>
+	<button label="Kopiëren naar inventaris" label_selected="Kopiëren naar inventaris" name="copy_to_inventory_button" width="140"/>
+	<button label="Kopiëren en dragen" label_selected="Kopiëren en dragen" name="copy_and_wear_button" left="164"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_pay.xml b/indra/newview/skins/default/xui/nl/floater_pay.xml
index 3255412439..4018ebdc93 100644
--- a/indra/newview/skins/default/xui/nl/floater_pay.xml
+++ b/indra/newview/skins/default/xui/nl/floater_pay.xml
@@ -6,10 +6,10 @@
 	<button label="L$20" label_selected="L$20" name="fastpay 20"/>
 	<button label="Betaal" label_selected="Betaal" name="pay btn"/>
 	<button label="Annuleren" label_selected="Annuleren" name="cancel btn"/>
-	<text name="payee_label">
+	<text name="payee_label" width="100">
 		Betaal inwoner:
 	</text>
-	<text name="payee_name">
+	<text name="payee_name" left="110">
 		[FIRST] [LAST]
 	</text>
 	<text name="fastpay text">
diff --git a/indra/newview/skins/default/xui/nl/floater_pay_object.xml b/indra/newview/skins/default/xui/nl/floater_pay_object.xml
index 23a161ac14..d3826648f2 100644
--- a/indra/newview/skins/default/xui/nl/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/nl/floater_pay_object.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-	<text name="payee_group">
+	<text name="payee_group" left="5" width="90" halign="left">
 		Betaal groep:
 	</text>
-	<text name="payee_resident">
+	<text name="payee_resident" left="5" width="90" halign="left">
 		Betaal inwoner:
 	</text>
-	<text name="payee_name">
+	<text name="payee_name" left="100" width="200">
 		[FIRST] [LAST]
 	</text>
-	<text name="object_name_label">
+	<text name="object_name_label" left="5" width="90" halign="left">
 		Via object:
 	</text>
-	<text name="object_name_text">
+	<text name="object_name_text" left="100" width="200">
 		...
 	</text>
-	<text name="fastpay text">
+	<text name="fastpay text" halign="left">
 		Snel betalen:
 	</text>
 	<text name="amount text">
diff --git a/indra/newview/skins/default/xui/nl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/nl/floater_perm_prefs.xml
index d19b5523f5..c1c9492286 100644
--- a/indra/newview/skins/default/xui/nl/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/nl/floater_perm_prefs.xml
@@ -9,7 +9,7 @@
 		</text>
 		<check_box label="Wijzigen" name="next_owner_modify"/>
 		<check_box label="Kopiëren" name="next_owner_copy"/>
-		<check_box label="Verkopen/weggeven" name="next_owner_transfer"/>
+		<check_box label="Verkopen/weggeven" name="next_owner_transfer" left_delta="80"/>
 	</panel>
 	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="Annuleren" label_selected="Annuleren" name="cancel"/>
diff --git a/indra/newview/skins/default/xui/nl/floater_report_abuse.xml b/indra/newview/skins/default/xui/nl/floater_report_abuse.xml
index 98027a8132..1f64c8719c 100644
--- a/indra/newview/skins/default/xui/nl/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/nl/floater_report_abuse.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="Misbruik rapporteren">
 	<check_box label="Voeg schermafbeelding toe" name="screen_check"/>
-	<text name="reporter_title">
+	<text name="reporter_title" width="110">
 		Rapporteur:
 	</text>
-	<text name="reporter_field">
+	<text name="reporter_field" left_delta="70">
 		Loremipsum Dolorsitamut
 	</text>
 	<text name="sim_title">
 		Regio:
 	</text>
-	<text name="sim_field">
+	<text name="sim_field" left_delta="70">
 		Regionaam
 	</text>
 	<text name="pos_title">
 		Positie:
 	</text>
-	<text name="pos_field">
+	<text name="pos_field" left_delta="70">
 		{128.1, 128.1, 15.4}
 	</text>
 	<text name="select_object_label">
@@ -26,7 +26,7 @@
 	<text name="object_name_label">
 		Naam:
 	</text>
-	<text name="object_name">
+	<text name="object_name" width="120">
 		Consetetur Sadipscing
 	</text>
 	<text name="owner_name_label">
@@ -169,7 +169,9 @@
 		Details:
 	</text>
 	<text name="bug_aviso">
-		Wees alstublieft zo specifiek mogelijk m.b.t. datum, locatie, aard van het misbruik, relevante chat/IM tekst, en selecteer het object indien mogelijk.
+		Wees alstublieft zo specifiek mogelijk m.b.t. datum, locatie, 
+aard van het misbruik, relevante chat/IM tekst, en selecteer 
+het object indien mogelijk.
 	</text>
 	<text name="incomplete_title">
 		Let op: onvolledige rapporten zullen niet worden onderzocht.
diff --git a/indra/newview/skins/default/xui/nl/floater_select_key.xml b/indra/newview/skins/default/xui/nl/floater_select_key.xml
index da97c03a6c..c8daa10ab6 100644
--- a/indra/newview/skins/default/xui/nl/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/nl/floater_select_key.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title="">
 	<button label="Annuleren" label_selected="Annuleren" name="Cancel"/>
-	<text name="Save item as:">
-		Druk een toets om te selecteren
+	<text name="Save item as:" left="12" width="220">
+		Druk op een toets om die te selecteren
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_snapshot.xml b/indra/newview/skins/default/xui/nl/floater_snapshot.xml
index 44447dd153..52583f3c55 100644
--- a/indra/newview/skins/default/xui/nl/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/nl/floater_snapshot.xml
@@ -108,14 +108,14 @@
 			BMP
 		</combo_item>
 	</combo_box>
-	<spinner label="Breedte" name="snapshot_width"/>
-	<spinner label="Hoogte" name="snapshot_height"/>
+	<spinner label="Breedte" name="snapshot_width" label_width="48" width="100"/>
+	<spinner label="Hoogte" name="snapshot_height" label_width="41" width="95" left="114"/>
 	<check_box label="Beperk verhoudingen" name="keep_aspect_check"/>
 	<slider label="Afbeeldingkwaliteit" name="image_quality_slider"/>
-	<text name="layer_type_label">
+	<text name="layer_type_label" width="100">
 		Vastleggen:
 	</text>
-	<combo_box label="Afbeeldingslagen" name="layer_types">
+	<combo_box label="Afbeeldingslagen" name="layer_types" width="130" left="76">
 		<combo_item name="Colors">
 			Kleuren
 		</combo_item>
@@ -129,7 +129,7 @@
 	<check_box label="Toon interface in foto" name="ui_check"/>
 	<check_box label="Toon HUD objecten in foto" name="hud_check"/>
 	<check_box label="Open houden na opslaan" name="keep_open_check"/>
-	<check_box label="Frame bevriezen (volledig scherm voorbeeld)" name="freeze_frame_check"/>
+	<check_box label="Frame bevriezen" name="freeze_frame_check"/>
 	<check_box label="Automatisch verversen" name="auto_snapshot_check"/>
 	<string name="unknown">
 		onbekend
diff --git a/indra/newview/skins/default/xui/nl/floater_telehub.xml b/indra/newview/skins/default/xui/nl/floater_telehub.xml
index b1fc80cf3c..5a8abc208a 100644
--- a/indra/newview/skins/default/xui/nl/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/nl/floater_telehub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="telehub" title="Telehub">
+<floater name="telehub" title="Telehub" width="292">
 	<text name="status_text_connected">
 		Telehub verbonden met object [OBJECT]
 	</text>
@@ -13,13 +13,21 @@
 		Selecteer objecten klik Verbind telehub
 	</text>
 	<button label="Verbind telehub" name="connect_btn"/>
-	<button label="Verbinding verbreken" name="disconnect_btn"/>
+	<button label="Verbinding verbreken" name="disconnect_btn" width="128"/>
 	<text name="spawn_points_text">
 		Spawnpunten (posities, niet objecten):
 	</text>
+	<scroll_list bottom_delta="-44" draw_border="true" follows="left|top" font="SansSerifSmall"
+	     height="40" left="10" multi_select="false" name="spawn_points_list"
+	     width="230" />
+
 	<button label="Spawn toevoegen" name="add_spawn_point_btn"/>
 	<button label="Verwijder Spawn" name="remove_spawn_point_btn"/>
-	<text name="spawn_point_help">
-		Selecteer object en klik Toevoegen om positie te specificeren. U kunt het object daarna verplaatsen of verwijderen. Posities zijn relatief ten opzichte van het middelpunt van de telehub. Selecteer een item in de lijst om de positie in de wereld te tonen.
+	<text name="spawn_point_help" width="290">
+		Selecteer object en klik Toevoegen om positie 
+te specificeren. U kunt het object daarna verplaatsen 
+of verwijderen. Posities zijn relatief ten opzichte 
+van het middelpunt van de telehub. Selecteer een 
+item in de lijst om de positie in de wereld te tonen.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/nl/floater_texture_ctrl.xml
index 440a31097d..13a68747c6 100644
--- a/indra/newview/skins/default/xui/nl/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/nl/floater_texture_ctrl.xml
@@ -9,12 +9,12 @@
 	<text name="unknown">
 		Afmetingen: [DIMENSIONS]
 	</text>
-	<button label="Standaard" label_selected="Standaard" name="Default"/>
-	<button label="Geen" label_selected="Geen" name="None"/>
+	<button label="Standaard" label_selected="Standaard" name="Default" width="70"/>
+	<button label="Geen" label_selected="Geen" name="None" left="80"/>
 	<button label="Blanco" label_selected="Blanco" name="Blank"/>
 	<check_box label="Toon mappen" name="show_folders_check"/>
 	<search_editor label="Type hier om te zoeken" name="inventory search editor"/>
-	<check_box label="Meteen toepassen" name="apply_immediate_check"/>
+	<check_box label="Direct toepassen" name="apply_immediate_check"/>
 	<button label="Annuleren" label_selected="Annuleren" name="Cancel"/>
 	<button label="Selecteren" label_selected="Selecteren" name="Select"/>
 	<string name="pick title">
diff --git a/indra/newview/skins/default/xui/nl/floater_tools.xml b/indra/newview/skins/default/xui/nl/floater_tools.xml
index c7f99195dd..42cf22aa15 100644
--- a/indra/newview/skins/default/xui/nl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/nl/floater_tools.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Bouwen" width="288">
 	<button label="" label_selected="" name="button focus" tool_tip="Focus"/>
 	<button label="" label_selected="" name="button move" tool_tip="Verplaats"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Bewerk"/>
 	<button label="" label_selected="" name="button create" tool_tip="Maak"/>
 	<button label="" label_selected="" name="button land" tool_tip="Land"/>
 	<check_box label="Zoom" name="radio zoom"/>
-	<check_box label="Draaien (Ctrl)" name="radio orbit"/>
+	<check_box label="Roteren (Ctrl)" name="radio orbit"/>
 	<check_box label="Verplaatsen (Ctrl-Shift)" name="radio pan"/>
 	<check_box label="Verplaatsen" name="radio move"/>
 	<check_box label="Optillen (Ctrl)" name="radio lift"/>
-	<check_box label="Draaien (Ctrl-Shift)" name="radio spin"/>
+	<check_box label="Roteren (Ctrl-Shift)" name="radio spin"/>
 	<check_box label="Positie" name="radio position"/>
-	<check_box label="Draaien (Ctrl)" name="radio rotate"/>
+	<check_box label="Roteren (Ctrl)" name="radio rotate"/>
 	<check_box label="Uitrekken (Ctrl-Shift)" name="radio stretch"/>
 	<check_box label="Selecteer textuur" name="radio select face"/>
 	<check_box label="Bewerk gekoppelde onderdelen" name="checkbox edit linked parts"/>
 	<text name="text ruler mode">
 		Liniaal:
 	</text>
-	<combo_box name="combobox grid mode">
+	<combo_box name="combobox grid mode" width="78" left_delta="38">
 		<combo_item name="World">
 			Wereld
 		</combo_item>
@@ -30,18 +30,18 @@
 			Referentie
 		</combo_item>
 	</combo_box>
-	<check_box label="Beide zijden uitrekken" name="checkbox uniform"/>
-	<check_box label="Texturen uitrekken" name="checkbox stretch textures"/>
-	<check_box label="Gebruik grid" name="checkbox snap to grid"/>
-	<button label="Opties..." label_selected="Opties..." name="Options..."/>
-	<text name="text status">
+	<check_box left="136" label="Beide zijden uitrekken" name="checkbox uniform"/>
+	<check_box left="136" label="Texturen uitrekken" name="checkbox stretch textures"/>
+	<check_box left="136" label="Gebruik grid" name="checkbox snap to grid"/>
+	<button label="Opties..." label_selected="Opties..." name="Options..." height="18" bottom_delta="-15"/>
+	<text name="text status" width="280">
 		Sleep om te verplaatsen, Shift-slepen om te kopiëren
 	</text>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Kubus"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
 	<button label="" label_selected="" name="ToolPyramid" tool_tip="Piramide"/>
 	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetrahedron"/>
-	<button label="" label_selected="" name="ToolCylinder" tool_tip="Cylinder"/>
+	<button label="" label_selected="" name="ToolCylinder" tool_tip="Cilinder"/>
 	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Halve cilinder"/>
 	<button label="" label_selected="" name="ToolCone" tool_tip="Kegel"/>
 	<button label="" label_selected="" name="ToolHemiCone" tool_tip="Halve kegel"/>
@@ -73,13 +73,13 @@
 	<text name="Strength:">
 		Sterkte
 	</text>
-	<text name="obj_count">
+	<text name="obj_count" left="134">
 		Geselecteerde objecten: [COUNT]
 	</text>
-	<text name="prim_count">
+	<text name="prim_count" left="134">
 		primitieven: [COUNT]
 	</text>
-	<tab_container name="Object Info Tabs">
+	<tab_container name="Object Info Tabs" tab_max_width="62" tab_min_width="30" width="288">
 		<panel label="Algemeen" name="General">
 			<text name="Name:">
 				Naam:
@@ -95,7 +95,7 @@
 			</text>
 			<button label="Profiel..." label_selected="Profiel..." name="button creator profile"/>
 			<text name="Owner:">
-				Eigenaar
+				Eigenaar:
 			</text>
 			<text name="Owner Name">
 				Thrax Linden
@@ -112,7 +112,7 @@
 				Permissies:
 			</text>
 			<text name="perm_modify">
-				U kunt dit object wijzigen
+				U kunt dit object wijzigen.
 			</text>
 			<check_box label="Deel met groep" name="checkbox share with group" tool_tip="Alle leden van de ingestelde groep toestaan om te delen en uw permissies voor dit object te gebruiken. U moet &apos;Overdragen&apos; om rolbeperkingen in te schakelen."/>
 			<string name="text deed continued">
@@ -144,12 +144,12 @@
 				Volgende eigenaar kan:
 			</text>
 			<check_box label="Wijzigen" name="checkbox next owner can modify"/>
-			<check_box label="Kopiëren" name="checkbox next owner can copy"/>
-			<check_box label="Verkopen/weggeven" name="checkbox next owner can transfer"/>
+			<check_box label="Kopiëren" name="checkbox next owner can copy" left_delta="80"/>
+			<check_box label="Verkopen/weggeven" name="checkbox next owner can transfer" left_delta="67"/>
 			<text name="label click action">
 				Wanneer links-geklikt:
 			</text>
-			<combo_box name="clickaction">
+			<combo_box name="clickaction" width="178">
 				<combo_item name="Touch/grab(default)">
 					Aanraken/pakken (standaard)
 				</combo_item>
@@ -191,19 +191,19 @@
 				F:
 			</text>
 			<string name="text modify info 1">
-				U kunt dit object wijzigen
+				U kunt dit object wijzigen.
 			</string>
 			<string name="text modify info 2">
-				U kunt deze objecten wijzigen
+				U kunt deze objecten wijzigen.
 			</string>
 			<string name="text modify info 3">
-				U kunt dit object niet wijzigen
+				U kunt dit object niet wijzigen.
 			</string>
 			<string name="text modify info 4">
-				U kunt deze objecten niet wijzigen
+				U kunt deze objecten niet wijzigen.
 			</string>
 			<string name="text modify warning">
-				U moet het hele object selecteren om permissies in te stellen
+				U moet het hele object selecteren om permissies in te stellen.
 			</string>
 			<string name="Cost Default">
 				Prijs:           L$
@@ -358,7 +358,7 @@
 				Deuk begin en einde
 			</text>
 			<text name="advanced_slice">
-				Uitsnede Begin en Einde
+				Uitsnede begin en einde
 			</text>
 			<spinner label="B" name="Path Limit Begin"/>
 			<spinner label="E" name="Path Limit End"/>
@@ -370,7 +370,7 @@
 			<text name="text radius delta">
 				Straal
 			</text>
-			<text name="text revolutions">
+			<text name="text revolutions" width="84">
 				Omwentelingen
 			</text>
 			<texture_picker label="Sculpt textuur" name="sculpt texture control" tool_tip="Klik om een afbeelding te kiezen"/>
@@ -405,14 +405,14 @@
 				Bewerk objectkenmerken:
 			</text>
 			<check_box label="Flexibiliteit" name="Flexible1D Checkbox Ctrl" tool_tip="Staat toe dat objecten kunnen buigen om de Z-as. (alleen aan de client kant)"/>
-			<spinner label="Zachtheid" name="FlexNumSections"/>
-			<spinner label="Zwaartekracht" name="FlexGravity"/>
-			<spinner label="Slepen" name="FlexFriction"/>
-			<spinner label="Wind" name="FlexWind"/>
-			<spinner label="Spanning" name="FlexTension"/>
-			<spinner label="Kracht X" name="FlexForceX"/>
-			<spinner label="Kracht Y" name="FlexForceY"/>
-			<spinner label="Kracht Z" name="FlexForceZ"/>
+			<spinner label="Zachtheid" name="FlexNumSections" width="143" label_width="80"/>
+			<spinner label="Zwaartekracht" name="FlexGravity" width="143" label_width="80"/>
+			<spinner label="Slepen" name="FlexFriction" width="143" label_width="80"/>
+			<spinner label="Wind" name="FlexWind" width="143" label_width="80"/>
+			<spinner label="Spanning" name="FlexTension" width="143" label_width="80"/>
+			<spinner label="Kracht X" name="FlexForceX" width="143" label_width="80"/>
+			<spinner label="Kracht Y" name="FlexForceY" width="143" label_width="80"/>
+			<spinner label="Kracht Z" name="FlexForceZ" width="143" label_width="80"/>
 			<check_box label="Licht" name="Light Checkbox Ctrl" tool_tip="Zorgt dat het object licht uitstraalt"/>
 			<text name="label color">
 				Kleur
@@ -425,13 +425,13 @@
 		<panel label="Textuur" name="Texture">
 			<texture_picker label="Textuur" name="texture control" tool_tip="Klik om een afbeelding te kiezen"/>
 			<color_swatch label="Kleur" name="colorswatch" tool_tip="Klik om kleurkiezer to openen"/>
-			<text name="color trans">
+			<text name="color trans" width="100">
 				Transparantie %
 			</text>
 			<text name="glow label">
 				Gloed
 			</text>
-			<check_box label="Volledige helderheid" name="checkbox fullbright"/>
+			<check_box label="Volledige &#10;helderheid" name="checkbox fullbright" bottom_delta="-21"/>
 			<text name="tex gen">
 				Mapping
 			</text>
@@ -536,7 +536,7 @@
 				Herhalingen per zijde
 			</string>
 			<text name="rpt">
-				Herhalingen per meter
+				Herhalingen per m
 			</text>
 			<button label="Toepassen" label_selected="Toepassen" name="button apply"/>
 			<text name="tex offset">
@@ -545,13 +545,15 @@
 			<spinner label="Horizontaal (U)" name="TexOffsetU"/>
 			<spinner label="Verticaal (V)" name="TexOffsetV"/>
 			<text name="textbox autofix">
-				Mediatextuur uitlijnen (moet eerst laden)
+				Mediatextuur uitlijnen
+(moet eerst laden)
 			</text>
-			<button label="Uitlijnen" label_selected="Uitlijnen" name="button align"/>
+			<button label="Uitlijnen" label_selected="Uitlijnen" name="button align" left="155" />
 		</panel>
 		<panel label="Inhoud" name="Contents">
 			<button label="Nieuw script" label_selected="Nieuw script..." name="button new script"/>
 			<button label="Permissies..." name="button permissions"/>
+		<panel name="ContentsInventory" width="272" />
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
@@ -559,14 +561,14 @@
 			Perceel Informatie
 		</text>
 		<text name="label_area_price">
-			Prijs: L$[PRICE] voor [AREA] m2.
+			Prijs: L$[PRICE] voor [AREA] m².
 		</text>
 		<text name="label_area">
-			Gebied: [AREA] m2.
+			Gebied: [AREA] m².
 		</text>
 		<button label="Over land..." label_selected="Over land..." name="button about land"/>
 		<check_box label="Toon Eigenaren" name="checkbox show owners" tool_tip="Kleur percelen op basis van hun eigendom"/>
-		<button label="?" label_selected="?" name="button show owners help"/>
+		<button label="?" label_selected="?" name="button show owners help" left_delta="105"/>
 		<text name="label_parcel_modify">
 			Wijzig Perceel
 		</text>
diff --git a/indra/newview/skins/default/xui/nl/floater_top_objects.xml b/indra/newview/skins/default/xui/nl/floater_top_objects.xml
index e79ee4ea56..cc252352eb 100644
--- a/indra/newview/skins/default/xui/nl/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/nl/floater_top_objects.xml
@@ -4,29 +4,29 @@
 		Laden…
 	</text>
 	<scroll_list name="objects_list">
-		<column label="Score" name="score"/>
-		<column label="Naam" name="name"/>
-		<column label="Eigenaar" name="owner"/>
-		<column label="Locatie" name="location"/>
-		<column label="Tijd" name="time"/>
-		<column label="Mono tijd" name="mono_time"/>
+		<column label="Score" name="score" width="84"/>
+		<column label="Naam" name="name" width="84"/>
+		<column label="Eigenaar" name="owner" width="84"/>
+		<column label="Locatie" name="location" width="84"/>
+		<column label="Tijd" name="time" width="84"/>
+		<column label="Mono tijd" name="mono_time" width="84"/>
 	</scroll_list>
-	<text name="id_text">
+	<text name="id_text" left="2">
 		Object ID:
 	</text>
 	<button label="Toon baken" name="show_beacon_btn"/>
-	<text name="obj_name_text">
+	<text name="obj_name_text" left="2">
 		Object naam:
 	</text>
 	<button label="Filter" name="filter_object_btn"/>
-	<text name="owner_name_text">
+	<text name="owner_name_text" left="2">
 		Eigenaar naam:
 	</text>
 	<button label="Filter" name="filter_owner_btn"/>
-	<button label="Geselecteerde retourneren" name="return_selected_btn"/>
-	<button label="Alles retourneren" name="return_all_btn"/>
-	<button label="Geselecteerde uitschakelen" name="disable_selected_btn"/>
-	<button label="Alles uitschakelen" name="disable_all_btn"/>
+	<button label="Geselecteerde retourneren" name="return_selected_btn" width="170"/>
+	<button label="Alles retourneren" name="return_all_btn" left="190"/>
+	<button label="Geselecteerde uitschakelen" name="disable_selected_btn" width="170"/>
+	<button label="Alles uitschakelen" name="disable_all_btn" left="190"/>
 	<button label="Verversen" name="refresh_btn"/>
 	<string name="top_scripts_title">
 		Top scripts
diff --git a/indra/newview/skins/default/xui/nl/floater_tos.xml b/indra/newview/skins/default/xui/nl/floater_tos.xml
index b9a162be4a..a8f08a09a9 100644
--- a/indra/newview/skins/default/xui/nl/floater_tos.xml
+++ b/indra/newview/skins/default/xui/nl/floater_tos.xml
@@ -4,7 +4,8 @@
 	<button label="Annuleren" label_selected="Annuleren" name="Cancel"/>
 	<check_box label="Ik ga akkoord met de voorwaarden van service" name="agree_chk"/>
 	<text name="tos_heading">
-		Leest u alstublieft de volgende voorwaarden van service door. Om door te gaan met inloggen in Second Life dient u de overeenkomst te accepteren.
+		Leest u alstublieft de volgende voorwaarden van service door. Om door te gaan met inloggen in 
+Second Life dient u de overeenkomst te accepteren.
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/nl/floater_url_entry.xml b/indra/newview/skins/default/xui/nl/floater_url_entry.xml
index 23ea21bcc5..6926f09390 100644
--- a/indra/newview/skins/default/xui/nl/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/nl/floater_url_entry.xml
@@ -4,8 +4,8 @@
 		Media URL:
 	</text>
 	<button label="OK" name="ok_btn"/>
-	<button label="Annuleren" name="cancel_btn"/>
-	<button label="Leegmaken" name="clear_btn"/>
+	<button label="Annuleren" name="cancel_btn" width="80"/>
+	<button label="Leegmaken" name="clear_btn" width="80"/>
 	<text name="loading_label">
 		Laden…
 	</text>
diff --git a/indra/newview/skins/default/xui/nl/floater_water.xml b/indra/newview/skins/default/xui/nl/floater_water.xml
index 38ec15d1a0..2238008fd8 100644
--- a/indra/newview/skins/default/xui/nl/floater_water.xml
+++ b/indra/newview/skins/default/xui/nl/floater_water.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Water Floater" title="Geavanceerde water editor">
+	<combo_box bottom="-50" height="18" left_delta="116" name="WaterPresetsCombo" width="150" />
 	<text name="KeyFramePresetsText">
 		Watervoorinstellingen
 	</text>
-	<button label="Nieuw" label_selected="Nieuw" name="WaterNewPreset"/>
+	<button label="Nieuw" label_selected="Nieuw" name="WaterNewPreset" left_delta="190"/>
 	<button label="Opslaan" label_selected="Opslaan" name="WaterSavePreset"/>
-	<button label="Verwijderen" label_selected="Verwijderen" name="WaterDeletePreset"/>
+	<button label="Verwijderen" label_selected="Verwijderen" name="WaterDeletePreset" width="80"/>
 	<tab_container name="Water Tabs">
 		<panel label="Instellingen" name="Settings">
 			<text name="BHText">
diff --git a/indra/newview/skins/default/xui/nl/menu_viewer.xml b/indra/newview/skins/default/xui/nl/menu_viewer.xml
index 0827858d68..37116be5f5 100644
--- a/indra/newview/skins/default/xui/nl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/nl/menu_viewer.xml
@@ -165,7 +165,9 @@
 		<menu_item_separator label="-----------" name="separator4"/>
 		<menu_item_call label="Focus op selectie" name="Focus on Selection"/>
 		<menu_item_call label="Zoom naar selectie" name="Zoom to Selection"/>
-		<menu_item_call label="Koop object" name="Menu Object Take"/>
+		<menu_item_call label="Koop object" name="Menu Object Take">
+			<on_enable userdata="Koop,Neem" name="EnableBuyOrTake"/>
+		</menu_item_call>
 		<menu_item_call label="Neem kopie" name="Take Copy"/>
 		<menu_item_call label="Object terug opslaan in objectinhoud" name="Save Object Back to Object Contents"/>
 		<menu_item_separator label="-----------" name="separator6"/>
diff --git a/indra/newview/skins/default/xui/nl/notifications.xml b/indra/newview/skins/default/xui/nl/notifications.xml
index c64c2cd021..35dc507c6e 100644
--- a/indra/newview/skins/default/xui/nl/notifications.xml
+++ b/indra/newview/skins/default/xui/nl/notifications.xml
@@ -245,7 +245,7 @@ Naar de Second Life website gaan voor meer informatie over partner schap?
 * Klik op Laden &gt; &apos;Thuis pagina URL&apos; om terug te keren naar het web profiel van deze Inwoner indien U verder genavigeerd bent.
 
 Indien u uw eigen profiel bekijkt, kunt U elke willekeurige URL opgeven als uw web profiel en op OK klikken om het in te stellen.
-Andere Inwoners kunnen de door U opgegeven URL bezoeken indien zijn uw profiel bekijken.
+Andere Inwoners kunnen de door U opgegeven URL bezoeken indien zij uw profiel bekijken.
 	</notification>
 	<notification name="JoinGroupCanAfford">
 		Deelname aan deze groep kost L$[COST].
@@ -418,10 +418,10 @@ Betaalde advertentiekosten zullen niet worden terug gestort.
 		<usetemplate name="okcancelbuttons" notext="Annuleren" yestext="OK"/>
 	</notification>
 	<notification name="CacheWillClear">
-		De Cache zal geleegd worden als u [SECOND_LIFE] opnieuw start.
+		De cache zal geleegd worden als u [SECOND_LIFE] opnieuw start.
 	</notification>
 	<notification name="CacheWillBeMoved">
-		De Cache zal verplaatst worden als u [SECOND_LIFE] opnieuw start.
+		De cache zal verplaatst worden als u [SECOND_LIFE] opnieuw start.
 Opmerking: Dit zal de Cache legen.
 	</notification>
 	<notification name="ChangeConnectionPort">
@@ -1541,7 +1541,7 @@ Ga naar de kennisbank voor meer informatie over inhoudscategorieën?
 		U wordt niet in die regio toegelaten vanwege uw inhoudscategorie.
 
 U kunt klikken op &apos;Wijzig voorkeur&apos; om uw inhoudscategorie voorkeur nu te verhogen en toegelaten te worden. U zult in staat zijn om [REGIONMATURITY] inhoud te zoeken en benaderen vanaf dit moment. Wanneer u later deze instelling wilt wijzigen, ga dan naar Bewerken &gt; Voorkeuren... &gt; Algemeen.
-	 <form>
+	 <form name="form">
       <button
        name="OK"
        text="Wijzig voorkeur"/>
@@ -1549,7 +1549,7 @@ U kunt klikken op &apos;Wijzig voorkeur&apos; om uw inhoudscategorie voorkeur nu
        default="true"
        name="Cancel"
        text="Sluiten"/>
-       <ignore text="Wanneer regiotoegang wordt geblokkeerd vanwege de inhoudscategorie voorkeur"/>
+       <ignore name="ignore" text="Wanneer regiotoegang wordt geblokkeerd vanwege de inhoudscategorie voorkeur"/>
     </form>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
@@ -2137,7 +2137,7 @@ Wilt u de Niet Storen Modus verlaten voordat u deze transactie completeert?
 		<usetemplate ignoretext="Bij verwijderen van de inhoud uit de inventaris vuilnisbak map" name="okcancelignore" notext="Annuleren" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmClearBrowserCache">
-		Weet u zeker dat u uw browser cache wilt legen?
+		Weet u zeker dat u uw browsercache wilt legen?
 		<usetemplate name="okcancelbuttons" notext="Annuleren" yestext="Ja"/>
 	</notification>
 	<notification name="ConfirmClearCookies">
@@ -2162,25 +2162,25 @@ Plaats het in een web pagina om anderen eenvoudig toegang te verschaffen naar de
 		</form>
 	</notification>
 	<notification name="GraphicsPreferencesHelp">
-		Dit venster bepaald de venster afmetingen, resolutie en kwaliteit van de client&apos;s grafische weergave. De Voorkeuren &gt; Grafische interface laat u kiezen uit vier grafische niveaus: Laag, Middel, Hoog en Ultra. U kunt ook uw grafische instellingen aanpassen met het aan vinken van het Custom vakje en de volgende instellingen manipuleren:
+		Dit venster bepaald de venster afmetingen, resolutie en kwaliteit van de client&apos;s grafische weergave. De Voorkeuren &gt; Grafische interface laat u kiezen uit vier grafische niveaus: Laag, Middel, Hoog en Ultra. U kunt ook uw grafische instellingen aanpassen met het aan vinken van het Aangepast vakje en de volgende instellingen manipuleren:
 
 Shaders: In of uitschakelen van de verschillende typen pixel shaders.
 
-Reflectie Detail: Stelt het type objecten in hetgeen water kan reflecteren.
+Reflectiedetail: Stelt het type objecten in hetgeen water kan reflecteren.
 
-Avatar Weergave: Stelt de opties in die van invloed zijn op hoe de client een avatar zal renderen.
+Avatarweergave: Stelt de opties in die van invloed zijn op hoe de client een avatar zal renderen.
 
-Zicht bereik: Beïnvloed tot hoe ver objecten vanaf uw zichtpunt worden weergegeven in de scène.
+Zichtbereik: Beïnvloed tot hoe ver objecten vanaf uw zichtpunt worden weergegeven in de scène.
 
 Maximaal Aantal Particles: Stelt het maximaal aantal particles in die u tegelijk kunt zien op uw scherm.
 
-Nabewerking Kwaliteit: Stelt de resolutie in waarmee Gloei wordt weergegeven.
+Nabewerkingskwaliteit: Stelt de resolutie in waarmee Gloei wordt weergegeven.
 
-Maas Detail: Stelt de hoeveelheid detail of het aantal driehoeken in gebruikt voor de weergave van bepaalde objecten. Een hogere waarde zal langer nemen om weer te gegeven, maar zorgen voor objecten met meer detail.
+Maasdetail: Stelt de hoeveelheid detail of het aantal driehoeken in gebruikt voor de weergave van bepaalde objecten. Een hogere waarde zal langer nemen om weer te gegeven, maar zorgen voor objecten met meer detail.
 
-Licht Detail: Bepaald welke typen lichten u wenst weer te geven.
+Lichtdetail: Bepaald welke typen lichten u wenst weer te geven.
 
-Terrein Detail: Stelt de hoeveelheid detail in die u wilt zien voor het terrein textuur.
+Terreindetail: Stelt de hoeveelheid detail in die u wilt zien voor het terrein textuur.
 	</notification>
 	<notification name="WLSavePresetAlert">
 		Wilt u de opgeslagen voor instellingen overschrijven?
@@ -2671,7 +2671,7 @@ Gaat u alstublieft naar de kennisbank voor details over het betreden van gebiede
 	<notification name="ImproperPaymentStatus">
 		U heeft niet de juiste betalingstatus om deze regio binnen te gaan.
 	</notification>
-	<notification name="MustGetAgeRgion">
+	<notification name="MustGetAgeRegion">
 		U moet leeftijd geverifieerd zijn om deze regio binnen te gaan.
 	</notification>
 	<notification name="MustGetAgeParcel">
diff --git a/indra/newview/skins/default/xui/nl/panel_friends.xml b/indra/newview/skins/default/xui/nl/panel_friends.xml
index 2f43ee0a53..eaf6e5d55b 100644
--- a/indra/newview/skins/default/xui/nl/panel_friends.xml
+++ b/indra/newview/skins/default/xui/nl/panel_friends.xml
@@ -11,10 +11,10 @@
 		<column name="icon_edit_mine" tool_tip="Vriend kan objecten wijzigen, verwijderen of oppakken"/>
 		<column name="icon_edit_theirs" tool_tip="U kunt de objecten van deze vriend bewerken"/>
 	</scroll_list>
-	<button label="IM/Oproepen" name="im_btn" tool_tip="Open Instant Message sessie"/>
-	<button label="Profiel" name="profile_btn" tool_tip="Toon afbeelding, groepen en andere informatie"/>
-	<button label="Teleport..." name="offer_teleport_btn" tool_tip="Bied deze vriend een teleport naar uw huidige locatie aan"/>
-	<button label="Betaal..." name="pay_btn" tool_tip="Geef Linden dollars (L$) aan deze vriend"/>
-	<button label="Verwijderen..." name="remove_btn" tool_tip="Verwijder deze persoon van uw vriendenlijst"/>
-	<button label="Toevoegen..." name="add_btn" tool_tip="Bied vriendschap aan een inwoner aan"/>
+	<button label="IM/Oproepen" name="im_btn" tool_tip="Open Instant Message sessie" width="86"/>
+	<button label="Profiel" name="profile_btn" tool_tip="Toon afbeelding, groepen en andere informatie" width="86"/>
+	<button label="Teleport..." name="offer_teleport_btn" tool_tip="Bied deze vriend een teleport naar uw huidige locatie aan" width="86"/>
+	<button label="Betaal..." name="pay_btn" tool_tip="Geef Linden dollars (L$) aan deze vriend" width="86"/>
+	<button label="Verwijderen..." name="remove_btn" tool_tip="Verwijder deze persoon van uw vriendenlijst" width="86"/>
+	<button label="Toevoegen..." name="add_btn" tool_tip="Bied vriendschap aan een inwoner aan" width="86"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/nl/panel_group_general.xml b/indra/newview/skins/default/xui/nl/panel_group_general.xml
index 9982a527f4..7b78c845cd 100644
--- a/indra/newview/skins/default/xui/nl/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/nl/panel_group_general.xml
@@ -16,18 +16,18 @@ Laat uw muis boven de opties zweven voor meer help.
 	<text name="prepend_founded_by">
 		Opgericht door
 	</text>
-	<text name="founder_name">
+	<text name="founder_name" left_delta="84">
 		(wachten)
 	</text>
-	<text name="group_charter_label">
+	<text name="group_charter_label" width="244">
 		Groepcharter
 	</text>
 	<texture_picker label="Groepinsigne" name="insignia" tool_tip="Klik om een afbeelding te kiezen"/>
-	<text_editor name="charter">
+	<text_editor name="charter" width="244">
 		Groepcharter
 	</text_editor>
 	<button label="Deelnemen (L$0)" label_selected="Deelnemen (L$0)" name="join_button"/>
-	<button label="Gedetailleerde weergave" label_selected="Gedetailleerde weergave" name="info_button"/>
+	<button label="Gedetailleerde weergave" label_selected="Gedetailleerde weergave" name="info_button" width="154"/>
 	<text name="text_owners_and_visible_members">
 		Eigenaren en zichtbare leden
 	</text>
@@ -43,10 +43,10 @@ Laat uw muis boven de opties zweven voor meer help.
 		Groepvoorkeuren
 	</text>
 	<panel name="preferences_container">
-		<check_box label="Toon in zoeken" name="show_in_group_list" tool_tip="Laat mensen deze groep zien in zoekresultaten."/>
+		<check_box label="Toon in zoeken" name="show_in_group_list" tool_tip="Stelt in of deze groep zichtbaar is in de zoekresultaten."/>
 		<check_box label="Vrije toegang" name="open_enrollement" tool_tip="Stelt in of deze groep toestaat dat nieuwe leden lid kunnen worden zonder uitgenodigd te zijn."/>
 		<check_box label="Contributiebijdrage: L$" name="check_enrollment_fee" tool_tip="Stelt in of er een contributiebijdrage vereist is om lid te worden van de groep."/>
-		<spinner name="spin_enrollment_fee" tool_tip="Nieuwe leden moeten deze bijdrage betalen om deel te nemen aan de groep wanneer &quot;Contributie bijdrage&quot; is aangevinkt."/>
+		<spinner name="spin_enrollment_fee" tool_tip="Nieuwe leden moeten deze bijdrage betalen om deel te nemen aan de groep wanneer &quot;Contributie bijdrage&quot; is aangevinkt." width="58" left_delta="142"/>
 		<combo_box name="group_mature_check" tool_tip="Stelt in of uw groepsinformatie als mature beschouwd wordt.">
 			<combo_item name="select_mature">
 				- Selecteer -
@@ -64,14 +64,15 @@ Laat uw muis boven de opties zweven voor meer help.
 			</text>
 			<combo_box name="active_title" tool_tip="Stelt de titel in die in uw avatar&apos;s naamlabel verschijnt wanneer deze groep actief is."/>
 		</panel>
-		<check_box label="Ontvang groepsberichten" name="receive_notices" tool_tip="Stelt in of u berichten van deze groep wilt ontvangen. Verwijder het vinkje wanneer u spam ontvangt van deze groep."/>
+		<check_box label="Ontvang groepsberichten" name="receive_notices" tool_tip="Stelt in of u berichten van deze groep wilt ontvangen. Verwijder het vinkje wanneer u spam ontvangt van deze groep." left_delta="-4"/>
 		<check_box label="Toon deze groep in mijn profiel" name="list_groups_in_profile" tool_tip="Stelt in of u deze groep in uw profiel wil laten zien"/>
 	</panel>
 	<string name="incomplete_member_data_str">
 		Ledendata ophalen
 	</string>
 	<string name="confirm_group_create_str">
-		Het maken van deze groep zal u L$100 kosten. Weet u echt, echt, ECHT zeker dat u L$100 wil besteden om deze groep te maken? 
-Wees u ervan bewust dat, indien niemand anders binnen 48 uur lid wordt van deze groep, deze ontmanteld zal worden, waarbij de groepsnaam onbeschikbaar zal blijven voor toekomstig gebruik.
+		Het maken van deze groep zal u L$ 100 kosten. Weet u ECHT héél zeker dat u L$ 100 wilt betalen om deze groep te maken?
+
+WEES U ER VAN BEWUST, dat als er niemand binnen 48 uur lid wordt van deze groep, deze weer ontmanteld zal worden. Hierbij zal ook de groepsnaam onbeschikbaar blijven voor toekomstig gebruik!
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/nl/panel_group_invite.xml b/indra/newview/skins/default/xui/nl/panel_group_invite.xml
index 004fdc4bee..e012d88ff5 100644
--- a/indra/newview/skins/default/xui/nl/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/nl/panel_group_invite.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Nodig een lid uit" name="invite_panel">
 	<text name="help_text">
-		U kunt meerdere inwoners selecteren om voor uw groep uit te nodigen. Klik &apos;Open inwonerkiezer&apos; om te starten.
+		U kunt meerdere inwoners selecteren 
+om voor uw groep uit te nodigen. Klik 
+&apos;Open inwonerkiezer&apos; om te starten.
 	</text>
 	<button label="Open inwonerkiezer" name="add_button" tool_tip=""/>
 	<name_list name="invitee_list" tool_tip="Houd de Ctrl-toets vast en klik de namen van de inwoners om meerdere te selecteren."/>
 	<button label="Verwijder geselecteerden van lijst" name="remove_button" tool_tip="Verwijderd hierboven geselecteerde inwoners van de uitnodigingslijst."/>
 	<text name="role_text">
-		Kies welke rol aan hen wordt toegewezen:
+		Kies welke rol aan hen wordt 
+toegewezen:
 	</text>
-	<combo_box name="role_name" tool_tip="Kies uit de lijst met rollen waarvoor u toestemming heeft om leden toe te wijzen."/>
+	<combo_box name="role_name" tool_tip="Kies uit de lijst met rollen waarvoor u toestemming heeft om leden toe te wijzen." bottom_delta="-30"/>
 	<button label="Verzend uitnodigingen" name="ok_button"/>
 	<button label="Annuleren" name="cancel_button"/>
 	<string name="confirm_invite_owner_str">
diff --git a/indra/newview/skins/default/xui/nl/panel_group_notices.xml b/indra/newview/skins/default/xui/nl/panel_group_notices.xml
index 41aff527dd..68f3c87f7d 100644
--- a/indra/newview/skins/default/xui/nl/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/nl/panel_group_notices.xml
@@ -11,7 +11,9 @@
 		Groepsberichtenarchief
 	</text>
 	<text name="lbl2">
-		Berichten worden 14 dagen bewaard. Klik hieronder het bericht dat u wilt bekijken. Klik de &apos;Verversen&apos; knop om te controleren of nieuwe berichten zijn ontvangen. Berichtenlijsten zijn gelimiteerd tot 200 berichten groep per dag.
+		Berichten worden 14 dagen bewaard. Klik hieronder het bericht dat u wilt 
+bekijken. Klik de &apos;Verversen&apos; knop om te controleren of nieuwe berichten zijn 
+ontvangen. Berichtenlijsten zijn gelimiteerd tot 200 berichten groep per dag.
 	</text>
 	<scroll_list name="notice_list">
 		<column label="Onderwerp" name="subject"/>
@@ -28,18 +30,25 @@
 			Maak een bericht
 		</text>
 		<text name="lbl2">
-			U dient een onderwerp in te voeren om een bericht te versturen. U kunt een enkel item aan een bericht toevoegen door het van uw inventaris naar dit paneel te slepen. Bevestigde items moeten kopieerbaar en overdraagbaar zijn en u kunt geen mappen versturen.
+			U dient een onderwerp in te voeren om een bericht te versturen. 
+U kunt een enkel item aan een bericht toevoegen door het van 
+uw inventaris naar dit paneel te slepen. Bevestigde items 
+moeten kopieerbaar en overdraagbaar zijn en u kunt geen 
+mappen versturen.
 		</text>
-		<text name="lbl3">
+		<text bottom_delta="-79" halign="right" left="10" name="lbl3" width="60">
 			Onderwerp:
 		</text>
-		<text name="lbl4">
+		<line_editor name="create_subject" width="331" left_delta="71"/>
+		<text bottom_delta="-18" halign="right" left="10" name="lbl4" width="60">
 			Bericht:
 		</text>
-		<text name="lbl5">
+		<text_editor name="create_message" bottom_delta="-90" height="104" left_delta="71" width="330"/>
+		<line_editor name="create_inventory_name" width="190" left_delta="71"/>
+		<text name="lbl5" left="10">
 			Bevestig:
 		</text>
-		<button label="Verwijder bevestiging:" label_selected="Verwijder bevestiging:" name="remove_attachment"/>
+		<button label="Verwijder bevestiging" label_selected="Verwijder bevestiging" name="remove_attachment"/>
 		<button label="Verzend bericht" label_selected="Verzend bericht" name="send_notice"/>
 		<panel name="drop_target" tool_tip="Sleep een inventarisitem op het berichtvenster om het met het bericht mee te sturen. U dient permissie te hebben om het object te kopiëren en over te dragen wilt u het met het bericht mee kunnen sturen."/>
 	</panel>
@@ -56,6 +65,7 @@
 		<text name="lbl4">
 			Bericht:
 		</text>
-		<button label="Open bevestiging" label_selected="Open bevestiging" name="open_attachment"/>
+		<button label="Open bevestiging" label_selected="Open bevestiging" name="open_attachment" width="118"/>
+		<line_editor left="128" name="view_inventory_name" width="256"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/nl/panel_group_roles.xml b/indra/newview/skins/default/xui/nl/panel_group_roles.xml
index 50aabb0433..ffaaa8137a 100644
--- a/indra/newview/skins/default/xui/nl/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/nl/panel_group_roles.xml
@@ -12,7 +12,9 @@
 			Leden &amp; Rollen
 		</text>
 		<text name="static2">
-			Groepsleden krijgen Rollen met Mogelijkheden toegekend. Deze instellingen kunnen eenvoudig aangepast worden, zodat meer organisatie en flexibiliteit mogelijk is.
+			Groepsleden krijgen Rollen met Mogelijkheden toegekend. Deze instellingen
+kunnen eenvoudig aangepast worden, zodat meer organisatie en flexibiliteit
+mogelijk is.
 		</text>
 	</panel>
 	<panel name="roles_header">
@@ -20,12 +22,14 @@
 			Rollen
 		</text>
 		<text name="role_properties_modifiable">
-			Selecteer een Rol hieronder. U kunt zijn Naam, Omschrijving en Lid Titel wijzigen.
+			Selecteer een Rol hieronder. U kunt zijn Naam, Omschrijving en
+Lid Titel wijzigen.
 		</text>
 		<text name="role_properties_not_modifiable">
-			Selecteer een Rol hieronder om zijn eigenschappen, Leden en toegestane Mogelijkheden te bekijken.
+			Selecteer een Rol hieronder om zijn eigenschappen, Leden en
+toegestane Mogelijkheden te bekijken.
 		</text>
-		<text name="role_actions_modifiable">
+		<text bottom_delta="-28" name="role_actions_modifiable">
 			U kunt ook Mogelijkheden aan de Rol toekennen.
 		</text>
 		<text name="role_actions_not_modifiable">
@@ -37,14 +41,16 @@
 			Mogelijkheden
 		</text>
 		<text name="static2">
-			U kunt de Omschrijving van een Mogelijkheid bekijken en welke Rollen en Leden de Mogelijkheid kunnen uitvoeren.
+			U kunt de Omschrijving van een Mogelijkheid bekijken en welke Rollen en
+Leden de Mogelijkheid kunnen uitvoeren.
 		</text>
 	</panel>
-	<tab_container name="roles_tab_container">
-		<panel label="Leden" name="members_sub_tab" tool_tip="Leden">
+	<tab_container height="164" name="roles_tab_container">
+		<panel height="148" label="Leden" name="members_sub_tab" tool_tip="Leden">
+			<line_editor bottom="127" name="search_text"/>
 			<button label="Zoeken" name="search_button"/>
 			<button label="Alles Tonen" name="show_all_button"/>
-			<name_list name="member_list">
+			<name_list  bottom_delta="-105" height="104" name="member_list">
 				<column label="Lid Naam" name="name"/>
 				<column label="Gedoneerde Tier" name="donated"/>
 				<column label="Laatste Login" name="online"/>
@@ -55,15 +61,16 @@
 				U kunt Rollen aan Leden toewijzen of van Leden afnemen. Selecteer meerdere Leden door de Ctrl toets ingedrukt te houden en op hun namen te klikken.
 			</string>
 		</panel>
-		<panel label="Rollen" name="roles_sub_tab">
+		<panel height="148" label="Rollen" name="roles_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
 			<button label="Zoeken" name="search_button"/>
 			<button label="Alles Tonen" name="show_all_button"/>
-			<scroll_list name="role_list">
+			<scroll_list bottom_delta="-104" height="104" name="role_list">
 				<column label="Rol Naam" name="name"/>
 				<column label="Titel" name="title"/>
 				<column label="Leden" name="members"/>
 			</scroll_list>
-			<button label="Nieuwe Rol Maken ..." name="role_create"/>
+			<button label="Nieuwe Rol Maken..." name="role_create"/>
 			<button label="Rol Verwijderen" name="role_delete"/>
 			<string name="help_text">
 				Rollen hebben een titel en een toegestane lijst met Mogelijkheden die Leden kunnen uitvoeren. Leden kunnen tot 1 of meer Rollen behoren. Een groep kan tot 10 Rollen bevatten, inclusief de Iedereen en Eigenaren Rollen.
@@ -72,10 +79,11 @@
 				De &apos;Iedereen&apos; en &apos;Eigenaren&apos; Rollen zijn speciaal en kunnen niet verwijderd worden.
 			</string>
 		</panel>
-		<panel label="Mogelijkheden" name="actions_sub_tab">
+		<panel height="148" label="Mogelijkheden" name="actions_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
 			<button label="Zoeken" name="search_button"/>
 			<button label="Alles Tonen" name="show_all_button"/>
-			<scroll_list name="action_list" tool_tip="Selecteer een Mogelijkheid om meer details te bekijken."/>
+			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Selecteer een Mogelijkheid om meer details te bekijken."/>
 			<string name="help_text">
 				Mogelijkheden stellen leden in staat om specifieke dingen in een groep te doen. Er is een brede variëteit aan Mogelijkheden.
 			</string>
diff --git a/indra/newview/skins/default/xui/nl/panel_groups.xml b/indra/newview/skins/default/xui/nl/panel_groups.xml
index 5b66eddb73..a0c77b83ff 100644
--- a/indra/newview/skins/default/xui/nl/panel_groups.xml
+++ b/indra/newview/skins/default/xui/nl/panel_groups.xml
@@ -3,13 +3,13 @@
 	<text name="groupdesc">
 		Uw huidige actieve groep wordt vet getoond.
 	</text>
-	<text name="groupcount">
+	<text name="groupcount" width="300">
 		U behoort tot [COUNT] groepen (maximaal [MAX]).
 	</text>
-	<button label="IM/Oproepen" name="IM" tool_tip="Open Instant Message sessie"/>
-	<button label="Info" name="Info"/>
-	<button label="Activeren" name="Activate"/>
-	<button label="Verlaten" name="Leave"/>
-	<button label="Maak…" name="Create"/>
-	<button label="Zoeken…" name="Search..."/>
+	<button label="IM/Oproepen" name="IM" tool_tip="Open Instant Message sessie" width="86"/>
+	<button label="Info" name="Info" width="86"/>
+	<button label="Activeren" name="Activate" width="86"/>
+	<button label="Verlaten" name="Leave" width="86"/>
+	<button label="Maak…" name="Create" width="86"/>
+	<button label="Zoeken…" name="Search..." width="86"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/nl/panel_login.xml b/indra/newview/skins/default/xui/nl/panel_login.xml
index fcf79982c7..b9e10804a1 100644
--- a/indra/newview/skins/default/xui/nl/panel_login.xml
+++ b/indra/newview/skins/default/xui/nl/panel_login.xml
@@ -16,7 +16,7 @@
 		Wachtwoord:
 	</text>
 	<text name="start_location_text">
-		Start Locatie:
+		Startlocatie:
 	</text>
 	<combo_box name="start_location_combo">
 		<combo_item name="MyHome">
diff --git a/indra/newview/skins/default/xui/nl/panel_region_estate.xml b/indra/newview/skins/default/xui/nl/panel_region_estate.xml
index 731887dc5d..7a5fa801d9 100644
--- a/indra/newview/skins/default/xui/nl/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/nl/panel_region_estate.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Estate" name="Estate">
 	<text name="estate_help_text">
-		Wijzigingen van instellingen op dit tabblad zullen alle regio&apos;s in de estate beïnvloeden.
+		Wijzigingen van instellingen op dit tabblad
+zullen alle regio&apos;s in de estate beïnvloeden.
 	</text>
 	<text name="estate_text">
 		Estate:
@@ -10,7 +11,7 @@
 		(onbekend)
 	</text>
 	<text name="owner_text">
-		Eigenaar
+		Eigenaar:
 	</text>
 	<text name="estate_owner">
 		(onbekend)
@@ -25,21 +26,22 @@
 	<text name="Only Allow">
 		Beperk toegang tot:
 	</text>
-	<check_box label="Inwoners met betalingsinformatie opgeslagen" name="limit_payment" tool_tip="Verban ongeïdentificeerde inwoners."/>
-	<check_box label="Leeftijdgeverifieerde volwassenen" name="limit_age_verified" tool_tip="Verban inwoners die hun leeftijd niet geverifieerd hebben. Zie support.secondlife.com voor meer informatie."/>
+	<check_box label="Inwoners met betalingsinformatie &#10;opgeslagen" name="limit_payment" tool_tip="Verban ongeïdentificeerde inwoners."/>
+	<check_box label="Leeftijdgeverifieerde volwassenen" name="limit_age_verified" tool_tip="Verban inwoners die hun leeftijd niet geverifieerd hebben. Zie support.secondlife.com voor meer informatie." bottom_delta="-30"/>
 	<check_box label="Voice chat toestaan" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Directe teleport toestaan" name="allow_direct_teleport"/>
 	<button label="?" name="allow_direct_teleport_help"/>
-	<text name="abuse_email_text">
+	<text name="abuse_email_text" bottom_delta="-23">
 		Misbruik e-mail adres:
 	</text>
+	<line_editor bottom_delta="-14" name="abuse_email_address" />
 	<string name="email_unsupported">
 		Optie niet ondersteund
 	</string>
 	<button label="?" name="abuse_email_address_help"/>
-	<button label="Toepassen" name="apply_btn"/>
-	<button label="Gebruiker verwijderen van estate" name="kick_user_from_estate_btn"/>
+	<button label="Toepassen" name="apply_btn" bottom_delta="-22"/>
+	<button label="Gebruiker verwijderen van estate..." name="kick_user_from_estate_btn"/>
 	<button label="Zend bericht naar estate..." name="message_estate_btn"/>
 	<text name="estate_manager_label">
 		Estate beheerders:
diff --git a/indra/newview/skins/default/xui/nl/panel_region_general.xml b/indra/newview/skins/default/xui/nl/panel_region_general.xml
index 9ed822ac13..fe69fe9d9a 100644
--- a/indra/newview/skins/default/xui/nl/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/nl/panel_region_general.xml
@@ -29,9 +29,9 @@
 	<check_box label="Landverkoop toestaan" name="allow_land_resell_check"/>
 	<button label="?" name="land_resell_help"/>
 	<check_box label="Samenvoegen/opsplitsen land toestaan" name="allow_parcel_changes_check"/>
-	<button label="?" name="parcel_changes_help"/>
+	<button label="?" name="parcel_changes_help" left="240"/>
 	<check_box label="Blokkeer zichtbaarheid land in zoeken" name="block_parcel_search_check" tool_tip="Laat mensen deze regio en zijn percelen in zoekresultaten zien"/>
-	<button label="?" name="parcel_search_help"/>
+	<button label="?" name="parcel_search_help" left="240"/>
 	<spinner label="Agent limiet" name="agent_limit_spin"/>
 	<button label="?" name="agent_limit_help"/>
 	<spinner label="Object bonus" name="object_bonus_spin"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_about.xml b/indra/newview/skins/default/xui/pl/floater_about.xml
index c013d3cb76..e58b3e4ed4 100755
--- a/indra/newview/skins/default/xui/pl/floater_about.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="O Second Life">
 	<text_editor name="credits_editor">
-		Second Life zostało stworzone dla Was przez: Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les i wielu innych.
+		Second Life zostało stworzone dla Was przez: Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl i wielu innych.
 
-  Podziękowania dla następujących rezydentów za pomoc w pracy nad obecną wersją Second Life: afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
+  Podziękowania dla następujących rezydentów za pomoc w pracy nad obecną wersją Second Life: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
   3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
   APR Copyright (C) 2000-2004 The Apache Software Foundation
@@ -26,8 +26,7 @@
 
   Programowanie dźwięku czatu: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
   
-  Polska wersja klienta: Maciek Marksman, Malwina Dollinger, Magnus Balczo
-  IMy z sugestiami, komentarzami i poprawkami mile widziane
+  Polska wersja klienta: Malwina Dollinger, Magnus Balczo, Identity Euler
 
   I get by with a little help from my friends. --Richard Starkey
 	</text_editor>
diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
index 8ce113514b..8e21f225ca 100755
--- a/indra/newview/skins/default/xui/pl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml
@@ -3,6 +3,7 @@
   <check_box name="enable_joystick">
 		Aktywuj Joystick:
 	</check_box>
+	<text left="130" name="joystick_type" width="360"/>
   <spinner label="Kalibracja Osi X" left="20" width="170" label_width="130"  name="JoystickAxis1"/>
   <spinner label="Kalibracja Osi Y" left="210" width="170" label_width="130" name="JoystickAxis2" />
   <spinner label="Kalibracja Osi Z" left="400" width="170" label_width="130" name="JoystickAxis0" />
@@ -13,104 +14,104 @@
   <check_box label="Bezpośrednie" left="205" name="ZoomDirect" />
   <check_box label="Kursor 3D" left="340" name="Cursor3D" />
   <check_box label="Automatyczne" left="450" name="AutoLeveling" />
-  <text length="1" left="42" name="Control Modes:" type="string">
+  <text length="1" left="22" name="Control Modes:" type="string">
 		Kontroluj:
 	</text>
-  <check_box left="150" width="90" name="JoystickAvatarEnabled">
+  <check_box left="130" width="90" name="JoystickAvatarEnabled">
 		Awatara
 	</check_box>
-  <check_box left="249" width="90" name="JoystickBuildEnabled">
+  <check_box left="205" width="90" name="JoystickBuildEnabled">
 		Budowanie
 	</check_box>
-  <check_box left="340" width="90" name="JoystickFlycamEnabled">
+  <check_box left="282" width="90" name="JoystickFlycamEnabled">
 		KamerÄ™ podczas latania
 	</check_box>
-  <text width="124" name="XScale">
+  <text width="104" name="XScale">
 		Skala X
 	</text>
-  <spinner left="153" name="AvatarAxisScale1" />
-  <spinner left="218" name="BuildAxisScale1" />
+  <spinner left="133" name="AvatarAxisScale1" />
+  <spinner left="208" name="BuildAxisScale1" />
   <spinner left="283" name="FlycamAxisScale1" />
-  <text width="124" name="YScale">
+  <text width="104" name="YScale">
 		Skala Y
 	</text>
-  <spinner left="153" name="AvatarAxisScale2" />
-  <spinner left="218" name="BuildAxisScale2" />
+  <spinner left="133" name="AvatarAxisScale2" />
+  <spinner left="208" name="BuildAxisScale2" />
   <spinner left="283" name="FlycamAxisScale2" />
-  <text width="124" name="ZScale">
+  <text width="104" name="ZScale">
 		Skala Z
 	</text>
-  <spinner left="153" name="AvatarAxisScale0" />
-  <spinner left="218" name="BuildAxisScale0" />
+  <spinner left="133" name="AvatarAxisScale0" />
+  <spinner left="208" name="BuildAxisScale0" />
   <spinner left="283" name="FlycamAxisScale0" />
-  <text width="124" name="PitchScale">
+  <text width="104" name="PitchScale">
 		Skala Wznoszenia
 	</text>
-  <spinner left="153" name="AvatarAxisScale4" />
-  <spinner left="218" name="BuildAxisScale4" />
+  <spinner left="133" name="AvatarAxisScale4" />
+  <spinner left="208" name="BuildAxisScale4" />
   <spinner left="283" name="FlycamAxisScale4" />
-  <text width="124" name="YawScale">
+  <text width="104" name="YawScale">
 		Skala Odchylania
 	</text>
-  <spinner left="153" name="AvatarAxisScale5" />
-  <spinner left="218" name="BuildAxisScale5" />
+  <spinner left="133" name="AvatarAxisScale5" />
+  <spinner left="208" name="BuildAxisScale5" />
   <spinner left="283" name="FlycamAxisScale5" />
-  <text width="124" name="RollScale">
+  <text width="104" name="RollScale">
 		Skala Obrotu
 	</text>
-  <spinner left="218" name="BuildAxisScale3" />
+  <spinner left="208" name="BuildAxisScale3" />
   <spinner left="283" name="FlycamAxisScale3" />
-  <text width="124" name="XDeadZone">
+  <text width="104" name="XDeadZone">
 		Tolerancja Osi X
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone1" />
-  <spinner left="218" name="BuildAxisDeadZone1" />
+  <spinner left="133" name="AvatarAxisDeadZone1" />
+  <spinner left="208" name="BuildAxisDeadZone1" />
   <spinner left="283" name="FlycamAxisDeadZone1" />
-  <text width="124" name="YDeadZone">
+  <text width="104" name="YDeadZone">
 		Tolerancja Osi Y
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone2" />
-  <spinner left="218" name="BuildAxisDeadZone2" />
+  <spinner left="133" name="AvatarAxisDeadZone2" />
+  <spinner left="208" name="BuildAxisDeadZone2" />
   <spinner left="283" name="FlycamAxisDeadZone2" />
-  <text width="124" name="ZDeadZone">
+  <text width="104" name="ZDeadZone">
 		Tolerancja Osi Z
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone0" />
-  <spinner left="218" name="BuildAxisDeadZone0" />
+  <spinner left="133" name="AvatarAxisDeadZone0" />
+  <spinner left="208" name="BuildAxisDeadZone0" />
   <spinner left="283" name="FlycamAxisDeadZone0" />
-  <text width="124" name="PitchDeadZone">
+  <text width="104" name="PitchDeadZone">
 		Tolerancja Wznoszenia
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone4" />
-  <spinner left="218" name="BuildAxisDeadZone4" />
+  <spinner left="133" name="AvatarAxisDeadZone4" />
+  <spinner left="208" name="BuildAxisDeadZone4" />
   <spinner left="283" name="FlycamAxisDeadZone4" />
-  <text width="124" name="YawDeadZone">
+  <text width="104" name="YawDeadZone">
 		Tolerancja Odchylania
 	</text>
-  <spinner left="153" name="AvatarAxisDeadZone5" />
-  <spinner left="218" name="BuildAxisDeadZone5" />
+  <spinner left="133" name="AvatarAxisDeadZone5" />
+  <spinner left="208" name="BuildAxisDeadZone5" />
   <spinner left="283" name="FlycamAxisDeadZone5" />
-  <text width="124" name="RollDeadZone">
+  <text width="104" name="RollDeadZone">
 		Tolerancja Obrotu
 	</text>
-  <spinner left="218" name="BuildAxisDeadZone3" />
+  <spinner left="208" name="BuildAxisDeadZone3" />
   <spinner left="283" name="FlycamAxisDeadZone3" />
-  <text width="124" name="Feathering">
+  <text width="104" name="Feathering">
 		Przenikanie
 	</text>
-  <slider left="145" label="" name="AvatarFeathering" />
-  <slider left="210" label="" name="BuildFeathering" />
+  <slider left="125" label="" name="AvatarFeathering" />
+  <slider left="200" label="" name="BuildFeathering" />
   <slider left="275" label="" name="FlycamFeathering" />
-  <text width="124" name="ZoomScale2">
+  <text width="104" name="ZoomScale2">
 		Skala Powiększania
 	</text>
   <spinner left="283" label="" name="FlycamAxisScale6" />
-  <text width="124" name="ZoomDeadZone">
+  <text width="104" name="ZoomDeadZone">
 		Tolerancja Powiększania
 	</text>
   <spinner left="283" label="" name="FlycamAxisDeadZone6" />
   <button left="366" label="Ustawienia Domyślne" name="SpaceNavigatorDefaults" />
-  <button label="OK" label_selected="OK" name="ok_btn" />
+  <button left="366" label="OK" label_selected="OK" name="ok_btn" />
   <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
   <string name="JoystickMonitor">
 		Monitor Joysticka
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
index c9dd20128d..0c8684a8cf 100755
--- a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
@@ -8,5 +8,5 @@
 	     tool_tip="Dźwięk będzie słyszalny tylko dla Ciebie." />
 	<button label="Odtwarzaj w Åšwiecie" label_selected="Odtwarzaj w Åšwiecie"
 	     name="Sound play btn"
-	     tool_tip="Dźwięk będzie słyszalny przez wszystkich." />
+	     tool_tip="Dźwięk będzie słyszalny przez wszystkich." width="130" left_delta="-136"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
index d4ad72a3e1..329fd9b2e0 100755
--- a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
@@ -110,7 +110,7 @@
 			Prześladowanie &gt; Molestowanie Seksualne
 		</combo_item>
 		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
-			Prześladowanie &gt; Namawianie/Zachęcanie Innych do �amania Warunków Umowy (ToS)
+			Prześladowanie &gt; Namawianie/Zachęcanie Innych do �amania Warunków Umowy
 		</combo_item>
 		<combo_item name="Harassment__Verbal_abuse">
 			Prześladowanie &gt; Znieważanie Słowne
diff --git a/indra/newview/skins/default/xui/pl/floater_telehub.xml b/indra/newview/skins/default/xui/pl/floater_telehub.xml
index b4cf098878..917ab95ecc 100755
--- a/indra/newview/skins/default/xui/pl/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/pl/floater_telehub.xml
@@ -12,8 +12,8 @@
 	<text name="help_text_not_connected">
 		Wybierz obiekt i kliknij Połącz z teleporterem
 	</text>
-	<button label="Połącz z teleporterem" name="connect_btn" width="122" />
-	<button label="Rozłącz" name="disconnect_btn" left="142" width="98"/>
+	<button label="Połącz z teleporterem" name="connect_btn" width="132" />
+	<button label="Rozłącz" name="disconnect_btn" left="152" width="88"/>
 	<text name="spawn_points_text" width="250">
 		Punkty Składowe (pozycje - nie obiekty!):
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index 380943f4ad..c896222646 100755
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Buduj">
 	<button label="" label_selected="" name="button focus" tool_tip="Zbliżenie"/>
 	<button label="" label_selected="" name="button move" tool_tip="Przesunięcie"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Edycja"/>
@@ -311,10 +311,10 @@
 				</combo_item>
 			</combo_box>
 			<text name="text cut">
-				Wykrój
+				Wykrój początek i koniec
 			</text>
-			<spinner label="B" name="cut begin"/>
-			<spinner label="E" name="cut end"/>
+			<spinner label="P" name="cut begin"/>
+			<spinner label="K" name="cut end"/>
 			<text name="text hollow">
 				Wydrążenie
 			</text>
@@ -343,8 +343,8 @@
 			<text name="text twist">
 				Skręcenie
 			</text>
-			<spinner label="B" name="Twist Begin"/>
-			<spinner label="E" name="Twist End"/>
+			<spinner label="P" name="Twist Begin"/>
+			<spinner label="K" name="Twist End"/>
 			<text name="scale_taper">
 				Zwężenie
 			</text>
@@ -367,8 +367,8 @@
 			<text name="advanced_slice">
 				Przetnij poczÄ…tek i koniec
 			</text>
-			<spinner label="B" name="Path Limit Begin"/>
-			<spinner label="E" name="Path Limit End"/>
+			<spinner label="P" name="Path Limit Begin"/>
+			<spinner label="K" name="Path Limit End"/>
 			<text name="text taper2">
 				Zwężenie
 			</text>
@@ -434,15 +434,15 @@
 		<panel label="Tekstura" name="Texture">
 			<texture_picker label="Tekstura" name="texture control" tool_tip="Kliknij by wybrać obraz"/>
 			<color_swatch label="Kolor" name="colorswatch" tool_tip="Kliknij by wybrać kolor"/>
-			<text name="color trans">
-				Przezroczystość %
+			<text name="color trans" left="170" width="99">
+				Przezroczystość%
 			</text>
-			<spinner name="ColorTrans"/>
-			<text name="glow label">
+			<spinner left="170" name="ColorTrans"/>
+			<text name="glow label" left="170">
 				Blask
 			</text>
-			<spinner name="glow"/>
-			<check_box label="Jaskrawość" name="checkbox fullbright"/>
+			<spinner left="170" name="glow"/>
+			<check_box label="Jaskrawość" name="checkbox fullbright" left="170"/>
 			<text name="tex gen">
 				Mapowanie
 			</text>
@@ -561,7 +561,7 @@
 				Dopasuj Teksturę Mediów
 (najpierw załaduj)
 			</text>
-			<button label="Dopasuj" label_selected="Dopasuj" name="button align"/>
+			<button label="Dopasuj" label_selected="Dopasuj" name="button align" left="160"/>
 		</panel>
 		<panel label="Treść" name="Contents">
 			<button label="Nowy Skrypt" label_selected="Nowy Skrypt..." name="button new script"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_tos.xml b/indra/newview/skins/default/xui/pl/floater_tos.xml
index d05a3c246a..c2d266b6b0 100755
--- a/indra/newview/skins/default/xui/pl/floater_tos.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tos.xml
@@ -5,7 +5,7 @@
 	<check_box label="Zgadzam siÄ™ na Warunki Serwisu (Terms of Service)" name="agree_chk" />
 	<text name="tos_heading">
 		Proszę dokładnie przeczytać następujące Warunki Serwisu (Terms of Service). Musisz
-zaakceptować umową żeby kontynuować logowanie do Second Life.
+zaakceptować umowę żeby kontynuować logowanie do Second Life.
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 8a86086e54..aafd2d412d 100755
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -165,7 +165,9 @@
 		<menu_item_separator label="-----------" name="separator4"/>
 		<menu_item_call label="OglÄ…daj SelekcjÄ™" name="Focus on Selection"/>
 		<menu_item_call label="Przybliż do Selekcji" name="Zoom to Selection"/>
-		<menu_item_call label="Kup Obiekt" name="Menu Object Take"/>
+		<menu_item_call label="Kup Obiekt" name="Menu Object Take">
+			<on_enable userdata="Kup,Weź" name="EnableBuyOrTake"/>
+		</menu_item_call>
 		<menu_item_call label="Weź Kopię" name="Take Copy"/>
 		<menu_item_call label="Zapisz Obiekt z Poprawkami" name="Save Object Back to Object Contents"/>
 		<menu_item_separator label="-----------" name="separator6"/>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index e2b26bf0d1..ded22590f2 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -2617,7 +2617,7 @@ Odwiedź &apos;Help Island Public&apos; by powtórzyć szkolenie.
 	<notification name="ImproperPaymentStatus">
 		Nie posiadasz odpowiedniego statusu płatniczego by uzyskać dostęp do regionu.
 	</notification>
-	<notification name="MustGetAgeRgion">
+	<notification name="MustGetAgeRegion">
 		By odwiedzić ten region, Twoje konto musi zostać poddane weryfikacji wieku.
 	</notification>
 	<notification name="MustGetAgeParcel">
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index 4186e5e207..0cab45175b 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="Sobre o Second Life">
 	<text_editor name="credits_editor">
-		Second Life é oferecido a você por Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les e muitos outros.
+		Second Life é oferecido a você por Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl e muitos outros.
 
-  Obrigado aos seguintes residentes por ajudar a garantir para que esta versão seja ainda melhor: (in progress)
+  Obrigado aos seguintes residentes por ajudar a garantir para que esta versão seja ainda melhor: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
   3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
   APR Copyright (C) 2000-2004 The Apache Software Foundation
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 4426378075..79db9db822 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -301,7 +301,7 @@ Apenas lotes maiores podem ser listados na busca.
 			<string name="search_disabled_permissions_tooltip">
 				Esta opção está desabilitada porque você não pode modificar as opções deste lote.
 			</string>
-			<combo_box name="land category with adult">
+			<combo_box name="land category with adult" left="265" width="155">
 				<combo_item name="AnyCategory">
 					Qualquer Categoria
 				</combo_item>
@@ -342,7 +342,7 @@ Apenas lotes maiores podem ser listados na busca.
 					Outros
 				</combo_item>
 			</combo_box>
-			<combo_box left="276" name="land category" width="146">
+			<combo_box name="land category" left="265" width="155">
 				<combo_item name="AnyCategory">
 					Qualquer Categoria
 				</combo_item>
@@ -409,7 +409,7 @@ Apenas lotes maiores podem ser listados na busca.
 			<text length="1" name="Teleport Routing: " type="string">
 				Rota de Tele-transporte:
 			</text>
-			<combo_box left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote." width="140">
+			<combo_box width="160" left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote.">
 				<combo_item length="1" name="Blocked" type="string">
 					Bloqueado
 				</combo_item>
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
index f258e23bc4..054a8855a9 100644
--- a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
@@ -6,14 +6,14 @@
 	<text name="description_label">
 		Descrição:
 	</text>
-	<spinner label="Prioridade" name="priority" tool_tip="Controla quais animações podem se sobrepor a esta animação."/>
+	<spinner label_width="72" width="110" label="Prioridade" name="priority" tool_tip="Controla quais animações podem se sobrepor a esta animação."/>
 	<check_box label="Loop" name="loop_check" tool_tip="Executa a animação repetidamente."/>
-	<spinner label="Dentro(%)" name="loop_in_point" tool_tip="Ajusta o ponto da animação onde a repetição começa."/>
-	<spinner label="Fora(%)" name="loop_out_point" tool_tip="Ajusta o ponto da animação onde a repetição termina."/>
+	<spinner label_width="56" left="65" width="116" label="Dentro(%)" name="loop_in_point" tool_tip="Ajusta o ponto da animação onde a repetição começa."/>
+	<spinner label_width="40" left="185" label="Fora(%)" name="loop_out_point" tool_tip="Ajusta o ponto da animação onde a repetição termina."/>
 	<text name="hand_label">
 		Pose de Mão
 	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="Controla o que as mãos fazem durante a animação">
+	<combo_box left_delta="100"  width="184"  name="hand_pose_combo" tool_tip="Controla o que as mãos fazem durante a animação">
 		<combo_item name="Spread">
 			Espreguiçar
 		</combo_item>
@@ -57,7 +57,7 @@
 	<text name="emote_label">
 		Expressão
 	</text>
-	<combo_box label="" name="emote_combo" tool_tip="Controla o que a face faz durante a animação.">
+	<combo_box left_delta="100" width="184" name="emote_combo" tool_tip="Controla o que a face faz durante a animação.">
 		<combo_item name="[None]">
 			[None]
 		</combo_item>
@@ -119,10 +119,10 @@
 			Preocupado
 		</combo_item>
 	</combo_box>
-	<text name="preview_label">
+	<text name="preview_label" width="250">
 		Prever enquanto
 	</text>
-	<combo_box label="" name="preview_base_anim" tool_tip="Use isto para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
+	<combo_box left_delta="100" width="130" name="preview_base_anim" tool_tip="Use isto para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
 		<combo_item name="Standing">
 			Parado
 		</combo_item>
@@ -136,12 +136,15 @@
 			Voando
 		</combo_item>
 	</combo_box>
-	<spinner label="Facilitar a entrada (sec)" name="ease_in_time" tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem."/>
-	<spinner label="Facilitar a saída (sec)" name="ease_out_time" tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem."/>
-	<button label="" name="play_btn" tool_tip="Executa/pausa sua animação."/>
+	<spinner label_width="125" width="192" label="Facilitar a entrada (sec)" name="ease_in_time" tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem."/>
+	<spinner bottom_delta="-20"  label_width="125" left="10"  width="192" label="Facilitar a saída (sec)" name="ease_out_time" tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem."/>
+	<button bottom_delta="-32" name="play_btn" tool_tip="Executa/pausa sua animação."/>
 	<button label="" name="stop_btn" tool_tip="Interrompe a execução da animação."/>
 	<text name="bad_animation_text">
-		Incapaz de ler o arquivo de animação. Nós recomendamos exportar arquivos BVH do Poser 4.
+		Incapaz de ler o arquivo de animação.
+
+Nós recomendamos exportar arquivos BVH do
+Poser 4.
 	</text>
 	<button label="Cancelar" name="cancel_btn"/>
 	<button label="Carregar (L$[AMOUNT])" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
index 8f433a635d..4e1598c8fa 100644
--- a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatarpicker" title="Escolha o Residente">
-	<tab_container name="ResidentChooserTabs">
+<floater name="avatarpicker" title="Escolha o Residente" min_width="285" width="285">
+	<tab_container name="ResidentChooserTabs" width="275">
 		<panel label="Buscar" name="SearchPanel">
 			<text name="InstructSearchResidentName">
 				Digite parte do nome do Residente:
@@ -14,13 +14,15 @@
 		</panel>
 		<panel label="Próximo a Mim" name="NearMePanel">
 			<text name="InstructSelectResident">
-				Selecione residente próximo:
+				Selecione residente
+próximo:
 			</text>
-			<button label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh"/>
-			<slider label="Faixa" name="near_me_range"/>
+			<button font="SansSerifSmall" left_delta="1" width="115" label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh"/>
+			<slider label="Faixa" name="near_me_range" bottom_delta="-36"/>
 			<text name="meters">
 				Metros
 			</text>
+		<scroll_list bottom_delta="-169" height="159" name="NearMe"  />
 		</panel>
 	</tab_container>
 	<button label="Selecionar" label_selected="Selecionar" name="Select"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml
index 4dfebc3abd..ebc9d0f0c8 100644
--- a/indra/newview/skins/default/xui/pt/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_build_options.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="Opções de grade">
-	<spinner label="Uni. Grade (metros)" name="GridResolution"/>
-	<spinner label="Ext. da Grade (metros)" name="GridDrawSize"/>
+	<spinner label="Uni. Grade (metros)" name="GridResolution" width="180" label_width="122"/>
+	<spinner label="Ext. da Grade (metros)" name="GridDrawSize" width="180" label_width="122"/>
 	<check_box label="Habilitar ajuste de sub-grade" name="GridSubUnit"/>
 	<check_box label="Mostrar as seções de cruzamento" name="GridCrossSection"/>
-	<slider label="Opacidade da grade" name="GridOpacity"/>
+	<slider label="Opacidade da grade" name="GridOpacity" width="220"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
index 0c1fb77a08..3e8713d59e 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
@@ -6,9 +6,9 @@
 	<text name="buy_text">
 		Comprar por L$[AMOUNT] de(a) [NAME]?
 	</text>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
-	<button label="Comprar" label_selected="Comprar" name="buy_btn"/>
-	<check_box label="Vestir roupa agora" name="wear_check"/>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn" width="73"/>
+	<button label="Comprar" label_selected="Comprar" name="buy_btn" width="73" left_delta="-77"/>
+	<check_box label="Vestir roupa agora" name="wear_check" left_delta="-130"/>
 	<string name="no_copy_text">
 		(sem copiar)
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
index 25716d0257..e3c5fcde0e 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
@@ -3,25 +3,25 @@
 	<text name="region_name_label">
 		Região:
 	</text>
-	<text name="region_name_text">
+	<text name="region_name_text" left="560">
 		(desconhecido)
 	</text>
 	<text name="region_type_label">
 		Tipo:
 	</text>
-	<text name="region_type_text">
+	<text name="region_type_text" left="560">
 		(desconhecido)
 	</text>
 	<text name="estate_name_label">
 		Propriedade:
 	</text>
-	<text name="estate_name_text">
+	<text name="estate_name_text" left="560">
 		(desconhecido)
 	</text>
-	<text name="estate_owner_label">
+	<text name="estate_owner_label" width="105" right="565">
 		Dono da propriedade:
 	</text>
-	<text name="estate_owner_text">
+	<text name="estate_owner_text" left="560" >
 		(desconhecido)
 	</text>
 	<text name="resellable_changeable_label">
@@ -36,10 +36,11 @@
 	<text name="covenant_text">
 		Você deve concordar com o Corretor da Propriedade:
 	</text>
+	<text left="470" name="covenant_timestamp_text"/>
 	<text_editor name="covenant_editor">
 		Carregando...
 	</text_editor>
-	<check_box label="Eu concordo com as definições do Corretor feitas acima." name="agree_covenant"/>
+	<check_box label="Eu concordo com as definições do &#10;Corretor feitas acima." name="agree_covenant"/>
 	<text name="info_parcel_label">
 		Lote:
 	</text>
@@ -66,7 +67,7 @@ vendido com os objetos
 	<text name="error_message">
 		Algo ainda não está correto.
 	</text>
-	<button label="Ir para a página da web" name="error_web"/>
+	<button label="Ir para a página da web" name="error_web" width="150" />
 	<text name="account_action">
 		Evoluir sua conta para membro Premium
 	</text>
@@ -97,10 +98,10 @@ Este lote tem 512 m² de terra.
 	<text name="currency_reason">
 		Você tem L$2,100.
 	</text>
-	<text name="currency_action">
+	<text name="currency_action" width="116">
 		Compre L$ adicionais
 	</text>
-	<line_editor name="currency_amt">
+	<line_editor name="currency_amt" left="190" width="65">
 		1000
 	</line_editor>
 	<text name="currency_est">
diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
index 475280b013..95dd53ccd4 100644
--- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
@@ -19,12 +19,14 @@
 		Lum:
 	</text>
 	<check_box label="Aplicar imediatamente" name="apply_immediate"/>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button left_delta="150" name="color_pipette" />
+	<button left_delta="55" label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
 	<button label="Selecionar" label_selected="Selecionar" name="select_btn"/>
 	<text name="Current color:">
 		Cor atual:
 	</text>
 	<text name="(Drag below to save.)">
-		(Arraste abaixo para salvar.)
+		(Arraste abaixo
+ para salvar.)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
index 5049b87a56..f02cca9c25 100644
--- a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
@@ -4,35 +4,35 @@
 		<panel label="Ciclo do dia" name="Day Cycle">
 			<button label="?" name="WLDayCycleHelp"/>
 			<text name="WL12am">
-				12:00 meia-noite
+				0:00
 			</text>
 			<text name="WL3am">
-				3:00 da manhã
+				3:00
 			</text>
 			<text name="WL6am">
-				6:00 da manhã
+				6:00
 			</text>
 			<text name="WL9amHash">
-				9:00 da manhã
+				9:00
 			</text>
 			<text name="WL12pmHash">
-				12:00 meio dia
+				12:00
 			</text>
 			<text name="WL3pm">
-				3:00 da tarde
+				15:00
 			</text>
 			<text name="WL6pm">
-				6:00 da tarde
+				18:00
 			</text>
 			<text name="WL9pm">
-				9:00 da noite
+				21:00
 			</text>
 			<text name="WL12am2">
-				12:00 meia noite
+				24:00
 			</text>
-			<button label="Add Key" label_selected="Adicionar chave" name="WLAddKey"/>
-			<button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
+			<button font="SansSerifSmall" width="96" left="546" label="Adicionar chave" label_selected="Adicionar chave" name="WLAddKey"/>
+			<button font="SansSerifSmall" width="96" left="546" label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
+			<text name="WLCurKeyFrameText" width="190" left="17">
 				Configurações de Quadro-chave:
 			</text>
 			<text name="WLCurKeyTimeText">
@@ -47,7 +47,7 @@
 			<text name="DayCycleText">
 				Grudar:
 			</text>
-			<combo_box label="5 minutos" name="WLSnapOptions"/>
+			<combo_box label="5 minutos" name="WLSnapOptions" width="85"/>
 			<text name="DayCycleText2">
 				Duração do Ciclo:
 			</text>
@@ -59,7 +59,7 @@
 			</text>
 			<button label="Tocar" label_selected="Tocar" name="WLAnimSky"/>
 			<button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/>
-			<button label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/>
+			<button width="175" font="SansSerifSmall" label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/>
 			<button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/>
 			<button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/>
 		</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_env_settings.xml b/indra/newview/skins/default/xui/pt/floater_env_settings.xml
index b1c85a32b7..d3ed760551 100644
--- a/indra/newview/skins/default/xui/pt/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_env_settings.xml
@@ -7,17 +7,19 @@
 		12:00 PM
 	</text>
 	<text name="EnvCloudText">
-		Cobertura de Nuvens
+		Cobertura de
+Nuvens
 	</text>
 	<text name="EnvWaterColorText">
 		Cor da água
 	</text>
 	<color_swatch label="" name="EnvWaterColor" tool_tip="Clique para abrir o Editor de cores"/>
 	<text name="EnvWaterFogText">
-		Névoa da água
+		Névoa da
+água
 	</text>
-	<button label="Usar hora da propriedade" name="EnvUseEstateTimeButton"/>
-	<button label="Céu Avançado" name="EnvAdvancedSkyButton"/>
-	<button label="�gua Avançada" name="EnvAdvancedWaterButton"/>
+	<button bottom="-144" label="Usar hora da propriedade" name="EnvUseEstateTimeButton" width="155"/>
+	<button label="Céu Avançado" name="EnvAdvancedSkyButton" width="155" left="167"/>
+	<button label="�gua Avançada" name="EnvAdvancedWaterButton" width="155" left="326"/>
 	<button label="?" name="EnvSettingsHelpButton"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
index 414f9bcae3..c7a7976a41 100644
--- a/indra/newview/skins/default/xui/pt/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
@@ -7,9 +7,10 @@
 		Descrição:
 	</text>
 	<text name="preview_label">
-		Prévia da Imagem como:
+		Prévia da
+imagem como:
 	</text>
-	<combo_box label="Tipo de Roupas" name="clothing_type_combo">
+	<combo_box label="Tipo de Roupas" name="clothing_type_combo" left="100" width="186">
 		<combo_item name="Image">
 			Imagem
 		</combo_item>
diff --git a/indra/newview/skins/default/xui/pt/floater_inspect.xml b/indra/newview/skins/default/xui/pt/floater_inspect.xml
index f3d4b0f33f..f3c23f008e 100644
--- a/indra/newview/skins/default/xui/pt/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inspect.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="inspect" title="Inspecionar Objeto">
+<floater name="inspect" title="Inspecionar Objeto" min_width="450">
 	<scroll_list name="object_list" tool_tip="Selecione um objeto nesta lista para destacá-lo in-world">
 		<column label="Nome do Objeto" name="object_name"/>
-		<column label="Nome do Proprietário" name="owner_name"/>
-		<column label="Nome do Criador" name="creator_name"/>
+		<column label="Proprietário" name="owner_name"/>
+		<column label="Criador" name="creator_name"/>
 		<column label="Data de Criação" name="creation_date"/>
 	</scroll_list>
-	<button label="Ver Perfil do Proprietário..." label_selected="" name="button owner" tool_tip="Veja o perfil do proprietário do objeto destacado"/>
-	<button label="Ver perfil do criador..." label_selected="" name="button creator" tool_tip="Veja o perfil do criador original do objeto destacado"/>
+	<button width="185" label="Ver Perfil do Proprietário..." label_selected="" name="button owner" tool_tip="Veja o perfil do proprietário do objeto destacado"/>
+	<button width="165" left="205" label="Ver perfil do criador..." label_selected="" name="button creator" tool_tip="Veja o perfil do criador original do objeto destacado"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
index 3711a4c871..0b78453182 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
@@ -49,7 +49,7 @@
 	</text>
 	<check_box label="Compartilhar com o grupo" name="CheckShareWithGroup"/>
 	<check_box label="Permitir qualquer um copiar" name="CheckEveryoneCopy"/>
-	<text name="NextOwnerLabel">
+	<text name="NextOwnerLabel" width="230">
 		Próximo dono pode:
 	</text>
 	<check_box label="Modificar" name="CheckNextOwnerModify"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
index 634e236650..ed36826800 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory Finder" title="itens_de_inventário_recentes">
+<floater name="Inventory Finder" title="itens_de_inventário_recentes" width="165">
 	<check_box label="Animação" name="check_animation"/>
 	<check_box label="Cartões de chamadas" name="check_calling_card"/>
 	<check_box label="Roupas" name="check_clothing"/>
@@ -13,8 +13,8 @@
 	<check_box label="Fotos" name="check_snapshot"/>
 	<button label="Tudo" label_selected="Tudo" name="All"/>
 	<button label="Nenhum" label_selected="Nenhum" name="None"/>
-	<check_box label="Sempre mostrar as pastas" name="check_show_empty"/>
-	<check_box label="Desde o Logoff" name="check_since_logoff"/>
+	<check_box label="Sempre mostrar as pastas" name="check_show_empty" left="3"/>
+	<check_box label="Desde o Logoff" name="check_since_logoff" left="3"/>
 	<text length="1" name="- OR -" type="string">
 		- OU -
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_joystick.xml b/indra/newview/skins/default/xui/pt/floater_joystick.xml
index 6c2e4a5144..0bc3928710 100644
--- a/indra/newview/skins/default/xui/pt/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pt/floater_joystick.xml
@@ -3,14 +3,15 @@
 	<check_box name="enable_joystick">
 		Habilitar Joystick:
 	</check_box>
-	<spinner label="Mapeamento do eixo X" name="JoystickAxis1"/>
-	<spinner label="Mapeamento do eixo Y" name="JoystickAxis2"/>
-	<spinner label="Mapeamento do Eixo Z" name="JoystickAxis0"/>
-	<spinner label="Mapeamento da Elevação" name="JoystickAxis4"/>
-	<spinner label="Mapeamento da Guinada" name="JoystickAxis5"/>
-	<spinner label="Mapeamento da Rolagem" name="JoystickAxis3"/>
-	<spinner label="Mapeamento do Zoom" name="JoystickAxis6"/>
-	<check_box label="Zoom Direto" name="ZoomDirect"/>
+	<text left="135" name="joystick_type" width="360"/>
+	<spinner label="Mapeamento: eixo X" name="JoystickAxis1" label_width="124" width="164"/>
+	<spinner label="Mapeamento: eixo Y" name="JoystickAxis2" label_width="124" width="164"/>
+	<spinner label="Mapeamento: eixo Z" name="JoystickAxis0" label_width="124" width="164"/>
+	<spinner label="Mapeamento: Elevação" name="JoystickAxis4" label_width="124" width="164"/>
+	<spinner label="Mapeamento: Guinada" name="JoystickAxis5" label_width="124" width="164"/>
+	<spinner label="Mapeamento: Rolagem" name="JoystickAxis3" label_width="124" width="164"/>
+	<spinner label="Mapeamento: Zoom" name="JoystickAxis6" label_width="124" width="164"/>
+	<check_box label="Zoom Direto" name="ZoomDirect" left="194"/>
 	<check_box label="Cursor 3D" name="Cursor3D"/>
 	<check_box label="Nível Automático" name="AutoLeveling"/>
 	<text name="Control Modes:">
@@ -19,7 +20,7 @@
 	<check_box name="JoystickAvatarEnabled">
 		Avatar
 	</check_box>
-	<check_box name="JoystickBuildEnabled">
+	<check_box name="JoystickBuildEnabled" left="192">
 		Construir
 	</check_box>
 	<check_box name="JoystickFlycamEnabled">
@@ -34,13 +35,13 @@
 	<text name="ZScale">
 		Escala Z
 	</text>
-	<text name="PitchScale">
+	<text name="PitchScale" left="3" width="115">
 		Escala de Elevação
 	</text>
-	<text name="YawScale">
+	<text name="YawScale" left="3" width="115">
 		Escala da Guinada
 	</text>
-	<text name="RollScale">
+	<text name="RollScale" left="3" width="115">
 		Escala de Rolagem
 	</text>
 	<text name="XDeadZone">
@@ -52,14 +53,14 @@
 	<text name="ZDeadZone">
 		Zona Morta Z
 	</text>
-	<text name="PitchDeadZone">
-		Zona Morta da Elevação
+	<text name="PitchDeadZone" left="3" width="115">
+		Zona Morta: Elevação
 	</text>
-	<text name="YawDeadZone">
-		Zona Morta da Guinada
+	<text name="YawDeadZone" left="3" width="115">
+		Zona Morta: Guinada
 	</text>
-	<text name="RollDeadZone">
-		Zona Morta de Rolagem
+	<text name="RollDeadZone" left="3" width="115">
+		Zona Morta: Rolagem
 	</text>
 	<text name="Feathering">
 		Alisar
@@ -67,10 +68,10 @@
 	<text name="ZoomScale2">
 		Escala de Zoom
 	</text>
-	<text name="ZoomDeadZone">
+	<text name="ZoomDeadZone" width="110" left="4">
 		Zona Morta de Zoom
 	</text>
-	<button label="Padrões do Navegador Espacial" name="SpaceNavigatorDefaults"/>
+	<button label="Padrões do SpaceNavigator" name="SpaceNavigatorDefaults" font="SansSerifSmall"/>
 	<button label="OK" label_selected="OK" name="ok_btn"/>
 	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
 	<string name="JoystickMonitor">
diff --git a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
index 9dbad7099e..6657641992 100644
--- a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_lagmeter" title="Medidor de Atraso">
 	<button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/>
+	<text left="30" name="client_lag_cause" right="-10" />
+	<text left="30" name="network_lag_cause" right="-10" />
+	<text left="30" name="server_lag_cause" right="-32" />
 	<text name="client">
 		Cliente:
 	</text>
-	<text name="client_text">
+	<text name="client_text" font="SansSerifSmall">
 		Normal
 	</text>
 	<button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/>
 	<text name="network">
 		Rede:
 	</text>
-	<text name="network_text">
+	<text name="network_text" font="SansSerifSmall">
 		Normal
 	</text>
 	<button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/>
 	<text name="server">
 		Servidor:
 	</text>
-	<text name="server_text">
+	<text name="server_text" font="SansSerifSmall">
 		Normal
 	</text>
 	<button label="?" name="server_help"/>
@@ -117,10 +120,10 @@
 		20
 	</string>
 	<string name="server_frame_time_critical_msg">
-		Taxa de quadros do simulador abaixo de  [SERVER_FRAME_RATE_CRITICAL]
+		Taxa de quadros abaixo de [SERVER_FRAME_RATE_CRITICAL]
 	</string>
 	<string name="server_frame_time_warning_msg">
-		Taxa de quadros do simulador entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
+		Taxa de quadros entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
 	</string>
 	<string name="server_frame_time_normal_msg">
 		Normal
diff --git a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
index 1a640c9793..4734d665ef 100644
--- a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
@@ -7,7 +7,7 @@
 		<column label="�rea" name="area"/>
 	</scroll_list>
 	<button label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para o centro do terreno."/>
-	<button label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" tool_tip="Mostrar esse terreno no mapa do mundo."/>
+	<button width="130" label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" tool_tip="Mostrar esse terreno no mapa do mundo."/>
 	<text name="contrib_label">
 		Contribuições para os seus grupos:
 	</text>
@@ -15,22 +15,22 @@
 		<column label="Grupo" name="group"/>
 		<column label="�rea" name="area"/>
 	</scroll_list>
-	<text name="allowed_label">
+	<text name="allowed_label" width="380">
 		Propriedades de terreno permitidas com o plano de pagamento atual:
 	</text>
-	<text name="allowed_text">
+	<text name="allowed_text" left_delta="390">
 		[AREA] m²
 	</text>
 	<text name="current_label">
 		Propriedades de terrenos atuais:
 	</text>
-	<text name="current_text">
+	<text name="current_text" left_delta="390">
 		[AREA] m²
 	</text>
 	<text name="available_label">
 		Disponível para compra de terras:
 	</text>
-	<text name="available_text">
+	<text name="available_text" left_delta="390">
 		[AREA] m²
 	</text>
 	<string name="area_string">
diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
index af45fa5873..d2654de589 100644
--- a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
@@ -2,7 +2,7 @@
 <floater name="script ed float" title="Script: Novo Script">
 	<button label="Resetar" label_selected="Resetar" name="Reset"/>
 	<check_box label="Correndo" name="running"/>
-	<check_box label="Mono" name="mono"/>
+	<check_box label="Mono" name="mono" left="86"/>
 	<string name="not_allowed">
 		Você não tem permissão para visualizar este script.
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
index e7e4a22937..4f60ef23a6 100644
--- a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="script ed float" title="LSL Wiki">
 	<check_box label="Seguir o Cursor" name="lock_check" />
-	<combo_box label="Bloquear" name="history_combo" />
-	<button label="Anterior" name="back_btn" />
+	<combo_box label="Bloquear" name="history_combo"  left_delta="120" width="70"/>
+	<button label="Anterior" name="back_btn"  left_delta="75"/>
 	<button label="Posterior" name="fwd_btn" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_mute_object.xml b/indra/newview/skins/default/xui/pt/floater_mute_object.xml
index d967f527ae..7ec0051a7d 100644
--- a/indra/newview/skins/default/xui/pt/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_mute_object.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="mute by name" title="Silenciar objeto pelo nome">
 	<text name="message">
-		Silenciar pelo nome afeta apenas conversa de objeto e MI, não sons. Você deve digitar o nome exato do objeto.
+		Silenciar pelo nome afeta apenas conversa de objeto e MI,
+não sons. Você deve digitar o nome exato do objeto.
 	</text>
 	<line_editor name="object_name">
 		Nome do objeto
 	</line_editor>
-	<button label="Ok" name="OK"/>
+	<button label="OK" name="OK"/>
 	<button label="Cancelar" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pay.xml b/indra/newview/skins/default/xui/pt/floater_pay.xml
index 6b094d07f6..2eb1c5c1bf 100644
--- a/indra/newview/skins/default/xui/pt/floater_pay.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pay.xml
@@ -9,7 +9,7 @@
 	<text type="string" length="1" name="payee_label" width="110" left="5">
 		Pagar residente:
 	</text>
-	<text type="string" length="1" name="payee_name" left="110">
+	<text type="string" length="1" name="payee_name" left="115">
 		[FIRST] [LAST]
 	</text>
 	<text type="string" length="1" name="fastpay text" width="120" halign="left">
diff --git a/indra/newview/skins/default/xui/pt/floater_postcard.xml b/indra/newview/skins/default/xui/pt/floater_postcard.xml
index fe90cb3165..60d3d1829c 100644
--- a/indra/newview/skins/default/xui/pt/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_postcard.xml
@@ -24,7 +24,7 @@
 		Digite sua mensagem aqui.
 	</text_editor>
 	<text name="fine_print">
-		Se seu indicado entrar no SL, você receberá um bônus pela indicação.
+		Se seu indicado entrar no Second Life, você receberá um bônus pela indicação.
 	</text>
 	<button label="Cancelar" name="cancel_btn"/>
 	<button label="Enviar" name="send_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml
index eb28e99713..0e9ef768b5 100644
--- a/indra/newview/skins/default/xui/pt/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preferences.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Preferences" title="Preferências">
+<floater name="Preferences" title="Preferências" min_width="332" width="628">
 	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<button label="Aplicar" label_selected="Aplicar" name="Apply"/>
 	<button label="Sobre" label_selected="Sobre" name="About..."/>
 	<button label="Ajuda" label_selected="Ajuda" name="Help"/>
+	<tab_container name="pref core" tab_width="128" width="628" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
index 416d65fde4..bf7f3989f2 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
@@ -22,26 +22,29 @@
 	<text name="key_label">
 		Tecla de Atalho:
 	</text>
-	<combo_box label="Nenhum" name="modifier_combo"/>
-	<combo_box label="Nenhum" name="key_combo"/>
+	<combo_box label="Nenhum" name="modifier_combo" left="116" width="76"/>
+	<combo_box label="Nenhum" name="key_combo" width="76" left_delta="80"/>
 	<text name="library_label">
 		Biblioteca:
 	</text>
 	<text name="steps_label">
 		Passos:
 	</text>
-	<scroll_list name="library_list">
+	<scroll_list name="library_list" width="84">
 		Animação
 Som
 Bate Papo
 Esperar
 	</scroll_list>
-	<button label="Incluir" name="add_btn"/>
-	<button label="Mover Para Cima" name="up_btn"/>
-	<button label="Mover Para Baixo" name="down_btn"/>
-	<button label="Remover" name="delete_btn"/>
+	<button label="Incluir" name="add_btn" left="118" width="87"/>
+	<button label="Mover Para Cima" name="up_btn" width="114" left_delta="-13"/>
+	<button label="Mover Para Baixo" name="down_btn" width="114"/>
+	<button label="Remover" name="delete_btn" width="84" left_delta="13"/>
+	<scroll_list left="226" name="step_list" width="205" />
 	<text name="help_label">
-		Todos os passos acontecem simultaneamente, a menos que você inclua passos de espera.
+		Todos os passos acontecem
+simultaneamente, a menos que
+você inclua passos de espera.
 	</text>
 	<radio_group name="animation_trigger_type">
 		<radio_item name="start">
@@ -51,8 +54,9 @@ Esperar
 			Parar
 		</radio_item>
 	</radio_group>
-	<check_box label="até que as animações estejam concluídas" name="wait_anim_check"/>
-	<check_box label="tempo em segundos" name="wait_time_check"/>
+	<check_box bottom_delta="34" label="até que as animações estejam &#10;concluídas" name="wait_anim_check"/>
+	<check_box bottom_delta="-30" label="tempo em segundos" name="wait_time_check"/>
+	<line_editor left_delta="130" name="wait_time_editor" />
 	<check_box label="Ativar" name="active_check" tool_tip="Gestos ativos podem ser gatilhados escrevendo suas frases de gatilho no chat ou através de suas teclas de atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho."/>
 	<button label="Prévia" name="preview_btn"/>
 	<button label="Salvar" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
index b61508480d..b62146b92a 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
@@ -3,6 +3,6 @@
 	<text length="1" name="desc txt" type="string">
 		Descrição:
 	</text>
-	<button label="Executar in-World" label_selected="Executar in-World" name="Sound play btn" tool_tip="Executar este som para que todos possam ouvi-lo."/>
-	<button label="Executar Localmente" label_selected="Executar Localmente" name="Sound audition btn" tool_tip="Executar este som somente para você ouvir."/>
+	<button left_delta="-132" label="Executar in-World" label_selected="Executar in-World" name="Sound play btn" tool_tip="Executar este som para que todos possam ouvi-lo."/>
+	<button width="135" left="152" label="Executar Localmente" label_selected="Executar Localmente" name="Sound audition btn" tool_tip="Executar este som somente para você ouvir."/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
index 9091386681..964b164cd1 100644
--- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
@@ -170,8 +170,8 @@
 	</text>
 	<text name="bug_aviso">
 		Por favor, seja específico(a) sobre data, localidade,
-natureza do abuso, texto relevante de conversa/MI e selecione o objeto,
-se possível.
+natureza do abuso, texto relevante de conversa/MI e
+selecione o objeto, se possível.
 	</text>
 	<text name="incomplete_title">
 		Nota: Relatos incompletos não serão investigados.
diff --git a/indra/newview/skins/default/xui/pt/floater_script_search.xml b/indra/newview/skins/default/xui/pt/floater_script_search.xml
index aaf1ea4339..5c1393107f 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_search.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script search" title="Busca de Script">
-	<check_box label="Não diferenciar Maiúsculas de Minúsculas" name="case_text"/>
-	<button label="Buscar" label_selected="Buscar" name="search_btn"/>
-	<button label="Substituir" label_selected="Substituir" name="replace_btn"/>
-	<button label="Substituir Tudo" label_selected="Substituir Tudo" name="replace_all_btn"/>
-	<text length="1" name="txt" type="string">
+<floater name="script search" title="Busca de Script" width="320">
+	<check_box label="Não diferenciar Maiúsculas de Minúsculas" name="case_text" left="75"/>
+	<button label="Buscar" label_selected="Buscar" name="search_btn" width="85"/>
+	<button label="Substituir" label_selected="Substituir" name="replace_btn" left="100" width="85"/>
+	<button label="Substituir Tudo" label_selected="Substituir Tudo" name="replace_all_btn" left="190" width="122"/>
+	<text length="1" name="txt" type="string" width="65">
 		Buscar
 	</text>
-	<text length="1" name="txt2" type="string">
+	<text length="1" name="txt2" type="string" width="65">
 		Substituir
 	</text>
+	<line_editor left="75" name="search_text" width="240" />
+	<line_editor left="75" name="replace_text" width="240" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
index f0e9d4b92c..dd82e6deb3 100644
--- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
@@ -108,8 +108,8 @@
 			BMP
 		</combo_item>
 	</combo_box>
-	<spinner label="Largura" name="snapshot_width"/>
-	<spinner label="Altura" name="snapshot_height"/>
+	<spinner label="Largura" name="snapshot_width" label_width="41" width="101"/>
+	<spinner label="Altura" name="snapshot_height" label_width="31" width="91" left="119"/>
 	<check_box label="Restringir proporções" name="keep_aspect_check"/>
 	<slider label="Qualidade da Imagem" name="image_quality_slider"/>
 	<text name="layer_type_label">
@@ -127,10 +127,10 @@
 		</combo_item>
 	</combo_box>
 	<check_box label="Mostrar interface na Foto" name="ui_check"/>
-	<check_box label="Mostrar Objetos HUD na Foto" name="hud_check"/>
-	<check_box label="Manter aberto após salvar" name="keep_open_check"/>
-	<check_box label="Quadro Congelado (prévia da tela inteira)" name="freeze_frame_check"/>
-	<check_box label="Auto-atualizar" name="auto_snapshot_check"/>
+	<check_box bottom_delta="-17" label="Mostrar Objetos HUD na Foto" name="hud_check"/>
+	<check_box bottom_delta="-17" label="Manter aberto após salvar" name="keep_open_check"/>
+	<check_box bottom_delta="-17" label="Quadro Congelado&#10; (prévia da tela inteira)" name="freeze_frame_check"/>
+	<check_box bottom_delta="-29" label="Auto-atualizar" name="auto_snapshot_check"/>
 	<string name="unknown">
 		desconhecido
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_telehub.xml b/indra/newview/skins/default/xui/pt/floater_telehub.xml
index f2634be852..11886c7cab 100644
--- a/indra/newview/skins/default/xui/pt/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/pt/floater_telehub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="telehub" title="Telehub">
+<floater name="telehub" title="Telehub" min_height="310" height="310" width="286">
 	<text name="status_text_connected">
 		Telehub conectado ao objeto [OBJECT]
 	</text>
@@ -14,15 +14,19 @@
 	</text>
 	<button label="Conectar Telehub" name="connect_btn"/>
 	<button label="Desconectar" name="disconnect_btn"/>
-	<text name="spawn_points_text">
+	<text name="spawn_points_text" width="265">
 		Pontos de Nascimento (posições, não objetos):
 	</text>
-	<button label="Adicionar Nascimento" name="add_spawn_point_btn"/>
-	<button label="Remover Nascimento" name="remove_spawn_point_btn"/>
+	<scroll_list name="spawn_points_list" width="265" />
+	<button width="135" label="Adicionar Nascimento" name="add_spawn_point_btn"/>
+	<button width="130" label="Remover Nascimento" name="remove_spawn_point_btn" left="150"/>
 	<text name="spawn_point_help">
-		Selecione um objeto e clique Adicionar para especificar
-a posição. Em seguida, você pode mover ou apagar o objeto.
+		Selecione um objeto e clique Adicionar para
+especificar a posição.
+Em seguida, você pode mover ou apagar o objeto.
 As posições são relativas ao centro do telehub.
-Selecione um item na lista para mostrar a posição in-world.
+
+Selecione um item na lista para mostrar a posição
+in-world.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 9a3d14c0ea..4f5054da73 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Construir" width="288">
 	<button label="" label_selected="" name="button focus" tool_tip="Foco"/>
 	<button label="" label_selected="" name="button move" tool_tip="Mover"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Editar"/>
@@ -34,7 +34,7 @@
 	<check_box label="Esticar Texturas" name="checkbox stretch textures"/>
 	<check_box label="Usar Grade" name="checkbox snap to grid"/>
 	<button label="Opções..." label_selected="Opções..." name="Options..."/>
-	<text name="text status">
+	<text name="text status" width="280">
 		Arraste para mover, shift+Arrastar para Copiar
 	</text>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
@@ -73,13 +73,13 @@
 	<text name="Strength:">
 		Força
 	</text>
-	<text name="obj_count">
+	<text name="obj_count" left="134">
 		Objetos selecionados: [COUNT]
 	</text>
-	<text name="prim_count">
+	<text name="prim_count" left="134">
 		primitivas: [COUNT]
 	</text>
-	<tab_container name="Object Info Tabs">
+	<tab_container name="Object Info Tabs" tab_max_width="60" tab_min_width="30" width="288">
 		<panel label="Comum" name="General">
 			<text name="Name:">
 				Nome:
@@ -105,7 +105,7 @@
 				Grupo:
 			</text>
 			<text name="Group Name Proxy">
-				Os Lindens
+				The Lindens
 			</text>
 			<button label="Definir..." label_selected="Definir..." name="button set group"/>
 			<text name="Permissions:">
@@ -144,12 +144,12 @@
 				Próximo Proprietário pode:
 			</text>
 			<check_box label="Modificar" name="checkbox next owner can modify"/>
-			<check_box label="Copiar" name="checkbox next owner can copy"/>
-			<check_box label="Revender/Dar" name="checkbox next owner can transfer"/>
-			<text name="label click action">
+			<check_box label="Copiar" name="checkbox next owner can copy" left_delta="80"/>
+			<check_box label="Revender/Dar" name="checkbox next owner can transfer" left_delta="67"/>
+			<text name="label click action" width="220">
 				Quando clicado com o botão esquerdo:
 			</text>
-			<combo_box name="clickaction">
+			<combo_box name="clickaction" width="192">
 				<combo_item name="Touch/grab(default)">
 					Tocar/Pegar (padrão)
 				</combo_item>
@@ -176,7 +176,7 @@
 				B:
 			</text>
 			<text name="O:">
-				O;
+				O:
 			</text>
 			<text name="G:">
 				G:
@@ -222,7 +222,7 @@
 			</string>
 		</panel>
 		<panel label="Objeto" name="Object">
-			<text name="select_single">
+			<text name="select_single" width="272">
 				Selecione apenas uma primitiva para editar os parâmetros.
 			</text>
 			<text name="edit_object">
@@ -306,10 +306,10 @@
 				</combo_item>
 			</combo_box>
 			<text name="text cut">
-				Recorte inicial e final
+				Recorte Início e final
 			</text>
-			<spinner label="B" name="cut begin"/>
-			<spinner label="E" name="cut end"/>
+			<spinner label="I" name="cut begin"/>
+			<spinner label="F" name="cut end"/>
 			<text name="text hollow">
 				Vazio
 			</text>
@@ -336,8 +336,8 @@
 			<text name="text twist">
 				Torcer no Início e final
 			</text>
-			<spinner label="B" name="Twist Begin"/>
-			<spinner label="E" name="Twist End"/>
+			<spinner label="I" name="Twist Begin"/>
+			<spinner label="F" name="Twist End"/>
 			<text name="scale_taper">
 				Afinar
 			</text>
@@ -351,17 +351,17 @@
 			</text>
 			<spinner label="X" name="Shear X"/>
 			<spinner label="Y" name="Shear Y"/>
-			<text name="advanced_cut">
-				Perfil Recortado no Início e Final
+			<text name="advanced_cut" width="156">
+				Perfil Recortado no Início e fim
 			</text>
 			<text name="advanced_dimple">
-				Cova Início e Final
+				Cova Início e final
 			</text>
 			<text name="advanced_slice">
-				Pedaço Início (B) e Fim (E)
+				Pedaço Início e fim 
 			</text>
-			<spinner label="B" name="Path Limit Begin"/>
-			<spinner label="E" name="Path Limit End"/>
+			<spinner label="I" name="Path Limit Begin"/>
+			<spinner label="F" name="Path Limit End"/>
 			<text name="text taper2">
 				Afinar
 			</text>
@@ -398,7 +398,7 @@
 			</combo_box>
 		</panel>
 		<panel label="Recursos" name="Features">
-			<text name="select_single">
+			<text name="select_single" width="272">
 				Selecione apenas uma primitiva para editar suas características.
 			</text>
 			<text name="edit_object">
@@ -425,7 +425,7 @@
 		<panel label="Textura" name="Texture">
 			<texture_picker label="Textura" name="texture control" tool_tip="Clique para escolher uma imagem"/>
 			<color_swatch label="Cor" name="colorswatch" tool_tip="Clique para abrir o Seletor de Cores"/>
-			<text name="color trans">
+			<text name="color trans" width="100">
 				Transparência %
 			</text>
 			<text name="glow label">
@@ -463,7 +463,7 @@
 			<text name="label bumpiness">
 				Ondulação
 			</text>
-			<combo_box name="combobox bumpiness">
+			<combo_box name="combobox bumpiness" width="100" >
 				<combo_item name="None">
 					Nenhum
 				</combo_item>
@@ -477,7 +477,7 @@
 					Granulação
 				</combo_item>
 				<combo_item name="bark">
-					casca
+					Casca
 				</combo_item>
 				<combo_item name="bricks">
 					Tijolos
@@ -507,7 +507,7 @@
 					Revestimento
 				</combo_item>
 				<combo_item name="stonetile">
-					empedrado
+					Empedrado
 				</combo_item>
 				<combo_item name="stucco">
 					Grafiato
@@ -516,7 +516,7 @@
 					Sulcos
 				</combo_item>
 				<combo_item name="weave">
-					weave
+					Weave
 				</combo_item>
 			</combo_box>
 			<text name="tex scale">
@@ -552,6 +552,7 @@
 		<panel label="Conteúdo" name="Contents">
 			<button label="Novo Script" label_selected="Novo Script..." name="button new script"/>
 			<button label="Permissões..." name="button permissions"/>
+			<panel name="ContentsInventory" width="272" />
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
@@ -566,7 +567,7 @@
 		</text>
 		<button label="Sobre a Terra..." label_selected="Sobre a Terra..." name="button about land"/>
 		<check_box label="Mostrar donos" name="checkbox show owners" tool_tip="Colorir lotes de acordo com seus donos"/>
-		<button label="?" label_selected="?" name="button show owners help"/>
+		<button label="?" label_selected="?" name="button show owners help" left_delta="100"/>
 		<text name="label_parcel_modify">
 			Modificar Lote
 		</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
index 694100297d..cd94b51b16 100644
--- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
@@ -19,14 +19,17 @@
 		Nome do Objeto:
 	</text>
 	<button label="Filtro" name="filter_object_btn"/>
-	<text name="owner_name_text">
+	<text name="owner_name_text" width="130">
 		Nome do Proprietário:
 	</text>
+	<line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/>
+	<line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/>
+	<line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/>
 	<button label="Filtro" name="filter_owner_btn"/>
-	<button label="Retornar Selecionado" name="return_selected_btn"/>
-	<button label="Retornar Tudo" name="return_all_btn"/>
-	<button label="Desabilitar Selecionado" name="disable_selected_btn"/>
-	<button label="Desabilitar Tudo" name="disable_all_btn"/>
+	<button label="Retornar Selecionado" name="return_selected_btn" width="170"/>
+	<button label="Retornar Tudo" name="return_all_btn" left="190"/>
+	<button label="Desabilitar Selecionado" name="disable_selected_btn" width="170"/>
+	<button label="Desabilitar Tudo" name="disable_all_btn" left="190"/>
 	<button label="Atualizar" name="refresh_btn"/>
 	<string name="top_scripts_title">
 		Principais Scripts
diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml
index 5da34d2de7..4bb4539b80 100644
--- a/indra/newview/skins/default/xui/pt/floater_tos.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tos.xml
@@ -4,7 +4,8 @@
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<check_box label="Eu concordo com os Termos do Serviço" name="agree_chk"/>
 	<text name="tos_heading">
-		Por favor, leia os seguintes Termos de Serviço cuidadosamente. Para continuar acessando o Second Life, você precisa aceitar o acordo.
+		Por favor, leia os seguintes Termos de Serviço cuidadosamente. Para continuar acessando o
+Second Life, você precisa aceitar o acordo.
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/pt/floater_url_entry.xml b/indra/newview/skins/default/xui/pt/floater_url_entry.xml
index a4ae5e2e3d..48af8de363 100644
--- a/indra/newview/skins/default/xui/pt/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/pt/floater_url_entry.xml
@@ -3,6 +3,7 @@
 	<text name="media_label">
 		URL da Mídia:
 	</text>
+	<combo_box left="100" name="media_entry" width="360" />
 	<button label="OK" name="ok_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
 	<button label="Limpar" name="clear_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_water.xml b/indra/newview/skins/default/xui/pt/floater_water.xml
index 007eb3f6ba..ceb4414058 100644
--- a/indra/newview/skins/default/xui/pt/floater_water.xml
+++ b/indra/newview/skins/default/xui/pt/floater_water.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Water Floater" title="Editor de �gua Avançado">
-	<text name="KeyFramePresetsText">
+	<text name="KeyFramePresetsText" width="154">
 		Pré-configurações da �gua:
 	</text>
+	<combo_box left_delta="160" name="WaterPresetsCombo" width="150" />
 	<button label="Novo" label_selected="Novo" name="WaterNewPreset"/>
 	<button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/>
 	<button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/>
@@ -16,15 +17,15 @@
 			<text name="WaterFogDensText">
 				Expoente da Densidade de névoa
 			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
+			<button label="?" name="WaterFogDensityHelp" left="209"/>
 			<text name="WaterUnderWaterFogModText">
 				Modificador da névoa Subaquática
 			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
+			<button label="?" name="WaterUnderWaterFogModHelp" left="209"/>
 			<text name="BDensText">
 				Escala da Marola de Reflexão
 			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
+			<button label="?" name="WaterNormalScaleHelp" left="415"/>
 			<text name="BHText2">
 				1
 			</text>
@@ -37,29 +38,29 @@
 			<text name="HDText">
 				Escala de Fresnel
 			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
+			<button label="?" name="WaterFresnelScaleHelp" left="415"/>
 			<text name="FresnelOffsetText">
 				Deslocamento de Fresnel
 			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
+			<button label="?" name="WaterFresnelOffsetHelp" left="415"/>
 			<text name="DensMultText">
 				Refratar a Escala para Cima
 			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
+			<button label="?" name="WaterScaleAboveHelp" left="640"/>
 			<text name="WaterScaleBelowText">
 				Refratar a Escala para Baixo
 			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
+			<button label="?" name="WaterScaleBelowHelp" left="640"/>
 			<text name="MaxAltText">
 				Multiplicador de Difusão
 			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
+			<button label="?" name="WaterBlurMultiplierHelp" left="640"/>
 		</panel>
 		<panel label="Imagem" name="Waves">
 			<text name="BHText">
 				Direção da Onda Maior
 			</text>
-			<button label="?" name="WaterWave1Help"/>
+			<button label="?" name="WaterWave1Help" left="170"/>
 			<text name="WaterWave1DirXText">
 				X
 			</text>
@@ -69,7 +70,7 @@
 			<text name="BHText2">
 				Direção da Onda Pequena
 			</text>
-			<button label="?" name="WaterWave2Help"/>
+			<button label="?" name="WaterWave2Help" left="170"/>
 			<text name="WaterWave2DirXText">
 				X
 			</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
index f86775c770..0de8bd22f8 100644
--- a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="WindLight floater" title="Editor de Céu Avançado">
-	<text name="KeyFramePresetsText">
+	<text name="KeyFramePresetsText" width="130">
 		Pré-definições de Céu:
 	</text>
+	<combo_box left_delta="130" name="WLPresetsCombo"/>
 	<button label="Novo" label_selected="Novo" name="WLNewPreset"/>
-	<button label="Salvar" label_selected="Salvar" name="WLSavePreset"/>
-	<button label="Deletar" label_selected="Deletar" name="WLDeletePreset"/>
-	<button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" name="WLDayCycleMenuButton" width="150" left_delta="95" />
+	<button label="Salvar" label_selected="Salvar" name="WLSavePreset" left_delta="72"/>
+	<button label="Deletar" label_selected="Deletar" name="WLDeletePreset" left_delta="72"/>
+	<button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" name="WLDayCycleMenuButton" width="150" left_delta="84" />
 	<tab_container name="WindLight Tabs">
 		<panel label="Atmosfera" name="Atmosphere">
 			<text name="BHText">
@@ -52,15 +53,15 @@
 			<text name="DensMultText">
 				Multiplicador de Densidade
 			</text>
-			<button label="?" name="WLDensityMultHelp"/>
+			<button label="?" name="WLDensityMultHelp" left="635"/>
 			<text name="WLDistanceMultText">
 				Multiplicador de Distância
 			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
+			<button label="?" name="WLDistanceMultHelp" left="635"/>
 			<text name="MaxAltText">
 				Altitude Máxima
 			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
+			<button label="?" name="WLMaxAltitudeHelp" left="635"/>
 		</panel>
 		<panel label="Iluminação" name="Lighting">
 			<text name="SLCText">
@@ -156,10 +157,10 @@
 				Escala da Nuvem
 			</text>
 			<button label="?" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Detalhe da Nuvem  (XY/Densidade)
+			<text name="WLCloudDetailText" font="SansSerifSmall">
+				Detalhe da Nuvem (XY/Densidade)
 			</text>
-			<button label="?" name="WLCloudDetailHelp"/>
+			<button label="?" name="WLCloudDetailHelp" left="421"/>
 			<text name="BHText8">
 				X
 			</text>
@@ -180,7 +181,7 @@
 			<button label="?" name="WLCloudScrollYHelp"/>
 			<check_box label="Travar" name="WLCloudLockY"/>
 			<check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
+			<button label="?" name="WLClassicCloudsHelp" left="645"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 08ccdc043f..76b674ab66 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -119,8 +119,12 @@
 		<menu_item_call label="Parar Animação do Meu Avatar" name="Stop Animating My Avatar"/>
 		<menu_item_call label="Liberar teclas" name="Release Keys"/>
 		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="Histórico de conta..." name="Account History..."/>
-		<menu_item_call label="Gerenciar minha conta..." name="Manage My Account..."/>
+		<menu_item_call label="Histórico de conta..." name="Account History...">
+			<on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=pt"/>
+		</menu_item_call>
+		<menu_item_call label="Gerenciar minha conta..." name="Manage My Account...">
+			<on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=pt"/>
+		</menu_item_call>
 		<menu_item_call label="Comprar L$..." name="Buy and Sell L$..."/>
 		<menu_item_separator label="-----------" name="separator5"/>
 		<menu_item_call label="Meu terreno..." name="My Land..."/>
@@ -165,7 +169,9 @@
 		<menu_item_separator label="-----------" name="separator4"/>
 		<menu_item_call label="Foco na seleção" name="Focus on Selection"/>
 		<menu_item_call label="Zoom na Seleção" name="Zoom to Selection"/>
-		<menu_item_call label="Comprar objetos" name="Menu Object Take"/>
+		<menu_item_call label="Comprar el objeto" name="Menu Object Take">
+			<on_enable userdata="Comprar,Pegar" name="EnableBuyOrTake"/>
+		</menu_item_call>
 		<menu_item_call label="Pegar cópia" name="Take Copy"/>
 		<menu_item_call label="Salvar objeto de volta aos conteúdos do objeto" name="Save Object Back to Object Contents"/>
 		<menu_item_separator label="-----------" name="separator6"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index a88ab65c7a..0e3ab9c644 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -174,7 +174,7 @@ Você deseja permitir que os residentes selecionados tenham direito de edição?
 Membros não podem ser removidos dessa função.
 Os membros podem, eles próprios, recusar a função.
 Deseja continuar?
-		<usetemplate ignoretext="Quando adcionar membro ao grupo como dono" name="okcancelignore" notext="Não" yestext="Sim"/>
+		<usetemplate ignoretext="Quando adicionar membro ao grupo como dono" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="AssignDangerousActionWarning">
 		Você está prestes a adicionar a habilidade &apos;[ACTION_NAME]&apos; para a função &apos;[ROLE_NAME]&apos;
@@ -954,7 +954,7 @@ Se o problema persistir, por favor clicar sobre &apos;Ferramentas &gt; Bug Repor
 		Você foi deslogado do [SECOND_LIFE]:
             [MESSAGE]
 Você ainda pode olhar o bate-papo e as mensagens instantâneas existentes, clicando em &apos;Exibir IM &amp; bate-papo&apos;. Caso contrário, clique em &apos;Sair&apos; para sair do [SECOND_LIFE] imediatamente.
-		<usetemplate name="okcancelbuttons" notext="Sair" yestext="Ver Mensagem Instantânea &amp; Bate- Papo"/>
+		<usetemplate name="okcancelbuttons" notext="Sair" yestext="Exibir IM &amp; bate-papo"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
 		Não é possível comprar o terreno para o grupo:
@@ -1100,7 +1100,7 @@ Transferir propriedade destes [AREA] m² de terreno para o grupo &apos;[GROUP_NA
 		Configurações de display foram ajustadas para níveis de segurança porque você especificou -- opção de segurança.
 	</notification>
 	<notification name="DisplaySetToRecommended">
-		Configurações de display foram ajustadas para nível recomendado basedo na configuração do seu sistema.
+		Configurações de display foram ajustadas para nível recomendado baseado na configuração do seu sistema.
 	</notification>
 	<notification name="ErrorMessage">
 		[ERROR_MESSAGE]
@@ -1517,7 +1517,7 @@ Ir para o Banco de Conhecimento para maiores informações sobre Classificaçõe
 		Você não é permitido nessa região devido à sua preferência de Classificação de maturidade.
 
 Você pode clicar em  &apos;Mudar Preferência&apos; para aumentar sua preferência de Classificação de maturidade agora e permitir sua entrada. Você estará habilitado a buscar e acessar conteúdo [REGIONMATURITY] a partir de agora. Se você desejar mais tarde voltar à configuração anterior, vá para Editar &gt; Preferencias... &gt; Geral.
-	 <form>
+	 <form name="form">
       <button
        name="OK"
        text="Mudar Preferência"/>
@@ -1525,7 +1525,7 @@ Você pode clicar em  &apos;Mudar Preferência&apos; para aumentar sua preferên
        default="true"
        name="Cancel"
        text="Fechar"/>
-       <ignore text="Quando a entrada na Região está bloqueada devido à preferência de Classificação de maturidade"/>
+       <ignore name="ignore" text="Quando a entrada na Região está bloqueada devido à preferência de Classificação de maturidade"/>
     </form>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
@@ -2118,9 +2118,9 @@ Coloque-a em uma página web para dar aos outros um fácil acesso a este local o
 		</form>
 	</notification>
 	<notification name="GraphicsPreferencesHelp">
-		Este painel controla o tamanho da janela, resolução e a qualidade dos gráficos do computador cliente. O Preferências &gt; Interface Gráfica permite escolher entre quatro níveis gráficos: Baixo, Médio, Alto e Ultra. Você também pode personalizar suas configurações de gráficos selecionando a opção Custom e manipulando as seguintes definições:
+		Este painel controla o tamanho da janela, resolução e a qualidade dos gráficos do computador cliente. O Preferências &gt; Interface Gráfica permite escolher entre quatro níveis gráficos: Baixo, Médio, Alto e Ultra. Você também pode personalizar suas configurações de gráficos selecionando a opção Padrão e manipulando as seguintes definições:
 
-Sombreamento: Ativar ou desativar vários tipos de sobreadores de pixel.
+Sombreamento: Ativar ou desativar vários tipos de sombreadores de pixel.
 
 Detalhes de Reflexão: Define os tipos de objetos que a água pode refletir.
 
@@ -2360,7 +2360,7 @@ Gostaria de visitar o site do Second Life para verificação de idade?
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php
+			https://secondlife.com/account/verification.php?lang=pt
 		</url>
 		<usetemplate ignoretext="Alertar sobre a falta de verificação de idade" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
@@ -2370,7 +2370,7 @@ Gostaria de visitar o site do Second Life para configurá-lo?
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/
+			https://secondlife.com/account/index.php?lang=pt
 		</url>
 		<usetemplate ignoretext="Avisar sobre a falta de informação de pagamento." name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
@@ -2627,7 +2627,7 @@ Vá para a Ilha de Ajuda Pública para repetir este tutorial.
 	<notification name="ImproperPaymentStatus">
 		Você não tem o status de pagamento adequado para entrar nesta região.
 	</notification>
-	<notification name="MustGetAgeRgion">
+	<notification name="MustGetAgeRegion">
 		Você precisa ter sua idade verificada para entrar nesta região.
 	</notification>
 	<notification name="MustGetAgeParcel">
diff --git a/indra/newview/skins/default/xui/pt/panel_friends.xml b/indra/newview/skins/default/xui/pt/panel_friends.xml
index afd7b79eaa..d430d637ad 100644
--- a/indra/newview/skins/default/xui/pt/panel_friends.xml
+++ b/indra/newview/skins/default/xui/pt/panel_friends.xml
@@ -11,10 +11,10 @@
 		<column name="icon_edit_mine" tool_tip="Amigo pode editar, apagar ou pegar seus objetos"/>
 		<column name="icon_edit_theirs" tool_tip="Você pode editar os objetos deste amigo"/>
 	</scroll_list>
-	<button label="MI/Chamar" name="im_btn" tool_tip="Abrir sessão de Mensagem Instantânea"/>
-	<button label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e outras informações"/>
-	<button label="Teletransporte..." name="offer_teleport_btn" tool_tip="Oferecer a este amigo o teletransporte para sua localização atual"/>
-	<button label="Pagar..." name="pay_btn" tool_tip="Dar Linden dólares (L$) a este amigo"/>
-	<button label="Remover..." name="remove_btn" tool_tip="Remover esta pessoa de sua lista de amigos"/>
-	<button label="Adicionar..." name="add_btn" tool_tip="Oferecer amizade a um residente"/>
+	<button width="86" label="MI/Chamar" name="im_btn" tool_tip="Abrir sessão de Mensagem Instantânea"/>
+	<button width="86" label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e outras informações"/>
+	<button width="86" label="Teletransp..." name="offer_teleport_btn" tool_tip="Oferecer a este amigo o teletransporte para sua localização atual"/>
+	<button width="86" label="Pagar..." name="pay_btn" tool_tip="Dar Linden dólares (L$) a este amigo"/>
+	<button width="86" label="Remover..." name="remove_btn" tool_tip="Remover esta pessoa de sua lista de amigos"/>
+	<button width="86" label="Adicionar..." name="add_btn" tool_tip="Oferecer amizade a um residente"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
index f4941eabd9..185ed77576 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml
@@ -14,7 +14,7 @@
 	<text name="prepend_founded_by">
 		Fundado por:
 	</text>
-	<text name="founder_name">
+	<text name="founder_name" left_delta="74" >
 		(espera)
 	</text>
 	<text name="group_charter_label">
@@ -44,8 +44,8 @@
 		<check_box label="Mostre na busca" name="show_in_group_list" tool_tip="Deixe as pessoas verem este grupo nos resultados de busca."/>
 		<check_box label="Adesão aberta" name="open_enrollement" tool_tip="Definir se este grupo permite que novos membros entrem sem serem convidados"/>
 		<check_box label="Taxa de adesão: L$" name="check_enrollment_fee" tool_tip="Define se é necessária uma taxa de adesão para se unir ao grupo."/>
-		<spinner name="spin_enrollment_fee" tool_tip="Os novos membros devem pagar esta taxa para se unir ao grupo quando a Taxa de Adesão está marcada."/>
-		<combo_box name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada mature.">
+		<spinner width="60" left_delta="120"  name="spin_enrollment_fee" tool_tip="Os novos membros devem pagar esta taxa para se unir ao grupo quando a Taxa de Adesão está marcada."/>
+		<combo_box width="170" name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada mature.">
 			<combo_item name="select_mature">
 				- Selecionar Maturidade -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index e9c7bab3db..a02a17139b 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Convidar um membro" name="invite_panel">
-	<text name="help_text">
+<panel label="Convidar um membro" name="invite_panel" width="224">
+	<text name="help_text" width="214">
 		Voce pode selecionar vários residentes
-para convidar ao seu grupo. Clique &apos;Abrir
-Seletor de Residente&apos; para iniciar.
+para convidar ao seu grupo. Clique
+&apos;Abrir Seletor de Residente&apos; para iniciar.
 	</text>
 	<button label="Abrir Seletor de Residente" name="add_button" tool_tip=""/>
 	<name_list name="invitee_list" tool_tip="Mantenha apertada a tecla Control e clique nos nomes dos residentes para uma seleção múltipla."/>
-	<button label="Remove Selected from List" name="remove_button" tool_tip="Remove os residentes selecionados acima  da lista de convite."/>
+	<button left_delta="-7" width="214" label="Remove os selecionados acima da lista" name="remove_button" tool_tip="Remove os residentes selecionados acima da lista de convite."/>
 	<text name="role_text">
 		Escolha que Função atribuir a eles:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
index f5e96869d7..103da6d67d 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
@@ -13,7 +13,7 @@
 	<string name="loading_txt">
 		Carregando...
 	</string>
-	<text name="group_land_heading">
+	<text name="group_land_heading" width="250">
 		Terra percentente ao grupo
 	</text>
 	<scroll_list name="group_parcel_list">
@@ -22,7 +22,7 @@
 		<column label="Tipo" name="type"/>
 		<column label="�rea" name="area"/>
 	</scroll_list>
-	<button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button"/>
+	<button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button" left="282" width="130"/>
 	<text name="total_contributed_land_label">
 		Contribuição Total:
 	</text>
@@ -51,7 +51,8 @@
 		m² ([AMOUNT] máxima)
 	</text>
 	<text name="group_over_limit_text">
-		Membros do grupo precisam contribuir com mais créditos de Terra para garantir a terra em uso.
+		Membros do grupo precisam contribuir com mais créditos de Terra para
+garantir a terra em uso.
 	</text>
 	<text name="group_money_heading">
 		Grupo L$
@@ -66,8 +67,8 @@
 			<text_editor name="group_money_details_text">
 				Computando...
 			</text_editor>
-			<button label="&lt; Cedo" label_selected="&lt; Cedo" name="earlier_details_button" tool_tip="Voltar no Tempo"/>
-			<button label="Tarde &gt;" label_selected="Tarde &gt;" name="later_details_button" tool_tip="Adiantar o Tempo"/>
+			<button label="&lt; Mais Cedo" label_selected="&lt; Cedo" name="earlier_details_button" tool_tip="Voltar no Tempo"/>
+			<button label="Mais Tarde &gt;" label_selected="Tarde &gt;" name="later_details_button" tool_tip="Adiantar o Tempo"/>
 		</panel>
 		<panel label="Vendas" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
index 1285a24ace..008e8144c6 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Notícias" name="notices_tab">
 	<text name="help_text">
-		As notícias são uma maneira rápida de
-comunicar-se através de um grupo transmitindo uma mensagem e
-entregando um item anexo, opcionalmente. As notícias vão apenas a membros
-do grupo que têm a função habilitada para receber notícias. Você pode desligar
-Notícias na aba Geral.
+		As notícias são uma maneira rápida de comunicar-se através de um grupo transmitindo uma mensagem e entregando um item anexo, opcionalmente. As notícias vão apenas a membros do grupo que têm a função habilitada para receber notícias. Você pode desligar Notícias na aba Geral.
 	</text>
 	<text name="no_notices_text">
 		Não existem notícias anteriores.
@@ -15,9 +11,9 @@ Notícias na aba Geral.
 		Arquivo de notícias do grupo
 	</text>
 	<text name="lbl2">
-		As notícias são mantidas por 14 dias. Clique na notícia abaixo que você deseja ver.
-Clique no botão “Atualizar� para verificar se novas notícias foram recebidas.
-Listas de aviso estão limitadas a 200 por grupo, diariamente.
+		As notícias são mantidas por 14 dias. Clique na notícia abaixo que você deseja 
+ver. Clique no botão “Atualizar� para verificar se novas notícias foram 
+recebidas. Listas de aviso estão limitadas a 200 por grupo, diariamente.
 	</text>
 	<scroll_list name="notice_list">
 		<column label="Assunto" name="subject"/>
@@ -39,15 +35,18 @@ adicionar um item simples à notícia, arrastando-o do seu
 Inventário para o painel. Itens anexados devem ser copiáveis
 e transferíveis e você não pode mandar uma pasta.
 		</text>
-		<text name="lbl3">
+		<text name="lbl3" left="20">
 			Assunto:
 		</text>
-		<text name="lbl4">
+		<line_editor name="create_subject" width="251" left_delta="61"/>
+		<text name="lbl4" left="15" width="60">
 			Mensagem:
 		</text>
-		<text name="lbl5">
+		<text_editor name="create_message" left_delta="66" width="330"/>
+		<text name="lbl5" width="68">
 			Anexo:
 		</text>
+		<line_editor name="create_inventory_name" width="190" left_delta="74"/>
 		<button label="Remover o anexo" label_selected="Remover o anexo" name="remove_attachment"/>
 		<button label="Enviar notícia" label_selected="Enviar notícia" name="send_notice"/>
 		<panel name="drop_target" tool_tip="Arraste um item do inventário para dentro da caixa de mensagem para enviá-lo com a notícia. Você deve ter permissão para copiar e transferir o objeto, para enviá-lo com a notícia."/>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
index 32ed839bd8..087cf0c107 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
@@ -13,7 +13,8 @@
 		</text>
 		<text name="static2">
 			São atribuídas funções com habilidades aos membros do grupo. 
-Estes ajustes podem ser facilmente customizados para uma flexibilidade e organização maiores.
+Estes ajustes podem ser facilmente customizados para uma flexibilidade
+e organização maiores.
 		</text>
 	</panel>
 	<panel name="roles_header">
@@ -21,12 +22,14 @@ Estes ajustes podem ser facilmente customizados para uma flexibilidade e organiz
 			Funções
 		</text>
 		<text name="role_properties_modifiable">
-			Selecionar uma função abaixo. Você pode modificar o nome, a descrição e o título do membro.
+			Selecionar uma função abaixo. Você pode modificar o nome, a descrição
+e o título do membro.
 		</text>
 		<text name="role_properties_not_modifiable">
-			Selecione uma função abaixo para ver suas propriedades, membros e habilidades permitidas.
+			Selecione uma função abaixo para ver suas propriedades, membros e
+habilidades permitidas.
 		</text>
-		<text name="role_actions_modifiable">
+		<text bottom_delta="-28" name="role_actions_modifiable">
 			Você também pode atribuir habilidades à função.
 		</text>
 		<text name="role_actions_not_modifiable">
@@ -38,28 +41,31 @@ Estes ajustes podem ser facilmente customizados para uma flexibilidade e organiz
 			Habilidades
 		</text>
 		<text name="static2">
-			Você pode ver a descrição de uma habilidade e quais funções e membros podem executar essa habilidade.
+			Você pode ver a descrição de uma habilidade e quais funções e membros
+podem executar essa habilidade.
 		</text>
 	</panel>
-	<tab_container name="roles_tab_container">
-		<panel label="Membros" name="members_sub_tab" tool_tip="Membros">
-			<button label="Pesquisar" name="search_button"/>
-			<button label="Mostrar todos" name="show_all_button"/>
-			<name_list name="member_list">
+	<tab_container height="164" name="roles_tab_container">
+		<panel height="148" label="Membros" name="members_sub_tab" tool_tip="Membros">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Pesquisar" name="search_button" width="75"/>
+			<button label="Mostrar todos" name="show_all_button" left_delta="80"/>
+			<name_list name="member_list" bottom_delta="-105" height="104" >
 				<column label="Nome do membro" name="name"/>
 				<column label="Tarifa doada" name="donated"/>
 				<column label="Último login" name="online"/>
 			</name_list>
-			<button label="Convidar Novo Membro ..." name="member_invite"/>
+			<button label="Convidar Novo Membro..." name="member_invite" width="165"/>
 			<button label="Ejetar do Grupo" name="member_eject"/>
 			<string name="help_text">
 				Você pode adicionar ou remover as funções designadas aos membros. Selecione vários membros, segurando a tecla Ctrl e clicando em seus nomes.
 			</string>
 		</panel>
-		<panel label="Funções" name="roles_sub_tab">
-			<button label="Busca" name="search_button"/>
-			<button label="Mostrar todos" name="show_all_button"/>
-			<scroll_list name="role_list">
+		<panel height="148" label="Funções" name="roles_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Busca" name="search_button" width="75"/>
+			<button label="Mostrar todos" name="show_all_button" left_delta="80"/>
+			<scroll_list name="role_list" bottom_delta="-104" height="104">
 				<column label="Nome da função" name="name"/>
 				<column label="Título" name="title"/>
 				<column label="Membro" name="members"/>
@@ -75,10 +81,11 @@ permitidas que os membros podem executar. Os membros poderão ter um ou mais fun
 				As funções &apos;todos&apos; e &apos;donos&apos; são especiais e não podem ser deletadas.
 			</string>
 		</panel>
-		<panel label="Habilidades" name="actions_sub_tab">
-			<button label="Busca" name="search_button"/>
-			<button label="Mostrar todos" name="show_all_button"/>
-			<scroll_list name="action_list" tool_tip="Selecione uma habilidade para ver mais detalhes."/>
+		<panel height="148" label="Habilidades" name="actions_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Busca" name="search_button" width="75"/>
+			<button label="Mostrar todos" name="show_all_button" left_delta="80"/>
+			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Selecione uma habilidade para ver mais detalhes."/>
 			<string name="help_text">
 				As habilidades permitem que os membros nas funções façam coisas específicas dentro do grupo.
 Há uma grande variedade de habilidades.
diff --git a/indra/newview/skins/default/xui/pt/panel_groups.xml b/indra/newview/skins/default/xui/pt/panel_groups.xml
index 8a886ef8b1..aaea1178a6 100644
--- a/indra/newview/skins/default/xui/pt/panel_groups.xml
+++ b/indra/newview/skins/default/xui/pt/panel_groups.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="groups">
-	<text name="groupdesc">
+	<text name="groupdesc" width="268">
 		Seu grupo ativo atual es&apos;ta mostrado em negrito.
 	</text>
-	<text name="groupcount">
+	<text name="groupcount" width="300">
 		Você pertence a [COUNT] grupos (de no máximo [MAX]).
-aximo
 	</text>
-	<button label="MI/Chamada" name="IM" tool_tip="Abrir sessão de Mensagem Instantânea"/>
-	<button label="Informações" name="Info"/>
-	<button label="Ativar" name="Activate"/>
-	<button label="Deixar" name="Leave"/>
-	<button label="Criar..." name="Create"/>
-	<button label="Buscar..." name="Search..."/>
+	<button width="86" label="MI/Chamada" name="IM" tool_tip="Abrir sessão de Mensagem Instantânea"/>
+	<button width="86" label="Informações" name="Info"/>
+	<button width="86" label="Ativar" name="Activate"/>
+	<button width="86" label="Deixar" name="Leave"/>
+	<button width="86" label="Criar..." name="Create"/>
+	<button width="86" label="Buscar..." name="Search..."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index bee5dd1328..a556a9d2c6 100644
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -10,7 +10,7 @@
 		Senha:
 	</text>
 	<text name="start_location_text">
-		Localização inicial:
+		Posição inicial:
 	</text>
 	<combo_box name="start_location_combo">
 		<combo_item name="MyHome">
@@ -20,7 +20,7 @@
 			Minha última localização
 		</combo_item>
 		<combo_item name="Typeregionname">
-			&lt; Digite o nome da região;
+			&lt;Digite o nome da região&gt;
 		</combo_item>
 	</combo_box>
 	<check_box label="Lembrar senha" name="remember_check"/>
@@ -28,7 +28,7 @@
 	<text name="create_new_account_text">
 		Registrar-se para uma conta
 	</text>
-	<text name="forgot_password_text">
+	<text name="forgot_password_text" left="-240" width="230">
 		Esqueceu seu nome de usuário ou senha?
 	</text>
 	<text name="channel_text">
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index 8ae635bbae..9aa1381f27 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -34,7 +34,7 @@ do Chat:
 	<text length="1" name="text_box3" type="string">
 		Console do Chat:
 	</text>
-	<spinner label="Ocultar Chat depois" label_width="112" name="fade_chat_time" width="162"/>
+	<spinner label="Ocultar Chat depois" label_width="108" name="fade_chat_time" width="160"/>
 	<text left="310" length="1" name="text_box4" type="string">
 		(segundos)
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 44bfb2d18e..81dc7f960c 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -111,18 +111,18 @@ rápido
 	<text name="DrawDistanceMeterText2">
 		m
 	</text>
-	<slider label="Distancia de desenho:" label_width="146" name="DrawDistance" width="255"/>
-	<slider label="Contador máx. de partículas:" label_width="146" name="MaxParticleCount" width="262"/>
-	<slider label="Qualidade de Pós-processamento:" label_width="146" name="RenderPostProcess" width="223"/>
+	<slider label="Distancia de desenho:" label_width="150" name="DrawDistance" width="255"/>
+	<slider label="Contador máx. de partículas:" label_width="150" name="MaxParticleCount" width="262"/>
+	<slider label="Qualidade de Pós-processamento:" label_width="178" name="RenderPostProcess" width="223"/>
 	<text name="MeshDetailText">
 		Detalhes de Malha:
 	</text>
-	<slider label="Objetos:" name="ObjectMeshDetail"/>
-	<slider label="Primitivas Flexiveis:" name="FlexibleMeshDetail"/>
-	<slider label="�rvores:" name="TreeMeshDetail"/>
-	<slider label="Avatares:" name="AvatarMeshDetail"/>
-	<slider label="Terreno:" name="TerrainMeshDetail"/>
-	<slider label="Céu:" name="SkyMeshDetail"/>
+	<slider label="  Objetos:" name="ObjectMeshDetail"/>
+	<slider label="  Primitivas Flexiveis:" name="FlexibleMeshDetail"/>
+	<slider label="  �rvores:" name="TreeMeshDetail"/>
+	<slider label="  Avatares:" name="AvatarMeshDetail"/>
+	<slider label="  Terreno:" name="TerrainMeshDetail"/>
+	<slider label="  Céu:" name="SkyMeshDetail"/>
 	<text name="PostProcessText">
 		Baixo
 	</text>
@@ -166,7 +166,7 @@ rápido
 			Alto
 		</radio_item>
 	</radio_group>
-	<button label="Configurações Recomendadas" name="Defaults"/>
+	<button label="Configurações Recomendadas" name="Defaults" width="190" left="110"/>
 	<button label="Opções de Hardware" label_selected="Opções de Hardware" name="GraphicsHardwareButton"/>
 	<string name="resolution_format">
 		[RES_X] x [RES_Y]
diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
index 6218e4eafb..4977a1fac9 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
@@ -22,20 +22,22 @@
 		Última modificação: Quarta, 31 de dezembro de 1969 às 16:00:00 horas
 	</text>
 	<button label="?" name="covenant_help"/>
-	<text_editor name="covenant_editor">
+	<text_editor name="covenant_editor" bottom="-247" height="162" >
 		Não há nenhuma regra fornecida para esta Propriedade.
 	</text_editor>
 	<button label="Resetar" name="reset_covenant"/>
 	<text bottom="-25" name="covenant_help_text">
-		As mudanças das regras serão mostradas em todos os lotes da propriedade.
+		As mudanças das regras serão mostradas em todos os lotes
+      da propriedade.
 	</text>
-	<text name="covenant_instructions">
-		Arraste e solte um notecard, para mudar as Regras desta Propriedade.
+	<text  bottom_delta="-36" name="covenant_instructions">
+		Arraste e solte um notecard, para mudar as Regras desta
+      Propriedade.
 	</text>
-	<text name="region_section_lbl">
+	<text bottom_delta="-36" name="region_section_lbl">
 		Região:
 	</text>
-	<text bottom_delta="-31" name="region_name_lbl">
+	<text name="region_name_lbl">
 		Nome:
 	</text>
 	<text name="region_name_text">
@@ -72,9 +74,11 @@
 		Terras compradas na região não poderão ser revendidas.
 	</string>
 	<string name="can_change">
-		O terreno comprado nesta região pode ser compartilhado ou subdividido.
+		O terreno comprado nesta região pode ser compartilhado ou
+subdividido.
 	</string>
 	<string name="can_not_change">
-		O terreno comprado nesta região não pode ser compartilhado ou subdividido.
+		O terreno comprado nesta região não pode ser compartilhado
+ou subdividido.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
index 93c5d27648..724df20155 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
@@ -13,7 +13,7 @@
 	<check_box label="Desabilitar física" name="disable_physics_check" tool_tip="Desabilitar toda a físíca nesta região"/>
 	<button label="?" name="disable_physics_help"/>
 	<button label="Aplicar" name="apply_btn"/>
-	<text name="objret_text_lbl">
+	<text name="objret_text_lbl" width="130">
 		Retornar objeto
 	</text>
 	<text name="resident_text_lbl">
@@ -30,10 +30,10 @@
 	<check_box label="Retornar apenas aqueles objetos na terra de alguém" name="return_other_land" tool_tip="Retornar apenas objetos que estejam na terra pertencente a alguém"/>
 	<check_box label="Retornar objetos em cada região desta propriedade" name="return_estate_wide" tool_tip="Retornar objetos em todas as regiões que constituem esta propriedade"/>
 	<button label="Retornar" name="return_btn"/>
-	<button label="Pegar os principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as mais potenciais colisões"/>
-	<button label="?" name="top_colliders_help"/>
-	<button label="Pegar Principais Scripts..." name="top_scripts_btn" tool_tip="Lista de objetos gastando mais tempo rodando scripts"/>
-	<button label="?" name="top_scripts_help"/>
+	<button width="280" label="Pegar os principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as mais potenciais colisões"/>
+	<button label="?" name="top_colliders_help" left="297"/>
+	<button width="280" label="Pegar Principais Scripts..." name="top_scripts_btn" tool_tip="Lista de objetos gastando mais tempo rodando scripts"/>
+	<button label="?" name="top_scripts_help" left="297"/>
 	<button label="Reiniciar a Região" name="restart_btn" tool_tip="Dar 2 minutos de contagem regressiva e reiniciar a região"/>
 	<button label="?" name="restart_help"/>
 	<button label="Atrasar o Reinicio" name="cancel_restart_btn" tool_tip="Atrasar o reinicio da região por uma hora"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index c236b95ca1..f43402be15 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -24,9 +24,9 @@ todas as regiões desta propriedade.
 	<check_box label="Permitir acesso público" name="externally_visible_check"/>
 	<button label="?" name="externally_visible_help"/>
 	<text name="Only Allow">
-		Acesso restrito a:
+		Acesso restrito a Residentes...
 	</text>
-	<check_box label="Residentes com informações de pagamento em arquivo" name="limit_payment" tool_tip="Banir residentes não identificados."/>
+	<check_box label="com info. de pagamento em arquivo" name="limit_payment" tool_tip="Banir residentes não identificados."/>
 	<check_box label="Adultos com idade verificada" name="limit_age_verified" tool_tip="Banir residentes que não tenham confirmado a sua idade. Ver support.secondlife.com para mais informações."/>
 	<check_box label="Permitir conversa de voz" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
index 9b8fc48fb9..b9b0e9d90f 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
@@ -8,9 +8,9 @@
 	</text>
 	<spinner label="Altura da água" name="water_height_spin"/>
 	<button label="?" name="water_height_help"/>
-	<spinner label="Limite do aumento do terreno" name="terrain_raise_spin"/>
+	<spinner label="Limite do aumento do &#10;terreno" name="terrain_raise_spin"/>
 	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Limite mais baixo do terreno" name="terrain_lower_spin"/>
+	<spinner label="Limite mais baixo do &#10;terreno" name="terrain_lower_spin" bottom_delta="-34"/>
 	<button label="?" name="terrain_lower_help"/>
 	<check_box label="Usar o sol da propriedade" name="use_estate_sun_check"/>
 	<button label="?" name="use_estate_sun_help"/>
@@ -18,10 +18,10 @@
 	<button label="?" name="fixed_sun_help"/>
 	<slider label="Fase" name="sun_hour_slider"/>
 	<button label="Aplicar" name="apply_btn"/>
-	<button label="Download de terreno RAW ..." name="download_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/>
+	<button label="Download de terreno RAW..." name="download_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/>
 	<button label="?" name="download_raw_help"/>
 	<button label="Upload de terreno RAW..." name="upload_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/>
 	<button label="?" name="upload_raw_help"/>
-	<button label="Nivelar o terreno" name="bake_terrain_btn" tool_tip="Ajustar terreno atual como o ponto médio para os limites de aumento/decréscimo"/>
-	<button label="?" name="bake_terrain_help"/>
+	<button width="170" label="Nivelar o terreno" name="bake_terrain_btn" tool_tip="Ajustar terreno atual como o ponto médio para os limites de aumento/decréscimo"/>
+	<button left="190" label="?" name="bake_terrain_help"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_texture.xml b/indra/newview/skins/default/xui/pt/panel_region_texture.xml
index 8d7bdfe97b..4787b59a8d 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_texture.xml
@@ -6,7 +6,7 @@
 	<text name="region_text">
 		desconhecido
 	</text>
-	<text name="detail_texture_text">
+	<text name="detail_texture_text" width="380">
 		Texturas de Terreno (requer 512x512, arquivos 24 bit .tga )
 	</text>
 	<text name="height_text_lbl">
diff --git a/indra/newview/tr.lproj/language.txt b/indra/newview/tr.lproj/language.txt
new file mode 100644
index 0000000000..44266bf283
--- /dev/null
+++ b/indra/newview/tr.lproj/language.txt
@@ -0,0 +1 @@
+tr
\ No newline at end of file
diff --git a/indra/newview/uk.lproj/language.txt b/indra/newview/uk.lproj/language.txt
new file mode 100644
index 0000000000..fbc658f6f9
--- /dev/null
+++ b/indra/newview/uk.lproj/language.txt
@@ -0,0 +1 @@
+uk
\ No newline at end of file
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 599882500c..38685ecbb1 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -438,6 +438,18 @@ class DarwinManifest(ViewerManifest):
                 self.path("German.lproj")
                 self.path("Japanese.lproj")
                 self.path("Korean.lproj")
+                self.path("da.lproj")
+                self.path("es.lproj")
+                self.path("fr.lproj")
+                self.path("hu.lproj")
+                self.path("it.lproj")
+                self.path("nl.lproj")
+                self.path("pl.lproj")
+                self.path("pt.lproj")
+                self.path("ru.lproj")
+                self.path("tr.lproj")
+                self.path("uk.lproj")
+                self.path("zh-Hans.lproj")
 
                 # SLVoice and vivox lols
                 self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
diff --git a/indra/newview/zh-Hans.lproj/language.txt b/indra/newview/zh-Hans.lproj/language.txt
new file mode 100644
index 0000000000..147d659917
--- /dev/null
+++ b/indra/newview/zh-Hans.lproj/language.txt
@@ -0,0 +1 @@
+zh
\ No newline at end of file
-- 
cgit v1.2.3


From 5f4c09fa1f4b09126e1a16e78044c64e97828530 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 22 Jun 2009 22:36:36 +0000
Subject: Python 2.4 and 2.6 improvements

The sets module is no longer needed with Python 2.4, and causes a
DeprecationWarning with 2.6, so drop it

The md5 module causes a DeprecationWarning with 2.6, so try to import
hashlib (its replacement) instead, else fall back

Reviewed by Poppy.
---
 indra/lib/python/indra/base/lluuid.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/lib/python/indra/base/lluuid.py b/indra/lib/python/indra/base/lluuid.py
index aceea29cd2..1cdd8e915b 100644
--- a/indra/lib/python/indra/base/lluuid.py
+++ b/indra/lib/python/indra/base/lluuid.py
@@ -26,8 +26,14 @@ THE SOFTWARE.
 $/LicenseInfo$
 """
 
-import md5, random, socket, string, time, re
+import random, socket, string, time, re
 import uuid
+try:
+    # Python 2.6
+    from hashlib import md5
+except ImportError:
+    # Python 2.5 and earlier
+    from md5 import new as md5
 
 def _int2binstr(i,l):
     s=''
@@ -196,7 +202,7 @@ class UUID(object):
         from c++ implementation for portability reasons.
         Returns self.
         """
-        m = md5.new()
+        m = md5()
         m.update(uuid.uuid1().bytes)
         self._bits = m.digest()
         return self
-- 
cgit v1.2.3


From e588d1f28419745ee1e1ee98dc1852e0364a4088 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Wed, 1 Jul 2009 00:22:05 +0000
Subject: svn merge -r125825:125901
 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654 QAR-1654 merge completed.

---
 indra/develop.py                                   |   4 +-
 indra/lib/python/indra/base/llsd.py                |   2 +-
 indra/lib/python/indra/util/llsubprocess.py        |  11 +
 indra/lib/python/indra/util/named_query.py         |   4 +-
 indra/llcharacter/llkeyframestandmotion.cpp        |   2 +-
 indra/llcommon/llkeythrottle.h                     |  57 ++++++
 indra/llcommon/llstat.cpp                          |  51 ++++-
 indra/llcommon/llstat.h                            |  21 +-
 indra/llimage/llimagej2c.cpp                       |  48 ++++-
 indra/llimage/llimagej2c.h                         |   4 +
 indra/llinventory/llpermissions.cpp                |  11 +
 indra/llinventory/llpermissions.h                  |   4 +
 indra/llmath/llquaternion.cpp                      |   6 +-
 indra/llmath/llquaternion.h                        |  34 +++-
 indra/llmessage/CMakeLists.txt                     |   2 +
 indra/llmessage/llcachename.cpp                    | 226 ++++++++++++++-------
 indra/llmessage/llcachename.h                      |   6 +-
 indra/llmessage/llhttpclientadapter.cpp            |   2 +-
 indra/llmessage/llhttpclientadapter.h              |   2 +-
 indra/llmessage/llhttpclientinterface.h            |   2 +-
 indra/llmessage/llmessagesenderinterface.h         |   2 +-
 indra/llmessage/llregionpresenceverifier.cpp       |  86 ++++++--
 indra/llmessage/llregionpresenceverifier.h         |  39 ++--
 indra/llmessage/llstoredmessage.cpp                |   2 +-
 indra/llmessage/llstoredmessage.h                  |   2 +-
 indra/llmessage/llthrottle.cpp                     |  25 +++
 indra/llmessage/llthrottle.h                       |   2 +
 indra/llmessage/llurlrequest.cpp                   |  54 +++--
 indra/llmessage/llurlrequest.h                     |   8 +
 .../tests/llregionpresenceverifier_test.cpp        | 111 ++++++++++
 indra/llprimitive/llprimtexturelist.cpp            |  14 +-
 indra/llvfs/llpidlock.cpp                          |   2 +-
 indra/lscript/lscript_byteformat.h                 |   2 +-
 indra/lscript/lscript_compile/lscript_tree.cpp     |  29 ++-
 indra/lscript/lscript_compile/lscript_tree.h       |   1 +
 indra/lscript/lscript_execute.h                    |   3 +-
 indra/lscript/lscript_execute/lscript_execute.cpp  | 122 ++++-------
 indra/newview/llfloaterregioninfo.cpp              |   2 +-
 indra/newview/llimview.cpp                         |   3 +-
 indra/newview/llmutelist.cpp                       |   2 +-
 indra/newview/llviewermessage.cpp                  |  10 +-
 indra/newview/llvoiceclient.cpp                    |   3 +-
 42 files changed, 739 insertions(+), 284 deletions(-)
 create mode 100644 indra/llmessage/tests/llregionpresenceverifier_test.cpp

(limited to 'indra')

diff --git a/indra/develop.py b/indra/develop.py
index 1d7ac42c9c..b40e81bb07 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -451,9 +451,7 @@ class DarwinSetup(UnixSetup):
             targets = ' '.join(['-target ' + repr(t) for t in targets])
         else:
             targets = ''
-        # cmd = ('xcodebuild -parallelizeTargets ' # parallelizeTargets is suspected of non-deterministic build failures. + poppy 2009-06-05
-        cmd = ('xcodebuild '
-               '-configuration %s %s %s' %
+        cmd = ('xcodebuild -configuration %s %s %s' %
                (self.build_type, ' '.join(opts), targets))
         for d in self.build_dirs():
             try:
diff --git a/indra/lib/python/indra/base/llsd.py b/indra/lib/python/indra/base/llsd.py
index 1190d88663..4527b115f9 100644
--- a/indra/lib/python/indra/base/llsd.py
+++ b/indra/lib/python/indra/base/llsd.py
@@ -238,7 +238,7 @@ class LLSDXMLFormatter(object):
     def MAP(self, v):
         return self.elt(
             'map',
-            ''.join(["%s%s" % (self.elt('key', key), self.generate(value))
+            ''.join(["%s%s" % (self.elt('key', self.xml_esc(str(key))), self.generate(value))
              for key, value in v.items()]))
 
     typeof = type
diff --git a/indra/lib/python/indra/util/llsubprocess.py b/indra/lib/python/indra/util/llsubprocess.py
index c4c40739ec..7e0e115d14 100644
--- a/indra/lib/python/indra/util/llsubprocess.py
+++ b/indra/lib/python/indra/util/llsubprocess.py
@@ -90,6 +90,17 @@ all the output, and get the result.
                     child.tochild.close()
         result = child.poll()
         if result != -1:
+            # At this point, the child process has exited and result
+            # is the return value from the process. Between the time
+            # we called select() and poll() the process may have
+            # exited so read all the data left on the child process
+            # stdout and stderr.
+            last = child.fromchild.read()
+            if last:
+                out.append(last)
+            last = child.childerr.read()
+            if last:
+                err.append(last)
             child.tochild.close()
             child.fromchild.close()
             child.childerr.close()
diff --git a/indra/lib/python/indra/util/named_query.py b/indra/lib/python/indra/util/named_query.py
index 693b483f79..5c19368240 100644
--- a/indra/lib/python/indra/util/named_query.py
+++ b/indra/lib/python/indra/util/named_query.py
@@ -48,8 +48,8 @@ from indra.base import llsd
 from indra.base import config
 
 DEBUG = False
-NQ_FILE_SUFFIX = None
-NQ_FILE_SUFFIX_LEN = None
+NQ_FILE_SUFFIX = config.get('named-query-file-suffix', '.nq')
+NQ_FILE_SUFFIX_LEN  = len(NQ_FILE_SUFFIX)
 
 _g_named_manager = None
 
diff --git a/indra/llcharacter/llkeyframestandmotion.cpp b/indra/llcharacter/llkeyframestandmotion.cpp
index 1d42298f4d..1ae0ddeea0 100644
--- a/indra/llcharacter/llkeyframestandmotion.cpp
+++ b/indra/llcharacter/llkeyframestandmotion.cpp
@@ -190,7 +190,7 @@ BOOL LLKeyframeStandMotion::onUpdate(F32 time, U8* joint_mask)
 	if (dot(mPelvisState->getJoint()->getWorldRotation(), mLastGoodPelvisRotation) < ROTATION_THRESHOLD)
 	{
 		mLastGoodPelvisRotation = mPelvisState->getJoint()->getWorldRotation();
-		mLastGoodPelvisRotation.normQuat();
+		mLastGoodPelvisRotation.normalize();
 		mTrackAnkles = TRUE;
 	}
 	else if ((mCharacter->getCharacterPosition() - mLastGoodPosition).magVecSquared() > POSITION_THRESHOLD)
diff --git a/indra/llcommon/llkeythrottle.h b/indra/llcommon/llkeythrottle.h
index 873f50a65e..7544ab1d11 100644
--- a/indra/llcommon/llkeythrottle.h
+++ b/indra/llcommon/llkeythrottle.h
@@ -118,6 +118,63 @@ public:
 		THROTTLE_BLOCKED,		// rate exceed, block key
 	};
 
+	F64 getActionCount(const T& id)
+	{
+		U64 now = 0;
+		if ( mIsRealtime )
+		{
+			now = LLKeyThrottleImpl<T>::getTime();
+		}
+		else
+		{
+			now = LLKeyThrottleImpl<T>::getFrame();
+		}
+
+		if (now >= (m.startTime + m.intervalLength))
+		{
+			if (now < (m.startTime + 2 * m.intervalLength))
+			{
+				// prune old data
+				delete m.prevMap;
+				m.prevMap = m.currMap;
+				m.currMap = new typename LLKeyThrottleImpl<T>::EntryMap;
+
+				m.startTime += m.intervalLength;
+			}
+			else
+			{
+				// lots of time has passed, all data is stale
+				delete m.prevMap;
+				delete m.currMap;
+				m.prevMap = new typename LLKeyThrottleImpl<T>::EntryMap;
+				m.currMap = new typename LLKeyThrottleImpl<T>::EntryMap;
+
+				m.startTime = now;
+			}
+		}
+
+		U32 prevCount = 0;
+
+		typename LLKeyThrottleImpl<T>::EntryMap::const_iterator prev = m.prevMap->find(id);
+		if (prev != m.prevMap->end())
+		{
+			prevCount = prev->second.count;
+		}
+
+		typename LLKeyThrottleImpl<T>::Entry& curr = (*m.currMap)[id];
+
+		// curr.count is the number of keys in
+		// this current 'time slice' from the beginning of it until now
+		// prevCount is the number of keys in the previous
+		// time slice scaled to be one full time slice back from the current 
+		// (now) time.
+
+		// compute current, windowed rate
+		F64 timeInCurrent = ((F64)(now - m.startTime) / m.intervalLength);
+		F64 averageCount = curr.count + prevCount * (1.0 - timeInCurrent);
+		return averageCount;
+	}
+
 	// call each time the key wants use
 	State noteAction(const T& id, S32 weight = 1)
 	{
diff --git a/indra/llcommon/llstat.cpp b/indra/llcommon/llstat.cpp
index 291b019616..e650f911b7 100644
--- a/indra/llcommon/llstat.cpp
+++ b/indra/llcommon/llstat.cpp
@@ -43,7 +43,7 @@
 
 
 // statics
-BOOL            LLPerfBlock::sStatsEnabled = FALSE;    // Flag for detailed information
+S32	            LLPerfBlock::sStatsFlags = LLPerfBlock::LLSTATS_NO_OPTIONAL_STATS;       // Control what is being recorded
 LLPerfBlock::stat_map_t    LLPerfBlock::sStatMap;    // Map full path string to LLStatTime objects, tracks all active objects
 std::string        LLPerfBlock::sCurrentStatPath = "";    // Something like "/total_time/physics/physics step"
 
@@ -129,6 +129,7 @@ bool LLStatsConfigFile::loadFile()
 
     F32 duration = 0.f;
     F32 interval = 0.f;
+	S32 flags = LLPerfBlock::LLSTATS_BASIC_STATS;
 
     const char * w = "duration";
     if (stats_config.has(w))
@@ -140,8 +141,18 @@ bool LLStatsConfigFile::loadFile()
     {
         interval = (F32)stats_config[w].asReal();
     } 
+    w = "flags";
+    if (stats_config.has(w))
+    {
+		flags = (S32)stats_config[w].asInteger();
+		if (flags == LLPerfBlock::LLSTATS_NO_OPTIONAL_STATS &&
+			duration > 0)
+		{   // No flags passed in, but have a duration, so reset to basic stats
+			flags = LLPerfBlock::LLSTATS_BASIC_STATS;
+		}
+    } 
 
-    mStatsp->setReportPerformanceDuration( duration );
+    mStatsp->setReportPerformanceDuration( duration, flags );
     mStatsp->setReportPerformanceInterval( interval );
 
     if ( duration > 0 )
@@ -253,13 +264,14 @@ void LLPerfStats::dumpIntervalPerformanceStats()
     }
 }
 
-// Set length of performance stat recording
-void    LLPerfStats::setReportPerformanceDuration( F32 seconds )
+// Set length of performance stat recording.  
+// If turning stats on, caller must provide flags
+void    LLPerfStats::setReportPerformanceDuration( F32 seconds, S32 flags /* = LLSTATS_NO_OPTIONAL_STATS */ )
 { 
 	if ( seconds <= 0.f )
 	{
 		mReportPerformanceStatEnd = 0.0;
-		LLPerfBlock::setStatsEnabled( FALSE );
+		LLPerfBlock::setStatsFlags(LLPerfBlock::LLSTATS_NO_OPTIONAL_STATS);		// Make sure all recording is off
 		mFrameStatsFile.close();
 		LLPerfBlock::clearDynamicStats();
 	}
@@ -268,8 +280,8 @@ void    LLPerfStats::setReportPerformanceDuration( F32 seconds )
 		mReportPerformanceStatEnd = LLFrameTimer::getElapsedSeconds() + ((F64) seconds);
 		// Clear failure flag to try and create the log file once
 		mFrameStatsFileFailure = FALSE;
-		LLPerfBlock::setStatsEnabled( TRUE );
 		mSkipFirstFrameStats = TRUE;		// Skip the first report (at the end of this frame)
+		LLPerfBlock::setStatsFlags(flags);
 	}
 }
 
@@ -611,11 +623,26 @@ LLPerfBlock::LLPerfBlock(LLStatTime* stat ) : mPredefinedStat(stat), mDynamicSta
     }
 }
 
-// Use this constructor for dynamically created LLStatTime objects (not pre-defined) with a multi-part key.
-// These are also turned on or off via the switch passed in
-LLPerfBlock::LLPerfBlock( const char* key1, const char* key2 ) : mPredefinedStat(NULL), mDynamicStat(NULL)
+// Use this constructor for normal, optional LLPerfBlock time slices
+LLPerfBlock::LLPerfBlock( const char* key ) : mPredefinedStat(NULL), mDynamicStat(NULL)
 {
-    if (!sStatsEnabled) return;
+    if ((sStatsFlags & LLSTATS_BASIC_STATS) == 0)
+	{	// These are off unless the base set is enabled
+		return;
+	}
+
+	initDynamicStat(key);
+}
+
+	
+// Use this constructor for dynamically created LLPerfBlock time slices
+// that are only enabled by specific control flags
+LLPerfBlock::LLPerfBlock( const char* key1, const char* key2, S32 flags ) : mPredefinedStat(NULL), mDynamicStat(NULL)
+{
+    if ((sStatsFlags & flags) == 0)
+	{
+		return;
+	}
 
     if (NULL == key2 || strlen(key2) == 0)
     {
@@ -629,10 +656,12 @@ LLPerfBlock::LLPerfBlock( const char* key1, const char* key2 ) : mPredefinedStat
     }
 }
 
+// Set up the result data map if dynamic stats are enabled
 void LLPerfBlock::initDynamicStat(const std::string& key)
 {
     // Early exit if dynamic stats aren't enabled.
-    if (!sStatsEnabled) return;
+    if (sStatsFlags == LLSTATS_NO_OPTIONAL_STATS) 
+		return;
 
     mLastPath = sCurrentStatPath;		// Save and restore current path
     sCurrentStatPath += "/" + key;		// Add key to current path
diff --git a/indra/llcommon/llstat.h b/indra/llcommon/llstat.h
index 61aaac45bf..e2e904bb06 100644
--- a/indra/llcommon/llstat.h
+++ b/indra/llcommon/llstat.h
@@ -192,14 +192,23 @@ public:
 	// Use this constructor for pre-defined LLStatTime objects
 	LLPerfBlock(LLStatTime* stat);
 
-	// Use this constructor for dynamically created LLStatTime objects (not pre-defined) with a multi-part key
-	LLPerfBlock( const char* key1, const char* key2 = NULL);
+	// Use this constructor for normal, optional LLPerfBlock time slices
+	LLPerfBlock( const char* key );
 
+	// Use this constructor for dynamically created LLPerfBlock time slices
+	// that are only enabled by specific control flags
+	LLPerfBlock( const char* key1, const char* key2, S32 flags = LLSTATS_BASIC_STATS );
 
 	~LLPerfBlock();
 
-	static void setStatsEnabled( BOOL enable )		{ sStatsEnabled = enable;	};
-	static S32  getStatsEnabled()					{ return sStatsEnabled;		};
+	enum
+	{	// Stats bitfield flags
+		LLSTATS_NO_OPTIONAL_STATS	= 0x00,		// No optional stats gathering, just pre-defined LLStatTime objects
+		LLSTATS_BASIC_STATS			= 0x01,		// Gather basic optional runtime stats
+		LLSTATS_SCRIPT_FUNCTIONS	= 0x02,		// Include LSL function calls
+	};
+	static void setStatsFlags( S32 flags )	{ sStatsFlags = flags;	};
+	static S32  getStatsFlags()				{ return sStatsFlags;	};
 
 	static void clearDynamicStats();		// Reset maps to clear out dynamic objects
 	static void addStatsToLLSDandReset( LLSD & stats,		// Get current information and clear time bin
@@ -213,7 +222,7 @@ private:
 	LLStatTime * 			mPredefinedStat;		// LLStatTime object to get data
 	StatEntry *				mDynamicStat;   		// StatEntryobject to get data
 
-	static BOOL				sStatsEnabled;			// Normally FALSE
+	static S32				sStatsFlags;			// Control what is being recorded
     static stat_map_t		sStatMap;				// Map full path string to LLStatTime objects
 	static std::string		sCurrentStatPath;		// Something like "frame/physics/physics step"
 };
@@ -236,7 +245,7 @@ public:
     BOOL    frameStatsIsRunning()                                { return (mReportPerformanceStatEnd > 0.);        };
     F32     getReportPerformanceInterval() const                { return mReportPerformanceStatInterval;        };
     void    setReportPerformanceInterval( F32 interval )        { mReportPerformanceStatInterval = interval;    };
-    void    setReportPerformanceDuration( F32 seconds );
+    void    setReportPerformanceDuration( F32 seconds, S32 flags = LLPerfBlock::LLSTATS_NO_OPTIONAL_STATS );
     void    setProcessName(const std::string& process_name) { mProcessName = process_name; }
     void    setProcessPID(S32 process_pid) { mProcessPID = process_pid; }
 
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp
index 1b93c21982..900652d06d 100644
--- a/indra/llimage/llimagej2c.cpp
+++ b/indra/llimage/llimagej2c.cpp
@@ -178,8 +178,8 @@ LLImageJ2C::LLImageJ2C() : 	LLImageFormatted(IMG_CODEC_J2C),
 							mMaxBytes(0),
 							mRawDiscardLevel(-1),
 							mRate(0.0f),
-							mReversible(FALSE)
-	
+							mReversible(FALSE),
+							mAreaUsedForDataSizeCalcs(0)
 {
 	//We assume here that if we wanted to create via
 	//a dynamic library that the approriate open calls were made
@@ -195,6 +195,12 @@ LLImageJ2C::LLImageJ2C() : 	LLImageFormatted(IMG_CODEC_J2C),
 	}
 
 	mImpl = j2cimpl_create_func();
+
+	// Clear data size table
+	for( S32 i = 0; i <= MAX_DISCARD_LEVEL; i++)
+	{	// Array size is MAX_DISCARD_LEVEL+1
+		mDataSizes[i] = 0;
+	}
 }
 
 // virtual
@@ -367,9 +373,45 @@ S32 LLImageJ2C::calcHeaderSize()
 	return calcHeaderSizeJ2C();
 }
 
+
+// calcDataSize() returns how many bytes to read 
+// to load discard_level (including header and higher discard levels)
 S32 LLImageJ2C::calcDataSize(S32 discard_level)
 {
-	return calcDataSizeJ2C(getWidth(), getHeight(), getComponents(), discard_level, mRate);
+	discard_level = llclamp(discard_level, 0, MAX_DISCARD_LEVEL);
+
+	if ( mAreaUsedForDataSizeCalcs != (getHeight() * getWidth()) 
+		|| mDataSizes[0] == 0)
+	{
+		mAreaUsedForDataSizeCalcs = getHeight() * getWidth();
+		
+		S32 level = MAX_DISCARD_LEVEL;	// Start at the highest discard
+		while ( level >= 0 )
+		{
+			mDataSizes[level] = calcDataSizeJ2C(getWidth(), getHeight(), getComponents(), level, mRate);
+			level--;
+		}
+
+		/* This is technically a more correct way to calculate the size required
+		   for each discard level, since they should include the size needed for
+		   lower levels.   Unfortunately, this doesn't work well and will lead to 
+		   download stalls.  The true correct way is to parse the header.  This will
+		   all go away with http textures at some point.
+
+		// Calculate the size for each discard level.   Lower levels (higher quality)
+		// contain the cumulative size of higher levels		
+		S32 total_size = calcHeaderSizeJ2C();
+
+		S32 level = MAX_DISCARD_LEVEL;	// Start at the highest discard
+		while ( level >= 0 )
+		{	// Add in this discard level and all before it
+			total_size += calcDataSizeJ2C(getWidth(), getHeight(), getComponents(), level, mRate);
+			mDataSizes[level] = total_size;
+			level--;
+		}
+		*/
+	}
+	return mDataSizes[discard_level];
 }
 
 S32 LLImageJ2C::calcDiscardLevelBytes(S32 bytes)
diff --git a/indra/llimage/llimagej2c.h b/indra/llimage/llimagej2c.h
index 23f6ef5fd1..55df7f4429 100644
--- a/indra/llimage/llimagej2c.h
+++ b/indra/llimage/llimagej2c.h
@@ -87,6 +87,10 @@ protected:
 	void updateRawDiscardLevel();
 
 	S32 mMaxBytes; // Maximum number of bytes of data to use...
+	
+	S32 mDataSizes[MAX_DISCARD_LEVEL+1];		// Size of data required to reach a given level
+	U32 mAreaUsedForDataSizeCalcs;				// Height * width used to calculate mDataSizes
+
 	S8  mRawDiscardLevel;
 	F32 mRate;
 	BOOL mReversible;
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
index 328ed4588b..2a27f3fc8d 100644
--- a/indra/llinventory/llpermissions.cpp
+++ b/indra/llinventory/llpermissions.cpp
@@ -277,6 +277,17 @@ BOOL LLPermissions::setOwnerAndGroup(
 	return allowed;
 }
 
+//Fix for DEV-33917, last owner isn't used much and has little impact on
+//permissions so it's reasonably safe to do this, however, for now, 
+//limiting the functionality of this routine to objects which are 
+//group owned.
+void LLPermissions::setLastOwner(const LLUUID& last_owner)
+{
+	if (isGroupOwned())
+		mLastOwner = last_owner;
+}
+
+ 
 // only call this if you know what you're doing
 // there are usually perm-bit consequences when the 
 // ownerhsip changes
diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h
index 5587f8c3c8..9280629e0c 100644
--- a/indra/llinventory/llpermissions.h
+++ b/indra/llinventory/llpermissions.h
@@ -229,6 +229,10 @@ public:
 	// ownerhsip changes
 	void yesReallySetOwner(const LLUUID& owner, bool group_owned);
 
+	// Last owner doesn't have much in the way of permissions so it's 
+	//not too dangerous to do this. 
+	void setLastOwner(const LLUUID& last_owner);
+
 	// saves last owner, sets owner to uuid null, sets group
 	// owned. group_id must be the group of the object (that's who it
 	// is being deeded to) and the object must be group
diff --git a/indra/llmath/llquaternion.cpp b/indra/llmath/llquaternion.cpp
index cfd6183ec4..fdcc19d657 100644
--- a/indra/llmath/llquaternion.cpp
+++ b/indra/llmath/llquaternion.cpp
@@ -121,7 +121,7 @@ void	LLQuaternion::quantize16(F32 lower, F32 upper)
 	mQ[VZ] = z;
 	mQ[VS] = s;
 
-	normQuat();
+	normalize();
 }
 
 void	LLQuaternion::quantize8(F32 lower, F32 upper)
@@ -131,7 +131,7 @@ void	LLQuaternion::quantize8(F32 lower, F32 upper)
 	mQ[VZ] = U8_to_F32(F32_to_U8_ROUND(mQ[VZ], lower, upper), lower, upper);
 	mQ[VS] = U8_to_F32(F32_to_U8_ROUND(mQ[VS], lower, upper), lower, upper);
 
-	normQuat();
+	normalize();
 }
 
 // LLVector3 Magnitude and Normalization Functions
@@ -346,7 +346,7 @@ const LLQuaternion&	LLQuaternion::setQuat(const LLMatrix4 &mat)
 //    mQ[VZ] = (F32)(cosX*cosY*sinZ - sinX*sinY*cosZ);
 //#endif
 //
-//	normQuat();
+//	normalize();
 //	return (*this);
 }
 
diff --git a/indra/llmath/llquaternion.h b/indra/llmath/llquaternion.h
index 5db9c5be2e..0769f29f23 100644
--- a/indra/llmath/llquaternion.h
+++ b/indra/llmath/llquaternion.h
@@ -469,20 +469,30 @@ inline const LLQuaternion&	operator*=(LLQuaternion &a, const LLQuaternion &b)
 	return a;
 }
 
+const F32 ONE_PART_IN_A_MILLION = 0.000001f;
+
 inline F32	LLQuaternion::normalize()
 {
 	F32 mag = sqrtf(mQ[VX]*mQ[VX] + mQ[VY]*mQ[VY] + mQ[VZ]*mQ[VZ] + mQ[VS]*mQ[VS]);
 
 	if (mag > FP_MAG_THRESHOLD)
 	{
-		F32 oomag = 1.f/mag;
-		mQ[VX] *= oomag;
-		mQ[VY] *= oomag;
-		mQ[VZ] *= oomag;
-		mQ[VS] *= oomag;
+		// Floating point error can prevent some quaternions from achieving
+		// exact unity length.  When trying to renormalize such quaternions we
+		// can oscillate between multiple quantized states.  To prevent such
+		// drifts we only renomalize if the length is far enough from unity.
+		if (fabs(1.f - mag) > ONE_PART_IN_A_MILLION)
+		{
+			F32 oomag = 1.f/mag;
+			mQ[VX] *= oomag;
+			mQ[VY] *= oomag;
+			mQ[VZ] *= oomag;
+			mQ[VS] *= oomag;
+		}
 	}
 	else
 	{
+		// we were given a very bad quaternion so we set it to identity
 		mQ[VX] = 0.f;
 		mQ[VY] = 0.f;
 		mQ[VZ] = 0.f;
@@ -499,11 +509,15 @@ inline F32	LLQuaternion::normQuat()
 
 	if (mag > FP_MAG_THRESHOLD)
 	{
-		F32 oomag = 1.f/mag;
-		mQ[VX] *= oomag;
-		mQ[VY] *= oomag;
-		mQ[VZ] *= oomag;
-		mQ[VS] *= oomag;
+		if (fabs(1.f - mag) > ONE_PART_IN_A_MILLION)
+		{
+			// only renormalize if length not close enough to 1.0 already
+			F32 oomag = 1.f/mag;
+			mQ[VX] *= oomag;
+			mQ[VY] *= oomag;
+			mQ[VZ] *= oomag;
+			mQ[VS] *= oomag;
+		}
 	}
 	else
 	{
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 88f83ba78e..81e518cf6e 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -221,6 +221,7 @@ IF (NOT LINUX AND VIEWER)
       # llhttpclientadapter.cpp
       lltrustedmessageservice.cpp
       lltemplatemessagedispatcher.cpp
+      llregionpresenceverifier.cpp
       )
     LL_ADD_PROJECT_UNIT_TESTS(llmessage "${llmessage_TEST_SOURCE_FILES}")
     
@@ -228,3 +229,4 @@ IF (NOT LINUX AND VIEWER)
     # Don't make llmessage depend on llsdmessage_test because ADD_COMM_BUILD_TEST depends on llmessage!
     # ADD_COMM_BUILD_TEST(llsdmessage "" "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llsdmessage_peer.py")
 ENDIF (NOT LINUX AND VIEWER)
+
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index 799bc83e20..82186fc503 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -76,11 +76,13 @@ public:
 	LLCacheNameEntry();
 
 public:
-	bool mIsGroup;
-	U32 mCreateTime;	// unix time_t
-	std::string mFirstName;
-	std::string mLastName;
-	std::string mGroupName;
+	bool isUnknown()			{ return (mFirstName.empty()
+										  || mFirstName == std::string("(???)"));	};
+
+	bool mIsGroup;				// true if this is a group ID/name
+	U32 mCreateTime;			// unix time_t
+	std::string mFirstName;		// Doubles as the group name
+	std::string mLastName;		// Will be "" for groups
 };
 
 LLCacheNameEntry::LLCacheNameEntry()
@@ -162,7 +164,7 @@ void ReplySender::send(const LLUUID& id,
 	mMsg->addUUIDFast(_PREHASH_ID, id);
 	if(mCurrIsGroup)
 	{
-		mMsg->addStringFast(_PREHASH_GroupName, entry.mGroupName);
+		mMsg->addStringFast(_PREHASH_GroupName, entry.mFirstName);
 	}
 	else
 	{
@@ -222,6 +224,7 @@ public:
 	void processPendingReplies();
 	void sendRequest(const char* msg_name, const AskQueue& queue);
 	bool isRequestPending(const LLUUID& id);
+	void makeNameRequestForID(const LLUUID& id, bool isGroup, LLHost & fromHost);
 
 	// Message system callbacks.
 	void processUUIDRequest(LLMessageSystem* msg, bool isGroup);
@@ -389,6 +392,7 @@ void LLCacheName::importFile(LLFILE* fp)
 		entry->mCreateTime = create_time;
 		entry->mFirstName = firstname;
 		entry->mLastName = lastname;
+		//llinfos << "Adding entry from file for " << entry->mFirstName << " " << entry->mLastName << ", id " << id << llendl;
 		impl.mCache[id] = entry;
 
 		count++;
@@ -425,6 +429,7 @@ bool LLCacheName::importFile(std::istream& istr)
 		entry->mCreateTime = ctime;
 		entry->mFirstName = agent[FIRST].asString();
 		entry->mLastName = agent[LAST].asString();
+		//llinfos << "Adding name entry from XML file for " << entry->mFirstName << " " << entry->mLastName << ", id " << id << llendl;
 		impl.mCache[id] = entry;
 
 		++count;
@@ -445,7 +450,9 @@ bool LLCacheName::importFile(std::istream& istr)
 		LLCacheNameEntry* entry = new LLCacheNameEntry();
 		entry->mIsGroup = true;
 		entry->mCreateTime = ctime;
-		entry->mGroupName = group[NAME].asString();
+		entry->mFirstName = group[NAME].asString();
+		entry->mLastName = "";
+		//llinfos << "Adding group entry from XML file for " << entry->mFirstName << " " << entry->mLastName << ", id " << id << llendl;
 		impl.mCache[id] = entry;
 		++count;
 	}
@@ -463,32 +470,32 @@ void LLCacheName::exportFile(std::ostream& ostr)
 		// Only write entries for which we have valid data.
 		LLCacheNameEntry* entry = iter->second;
 		if(!entry
-		   || (std::string::npos != entry->mFirstName.find('?'))
-		   || (std::string::npos != entry->mGroupName.find('?')))
-		{
+		   || entry->isUnknown())
+		{	// No entry, or user or group name is unknown
 			continue;
 		}
 
 		// store it
 		LLUUID id = iter->first;
 		std::string id_str = id.asString();
-		if(!entry->mFirstName.empty() && !entry->mLastName.empty())
-		{
+		if(entry->mIsGroup)
+		{	// Save group name and ID
+			data[GROUPS][id_str][NAME] = entry->mFirstName;
+			data[GROUPS][id_str][CTIME] = (S32)entry->mCreateTime;
+		}
+		else if(!entry->mLastName.empty())
+		{	// Save user names and ID
 			data[AGENTS][id_str][FIRST] = entry->mFirstName;
 			data[AGENTS][id_str][LAST] = entry->mLastName;
 			data[AGENTS][id_str][CTIME] = (S32)entry->mCreateTime;
 		}
-		else if(entry->mIsGroup && !entry->mGroupName.empty())
-		{
-			data[GROUPS][id_str][NAME] = entry->mGroupName;
-			data[GROUPS][id_str][CTIME] = (S32)entry->mCreateTime;
-		}
 	}
 
 	LLSDSerialize::toPrettyXML(data, ostr);
 }
 
 
+// DO NOT CALL THIS FOR GROUP NAMES
 BOOL LLCacheName::getName(const LLUUID& id, std::string& first, std::string& last)
 {
 	if(id.isNull())
@@ -511,11 +518,11 @@ BOOL LLCacheName::getName(const LLUUID& id, std::string& first, std::string& las
 		last.clear();
 		if (!impl.isRequestPending(id))
 		{
+			//llinfos << "**** adding name req for " << id << llendl;
 			impl.mAskNameQueue.insert(id);
 		}	
-		return FALSE;
 	}
-
+	return FALSE;
 }
 
 BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
@@ -535,7 +542,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 	}
 
 	LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache,id);
-	if (entry && entry->mGroupName.empty())
+	if (entry && entry->mFirstName.empty())
 	{
 		// COUNTER-HACK to combat James' HACK in exportFile()...
 		// this group name was loaded from a name cache that did not
@@ -546,7 +553,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 
 	if (entry)
 	{
-		group = entry->mGroupName;
+		group = entry->mFirstName;
 		return TRUE;
 	}
 	else 
@@ -562,7 +569,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 
 // TODO: Make the cache name callback take a SINGLE std::string,
 // not a separate first and last name.
-void LLCacheName::get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callback, void* user_data)
+void LLCacheName::getNameFromUUID(const LLUUID& id, BOOL is_group, LLCacheNameCallback callback, void* user_data)
 {
 	if(id.isNull())
 	{
@@ -573,15 +580,8 @@ void LLCacheName::get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callb
 	LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache, id );
 	if (entry)
 	{
-		// id found in map therefore we can call the callback immediately.
-		if (entry->mIsGroup)
-		{
-			callback(id, entry->mGroupName, "", entry->mIsGroup, user_data);
-		}
-		else
-		{
-			callback(id, entry->mFirstName, entry->mLastName, entry->mIsGroup, user_data);
-		}
+		// id found in map therefore we can call the callback immediately.  mLastName will be empty for groups
+		callback(id, entry->mFirstName, entry->mLastName, entry->mIsGroup, user_data);
 	}
 	else
 	{
@@ -590,13 +590,17 @@ void LLCacheName::get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callb
 		{
 			if (is_group)
 			{
+				//llinfos << "Group queued for " << id << llendl;
 				impl.mAskGroupQueue.insert(id);
 			}
 			else
 			{
+				//llinfos << "Name queued for " << id << llendl;
 				impl.mAskNameQueue.insert(id);
 			}
 		}
+
+		// There may be multiple replies for the same ID request
 		impl.mReplyQueue.push_back(PendingReply(id, callback, user_data));
 	}
 }
@@ -661,7 +665,7 @@ void LLCacheName::dump()
 		{
 			llinfos
 				<< iter->first << " = (group) "
-				<< entry->mGroupName
+				<< entry->mFirstName
 				<< " @ " << entry->mCreateTime
 				<< llendl;
 		}
@@ -715,17 +719,7 @@ void LLCacheName::Impl::processPendingReplies()
 
 		if (it->mCallback)
 		{
-			if (!entry->mIsGroup)
-			{
-				(it->mCallback)(it->mID,
-					entry->mFirstName, entry->mLastName,
-					FALSE, it->mData);
-			}
-			else {
-				(it->mCallback)(it->mID,
-					entry->mGroupName, "",
-					TRUE, it->mData);
-			}
+			(it->mCallback)(it->mID, entry->mFirstName, entry->mLastName, entry->mIsGroup, it->mData);
 		}
 	}
 
@@ -768,10 +762,12 @@ void LLCacheName::Impl::sendRequest(
 		if(start_new_message)
 		{
 			start_new_message = false;
+			//llinfos << "newMessageFast : " << msg_name << llendl;
 			mMsg->newMessageFast(msg_name);
 		}
 		mMsg->nextBlockFast(_PREHASH_UUIDNameBlock);
 		mMsg->addUUIDFast(_PREHASH_ID, (*it));
+		//llinfos << " asking for ID: " << (*it) << llendl;
 
 		if(mMsg->isSendFullFast(_PREHASH_UUIDNameBlock))
 		{
@@ -837,38 +833,102 @@ void LLCacheName::Impl::processUUIDRequest(LLMessageSystem* msg, bool isGroup)
 		{
 			if (isGroup != entry->mIsGroup)
 			{
-				llwarns << "LLCacheName - Asked for "
-						<< (isGroup ? "group" : "user") << " name, "
-						<< "but found "
-						<< (entry->mIsGroup ? "group" : "user")
-						<< ": " << id << llendl;
+				if (entry->isUnknown())
+				{
+					Cache::iterator doomediter = mCache.find(id);
+					if (doomediter != mCache.end())
+					{	// Kill existing unknown entry
+						llwarns << "LLCacheName - Asked for "
+								<< (isGroup ? "group" : "user") << " name, "
+								<< "but found unknown "
+								<< (entry->mIsGroup ? "group" : "user")
+								<< " entry for: " << id 
+								<< ", deleting bad entry"
+								<< llendl;
+
+						delete entry;
+						entry = NULL;
+						mCache.erase(doomediter);
+
+						// Request it with (hopefully) the correct type
+						makeNameRequestForID(id,isGroup,fromHost);
+					}
+				}
+				else if (isGroup)
+				{
+					llwarns << "LLCacheName - Asked for group name, but found user: "
+							<< id 
+							<< " named " 
+							<< entry->mFirstName << " " << entry->mLastName 
+							<< llendl;
+				}
+				else
+				{
+					llwarns << "LLCacheName - Asked for user name, but found group: "
+							<< id 
+							<< " named " 
+							<< entry->mFirstName
+							<< llendl;
+				}
 			}
 			else
 			{
 				// ...it's in the cache, so send it as the reply
 				sender.send(id, *entry, fromHost);
-			}
-		}
-		else
-		{
-			if (!isRequestPending(id))
-			{
+
+				/*
 				if (isGroup)
 				{
-					mAskGroupQueue.insert(id);
+					llinfos << "Group ID " << id 
+						<< " name " << entry->mFirstName
+						<< " was already in cache" << llendl;
 				}
 				else
 				{
-					mAskNameQueue.insert(id);
+					llinfos << "Agent ID " << id 
+						<< " name " << entry->mFirstName << " " << entry->mLastName 
+						<< " was already in cache" << llendl;
 				}
+				*/
 			}
-			
-			mReplyQueue.push_back(PendingReply(id, fromHost));
+		}
+		else
+		{	/*
+			if (isGroup)
+			{
+				llinfos << "Group ID " << id << " is not in cache" << llendl;
+			}
+			else
+			{
+				llinfos << "Agent ID " << id << " is not in cache" << llendl;
+			}
+			*/
+			makeNameRequestForID(id,isGroup,fromHost);
 		}
 	}
 }
 
 
+void LLCacheName::Impl::makeNameRequestForID(const LLUUID& id, bool isGroup, LLHost & fromHost)
+{
+	if (!isRequestPending(id))
+	{
+		if (isGroup)
+		{
+			//llinfos << "Adding group request for " << id << llendl;
+			mAskGroupQueue.insert(id);
+		}
+		else
+		{
+			//llinfos << "Adding name request for " << id << llendl;
+			mAskNameQueue.insert(id);
+		}
+	}
+	
+	// There may be multiple replys for the same ID request
+	mReplyQueue.push_back(PendingReply(id, fromHost));
+}
+
 
 void LLCacheName::Impl::processUUIDReply(LLMessageSystem* msg, bool isGroup)
 {
@@ -878,35 +938,53 @@ void LLCacheName::Impl::processUUIDReply(LLMessageSystem* msg, bool isGroup)
 		LLUUID id;
 		msg->getUUIDFast(_PREHASH_UUIDNameBlock, _PREHASH_ID, id, i);
 		LLCacheNameEntry* entry = get_ptr_in_map(mCache, id);
+		bool add_new_entry_to_cache = false;
 		if (!entry)
 		{
 			entry = new LLCacheNameEntry;
-			mCache[id] = entry;
+			add_new_entry_to_cache = true;
 		}
 
+		// Remove ID from pending queue
 		mPendingQueue.erase(id);
 
-		entry->mIsGroup = isGroup;
-		entry->mCreateTime = (U32)time(NULL);
-		if (!isGroup)
-		{
-			msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_FirstName, entry->mFirstName, i);
-			msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_LastName,  entry->mLastName, i);
+		std::string first_name;
+		std::string last_name;
+		if (isGroup)
+		{	// Group
+			msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_GroupName, first_name, i);
+			LLStringFn::replace_ascii_controlchars(first_name, LL_UNKNOWN_CHAR);
 		}
 		else
-		{	// is group
-			msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_GroupName, entry->mGroupName, i);
-			LLStringFn::replace_ascii_controlchars(entry->mGroupName, LL_UNKNOWN_CHAR);
+		{	// User
+			msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_FirstName, first_name, i);
+			msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_LastName, last_name, i);
 		}
-
-		if (!isGroup)
-		{
-			notifyObservers(id, entry->mFirstName, entry->mLastName, FALSE);
+	
+		if (!add_new_entry_to_cache &&
+			(entry->mFirstName != first_name ||
+				entry->mLastName != last_name ||
+				entry->mIsGroup != isGroup))
+		{	// Hmmm, we already had an different entry for this ID.  Let's see what happened...
+			llwarns << "Replacing existing entry in name cache for id " << id
+				<< " first name was " << entry->mFirstName << ", now " << first_name
+				<< " last name was " << entry->mLastName << ", now " << last_name
+				<< " group flag was " << (S32) entry->mIsGroup << ", now " << (S32) isGroup
+				<< llendl;
 		}
-		else
+
+		entry->mFirstName = first_name;
+		entry->mLastName = last_name;
+		entry->mIsGroup = isGroup;
+		entry->mCreateTime = (U32)time(NULL);
+
+		if (add_new_entry_to_cache)
 		{
-			notifyObservers(id, entry->mGroupName, "", TRUE);
+			//llinfos << "Adding entry for " << entry->mFirstName << " " << entry->mLastName << ", id " << id << llendl;
+			mCache[id] = entry;
 		}
+
+		notifyObservers(id, entry->mFirstName, entry->mLastName, isGroup);
 	}
 }
 
diff --git a/indra/llmessage/llcachename.h b/indra/llmessage/llcachename.h
index 2757b86a7c..bfa116ad4a 100644
--- a/indra/llmessage/llcachename.h
+++ b/indra/llmessage/llcachename.h
@@ -89,12 +89,8 @@ public:
 	// If the data is currently available, may call the callback immediatly
 	// otherwise, will request the data, and will call the callback when
 	// available.  There is no garuntee the callback will ever be called.
-	void get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callback, void* user_data = NULL);
+	void getNameFromUUID(const LLUUID& id, BOOL is_group, LLCacheNameCallback callback, void* user_data = NULL);
 	
-	// LEGACY
-	void getName(const LLUUID& id, LLCacheNameCallback callback, void* user_data = NULL)
-			{ get(id, FALSE, callback, user_data); }
-
 	// This method needs to be called from time to time to send out
 	// requests.
 	void processPending();
diff --git a/indra/llmessage/llhttpclientadapter.cpp b/indra/llmessage/llhttpclientadapter.cpp
index bbb56960df..5236a52164 100644
--- a/indra/llmessage/llhttpclientadapter.cpp
+++ b/indra/llmessage/llhttpclientadapter.cpp
@@ -1,5 +1,5 @@
 /** 
- * @file 
+ * @file llhttpclientadapter.cpp
  * @brief 
  *
  * $LicenseInfo:firstyear=2009&license=viewergpl$
diff --git a/indra/llmessage/llhttpclientadapter.h b/indra/llmessage/llhttpclientadapter.h
index d5f3aeaf2c..c489dca32d 100644
--- a/indra/llmessage/llhttpclientadapter.h
+++ b/indra/llmessage/llhttpclientadapter.h
@@ -1,5 +1,5 @@
 /** 
- * @file 
+ * @file llhttpclientadepter.h
  * @brief 
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$
diff --git a/indra/llmessage/llhttpclientinterface.h b/indra/llmessage/llhttpclientinterface.h
index 1f13d46447..61826cc4b4 100644
--- a/indra/llmessage/llhttpclientinterface.h
+++ b/indra/llmessage/llhttpclientinterface.h
@@ -1,5 +1,5 @@
 /** 
- * @file 
+ * @file llhttpclientinterface.h
  * @brief 
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$
diff --git a/indra/llmessage/llmessagesenderinterface.h b/indra/llmessage/llmessagesenderinterface.h
index 4082666339..d98d891563 100644
--- a/indra/llmessage/llmessagesenderinterface.h
+++ b/indra/llmessage/llmessagesenderinterface.h
@@ -1,5 +1,5 @@
 /** 
- * @file 
+ * @file llmessagesenderinterface.h
  * @brief 
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$
diff --git a/indra/llmessage/llregionpresenceverifier.cpp b/indra/llmessage/llregionpresenceverifier.cpp
index 552cf4cbdb..08c12f90da 100644
--- a/indra/llmessage/llregionpresenceverifier.cpp
+++ b/indra/llmessage/llregionpresenceverifier.cpp
@@ -1,5 +1,5 @@
 /** 
- * @file 
+ * @file llregionpresenceverifier.cpp
  * @brief 
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$
@@ -25,11 +25,40 @@
 #include "net.h"
 #include "message.h"
 
+namespace boost
+{
+	void intrusive_ptr_add_ref(LLRegionPresenceVerifier::Response* p)
+	{
+		++p->mReferenceCount;
+	}
+	
+	void intrusive_ptr_release(LLRegionPresenceVerifier::Response* p)
+	{
+		if(p && 0 == --p->mReferenceCount)
+		{
+			delete p;
+		}
+	}
+};
 
-LLRegionPresenceVerifier::RegionResponder::RegionResponder(ResponsePtr data) : mSharedData(data)
+LLRegionPresenceVerifier::Response::~Response()
 {
 }
 
+LLRegionPresenceVerifier::RegionResponder::RegionResponder(const std::string&
+														   uri,
+														   ResponsePtr data,
+														   S32 retry_count) :
+	mUri(uri),
+	mSharedData(data),
+	mRetryCount(retry_count)
+{
+}
+
+//virtual
+LLRegionPresenceVerifier::RegionResponder::~RegionResponder()
+{
+}
 
 void LLRegionPresenceVerifier::RegionResponder::result(const LLSD& content)
 {
@@ -42,26 +71,32 @@ void LLRegionPresenceVerifier::RegionResponder::result(const LLSD& content)
 
 	std::stringstream uri;
 	uri << "http://" << destination.getString() << "/state/basic/";
-	mSharedData->getHttpClient().get(uri.str(), new VerifiedDestinationResponder(mSharedData, content));
+	mSharedData->getHttpClient().get(
+		uri.str(),
+		new VerifiedDestinationResponder(mUri, mSharedData, content, mRetryCount));
 }
 
-void LLRegionPresenceVerifier::RegionResponder::completed(
-	U32 status,
-	const std::string& reason,
-	const LLSD& content)
+void LLRegionPresenceVerifier::RegionResponder::error(U32 status,
+													 const std::string& reason)
 {
-	LLHTTPClient::Responder::completed(status, reason, content);
-	
-	mSharedData->onCompletedRegionRequest();
+	// TODO: babbage: distinguish between region presence service and
+	// region verification errors?
+	mSharedData->onRegionVerificationFailed();
 }
 
-
-LLRegionPresenceVerifier::VerifiedDestinationResponder::VerifiedDestinationResponder(ResponsePtr data, const LLSD& content) : mSharedData(data), mContent(content)
+LLRegionPresenceVerifier::VerifiedDestinationResponder::VerifiedDestinationResponder(const std::string& uri, ResponsePtr data, const LLSD& content,
+	S32 retry_count):
+	mUri(uri),
+	mSharedData(data),
+	mContent(content),
+	mRetryCount(retry_count) 
 {
 }
 
-
-
+//virtual
+LLRegionPresenceVerifier::VerifiedDestinationResponder::~VerifiedDestinationResponder()
+{
+}
 
 void LLRegionPresenceVerifier::VerifiedDestinationResponder::result(const LLSD& content)
 {
@@ -76,13 +111,14 @@ void LLRegionPresenceVerifier::VerifiedDestinationResponder::result(const LLSD&
 	{
 		mSharedData->onRegionVerified(mContent);
 	}
-	else if (mSharedData->shouldRetry())
+	else if (mRetryCount > 0)
 	{
 		retry();
 	}
 	else
 	{
-		llwarns << "Could not correctly look up region from region presence service. Region: " << mSharedData->getRegionUri() << llendl;
+		llwarns << "Simulator verification failed. Region: " << mUri << llendl;
+		mSharedData->onRegionVerificationFailed();
 	}
 }
 
@@ -90,13 +126,21 @@ void LLRegionPresenceVerifier::VerifiedDestinationResponder::retry()
 {
 	LLSD headers;
 	headers["Cache-Control"] = "no-cache, max-age=0";
-	llinfos << "Requesting region information, get uncached for region " << mSharedData->getRegionUri() << llendl;
-	mSharedData->decrementRetries();
-	mSharedData->getHttpClient().get(mSharedData->getRegionUri(), new RegionResponder(mSharedData), headers);
+	llinfos << "Requesting region information, get uncached for region "
+			<< mUri << llendl;
+	--mRetryCount;
+	mSharedData->getHttpClient().get(mUri, new RegionResponder(mUri, mSharedData, mRetryCount), headers);
 }
 
 void LLRegionPresenceVerifier::VerifiedDestinationResponder::error(U32 status, const std::string& reason)
 {
-	retry();
+	if(mRetryCount > 0)
+	{
+		retry();
+	}
+	else
+	{
+		llwarns << "Failed to contact simulator for verification. Region: " << mUri << llendl;
+		mSharedData->onRegionVerificationFailed();
+	}
 }
-
diff --git a/indra/llmessage/llregionpresenceverifier.h b/indra/llmessage/llregionpresenceverifier.h
index d1de608ec6..f11eeef50c 100644
--- a/indra/llmessage/llregionpresenceverifier.h
+++ b/indra/llmessage/llregionpresenceverifier.h
@@ -1,5 +1,5 @@
 /** 
- * @file 
+ * @file llregionpresenceverifier.cpp
  * @brief 
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$
@@ -26,7 +26,7 @@
 #include "llhttpclient.h"
 #include <string>
 #include "llsd.h"
-#include <boost/shared_ptr.hpp>
+#include <boost/intrusive_ptr.hpp>
 
 class LLHTTPClientInterface;
 
@@ -36,48 +36,57 @@ public:
 	class Response
 	{
 	public:
-		virtual ~Response() {}
+		virtual ~Response() = 0;
 
 		virtual bool checkValidity(const LLSD& content) const = 0;
 		virtual void onRegionVerified(const LLSD& region_details) = 0;
-
-		virtual void decrementRetries() = 0;
+		virtual void onRegionVerificationFailed() = 0;
 
 		virtual LLHTTPClientInterface& getHttpClient() = 0;
-		virtual std::string getRegionUri() const = 0;
-		virtual bool shouldRetry() const = 0;
 
-		virtual void onCompletedRegionRequest() {}
+	public: /* but not really -- don't touch this */
+		U32 mReferenceCount;		
 	};
 
-	typedef boost::shared_ptr<Response> ResponsePtr;
+	typedef boost::intrusive_ptr<Response> ResponsePtr;
 
 	class RegionResponder : public LLHTTPClient::Responder
 	{
 	public:
-		RegionResponder(ResponsePtr data);
+		RegionResponder(const std::string& uri, ResponsePtr data,
+						S32 retry_count);
+		virtual ~RegionResponder(); 
 		virtual void result(const LLSD& content);
-		virtual void completed(
-			U32 status,
-			const std::string& reason,
-			const LLSD& content);
+		virtual void error(U32 status, const std::string& reason);
 
 	private:
 		ResponsePtr mSharedData;
+		std::string mUri;
+		S32 mRetryCount;
 	};
 
 	class VerifiedDestinationResponder : public LLHTTPClient::Responder
 	{
 	public:
-		VerifiedDestinationResponder(ResponsePtr data, const LLSD& content);
+		VerifiedDestinationResponder(const std::string& uri, ResponsePtr data,
+									 const LLSD& content, S32 retry_count);
+		virtual ~VerifiedDestinationResponder();
 		virtual void result(const LLSD& content);
 		virtual void error(U32 status, const std::string& reason);
+		
 	private:
 		void retry();
 		ResponsePtr mSharedData;
 		LLSD mContent;
+		std::string mUri;
+		S32 mRetryCount;
 	};
 };
 
+namespace boost
+{
+	void intrusive_ptr_add_ref(LLRegionPresenceVerifier::Response* p);
+	void intrusive_ptr_release(LLRegionPresenceVerifier::Response* p);
+};
 
 #endif //LL_LLREGIONPRESENCEVERIFIER_H
diff --git a/indra/llmessage/llstoredmessage.cpp b/indra/llmessage/llstoredmessage.cpp
index 615eff405d..da6d1c84a8 100644
--- a/indra/llmessage/llstoredmessage.cpp
+++ b/indra/llmessage/llstoredmessage.cpp
@@ -1,5 +1,5 @@
 /** 
- * @file 
+ * @file llstoredmessage.cpp
  * @brief 
  *
  * $LicenseInfo:firstyear=2009&license=viewergpl$
diff --git a/indra/llmessage/llstoredmessage.h b/indra/llmessage/llstoredmessage.h
index e817f19bd2..6a27698b03 100644
--- a/indra/llmessage/llstoredmessage.h
+++ b/indra/llmessage/llstoredmessage.h
@@ -1,5 +1,5 @@
 /** 
- * @file 
+ * @file llstoredmessage.h
  * @brief 
  *
  * $LicenseInfo:firstyear=2009&license=viewergpl$
diff --git a/indra/llmessage/llthrottle.cpp b/indra/llmessage/llthrottle.cpp
index 70279a3c62..0872efba50 100644
--- a/indra/llmessage/llthrottle.cpp
+++ b/indra/llmessage/llthrottle.cpp
@@ -265,6 +265,31 @@ BOOL LLThrottleGroup::setNominalBPS(F32* throttle_vec)
 	return changed;
 }
 
+// Return bits available in the channel
+S32		LLThrottleGroup::getAvailable(S32 throttle_cat)
+{
+	S32 retval = 0;
+
+	F32 category_bps = mCurrentBPS[throttle_cat];
+	F32 lookahead_bits = category_bps * THROTTLE_LOOKAHEAD_TIME;
+
+	// use a temporary bits_available
+	// since we don't want to change mBitsAvailable every time
+	F32 elapsed_time = (F32)(LLMessageSystem::getMessageTimeSeconds() - mLastSendTime[throttle_cat]);
+	F32 bits_available = mBitsAvailable[throttle_cat] + (category_bps * elapsed_time);
+
+	if (bits_available >= lookahead_bits)
+	{
+		retval = (S32) gThrottleMaximumBPS[throttle_cat];
+	}
+	else 
+	{
+		retval = (S32) bits_available;
+	}
+	
+	return retval;
+}
+
 
 BOOL LLThrottleGroup::checkOverflow(S32 throttle_cat, F32 bits)
 {
diff --git a/indra/llmessage/llthrottle.h b/indra/llmessage/llthrottle.h
index 7d1679beb2..47a7c653b2 100644
--- a/indra/llmessage/llthrottle.h
+++ b/indra/llmessage/llthrottle.h
@@ -84,6 +84,8 @@ public:
 	BOOL	dynamicAdjust();		// Shift bandwidth from idle channels to busy channels, TRUE if adjustment occurred
 	BOOL	setNominalBPS(F32* throttle_vec);				// TRUE if any value was different, resets adjustment system if was different
 
+	S32		getAvailable(S32 throttle_cat);					// Return bits available in the channel
+
 	void packThrottle(LLDataPacker &dp) const;
 	void unpackThrottle(LLDataPacker &dp);
 public:
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index 3ab8057abb..81b7761ed5 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -51,6 +51,7 @@ static const U32 HTTP_STATUS_PIPE_ERROR = 499;
  * String constants
  */
 const std::string CONTEXT_DEST_URI_SD_LABEL("dest_uri");
+const std::string CONTEXT_TRANSFERED_BYTES("transfered_bytes");
 
 
 static size_t headerCallback(void* data, size_t size, size_t nmemb, void* user);
@@ -247,7 +248,29 @@ LLIOPipe::EStatus LLURLRequest::process_impl(
 	PUMP_DEBUG;
 	LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
 	//llinfos << "LLURLRequest::process_impl()" << llendl;
-	if(!buffer) return STATUS_ERROR;
+	if (!buffer) return STATUS_ERROR;
+	
+	// we're still waiting or prcessing, check how many
+	// bytes we have accumulated.
+	const S32 MIN_ACCUMULATION = 100000;
+	if(pump && (mDetail->mByteAccumulator > MIN_ACCUMULATION))
+	{
+		 // This is a pretty sloppy calculation, but this
+		 // tries to make the gross assumption that if data
+		 // is coming in at 56kb/s, then this transfer will
+		 // probably succeed. So, if we're accumlated
+		 // 100,000 bytes (MIN_ACCUMULATION) then let's
+		 // give this client another 2s to complete.
+		 const F32 TIMEOUT_ADJUSTMENT = 2.0f;
+		 mDetail->mByteAccumulator = 0;
+		 pump->adjustTimeoutSeconds(TIMEOUT_ADJUSTMENT);
+		 lldebugs << "LLURLRequest adjustTimeoutSeconds for request: " << mDetail->mURL << llendl;
+		 if (mState == STATE_INITIALIZED)
+		 {
+			  llinfos << "LLURLRequest adjustTimeoutSeconds called during upload" << llendl;
+		 }
+	}
+
 	switch(mState)
 	{
 	case STATE_INITIALIZED:
@@ -286,27 +309,14 @@ LLIOPipe::EStatus LLURLRequest::process_impl(
 			bool newmsg = mDetail->mCurlRequest->getResult(&result);
 			if(!newmsg)
 			{
-				// we're still waiting or prcessing, check how many
-				// bytes we have accumulated.
-				const S32 MIN_ACCUMULATION = 100000;
-				if(pump && (mDetail->mByteAccumulator > MIN_ACCUMULATION))
-				{
-					// This is a pretty sloppy calculation, but this
-					// tries to make the gross assumption that if data
-					// is coming in at 56kb/s, then this transfer will
-					// probably succeed. So, if we're accumlated
-					// 100,000 bytes (MIN_ACCUMULATION) then let's
-					// give this client another 2s to complete.
-					const F32 TIMEOUT_ADJUSTMENT = 2.0f;
-					mDetail->mByteAccumulator = 0;
-					pump->adjustTimeoutSeconds(TIMEOUT_ADJUSTMENT);
-				}
-
 				// keep processing
 				break;
 			}
 
 			mState = STATE_HAVE_RESPONSE;
+			context[CONTEXT_REQUEST][CONTEXT_TRANSFERED_BYTES] = mRequestTransferedBytes;
+			context[CONTEXT_RESPONSE][CONTEXT_TRANSFERED_BYTES] = mResponseTransferedBytes;
+			lldebugs << this << "Setting context to " << context << llendl;
 			switch(result)
 			{
 				case CURLE_OK:
@@ -353,10 +363,16 @@ LLIOPipe::EStatus LLURLRequest::process_impl(
 		// we already stuffed everything into channel in in the curl
 		// callback, so we are done.
 		eos = true;
+		context[CONTEXT_REQUEST][CONTEXT_TRANSFERED_BYTES] = mRequestTransferedBytes;
+		context[CONTEXT_RESPONSE][CONTEXT_TRANSFERED_BYTES] = mResponseTransferedBytes;
+		lldebugs << this << "Setting context to " << context << llendl;
 		return STATUS_DONE;
 
 	default:
 		PUMP_DEBUG;
+		context[CONTEXT_REQUEST][CONTEXT_TRANSFERED_BYTES] = mRequestTransferedBytes;
+		context[CONTEXT_RESPONSE][CONTEXT_TRANSFERED_BYTES] = mResponseTransferedBytes;
+		lldebugs << this << "Setting context to " << context << llendl;
 		return STATUS_ERROR;
 	}
 }
@@ -369,6 +385,8 @@ void LLURLRequest::initialize()
 	mDetail->mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
 	mDetail->mCurlRequest->setWriteCallback(&downCallback, (void*)this);
 	mDetail->mCurlRequest->setReadCallback(&upCallback, (void*)this);
+	mRequestTransferedBytes = 0;
+	mResponseTransferedBytes = 0;
 }
 
 bool LLURLRequest::configure()
@@ -471,6 +489,7 @@ size_t LLURLRequest::downCallback(
 		req->mDetail->mChannels.out(),
 		(U8*)data,
 		bytes);
+	req->mResponseTransferedBytes += bytes;
 	req->mDetail->mByteAccumulator += bytes;
 	return bytes;
 }
@@ -494,6 +513,7 @@ size_t LLURLRequest::upCallback(
 		req->mDetail->mLastRead,
 		(U8*)data,
 		bytes);
+	req->mRequestTransferedBytes += bytes;
 	return bytes;
 }
 
diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h
index 86ef71f085..cb3c466440 100644
--- a/indra/llmessage/llurlrequest.h
+++ b/indra/llmessage/llurlrequest.h
@@ -45,6 +45,12 @@
 #include "llchainio.h"
 #include "llerror.h"
 
+
+extern const std::string CONTEXT_REQUEST;
+extern const std::string CONTEXT_DEST_URI_SD_LABEL;
+extern const std::string CONTEXT_RESPONSE;
+extern const std::string CONTEXT_TRANSFERED_BYTES;
+
 class LLURLRequestDetail;
 
 class LLURLRequestComplete;
@@ -208,6 +214,8 @@ protected:
 	ERequestAction mAction;
 	LLURLRequestDetail* mDetail;
 	LLIOPipe::ptr_t mCompletionCallback;
+	 S32 mRequestTransferedBytes;
+	 S32 mResponseTransferedBytes;
 
 private:
 	/** 
diff --git a/indra/llmessage/tests/llregionpresenceverifier_test.cpp b/indra/llmessage/tests/llregionpresenceverifier_test.cpp
new file mode 100644
index 0000000000..b7602ef15c
--- /dev/null
+++ b/indra/llmessage/tests/llregionpresenceverifier_test.cpp
@@ -0,0 +1,111 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "../test/lltut.h"
+#include "llregionpresenceverifier.h"
+#include "llcurl_stub.cpp"
+#include "llhost.cpp"
+#include "net.cpp"
+#include "lltesthttpclientadapter.cpp"
+
+class LLTestResponse : public LLRegionPresenceVerifier::Response
+{
+public:
+
+	virtual bool checkValidity(const LLSD& content) const
+	{
+		return true;
+	}
+
+	virtual void onRegionVerified(const LLSD& region_details)
+	{
+	}
+
+	virtual void onRegionVerificationFailed()
+	{
+	}
+	
+	virtual LLHTTPClientInterface& getHttpClient()
+	{
+		return mHttpInterface;
+	}
+
+	LLTestHTTPClientAdapter mHttpInterface;
+};
+
+namespace tut
+{
+	struct LLRegionPresenceVerifierData
+	{
+		LLRegionPresenceVerifierData() :
+			mResponse(new LLTestResponse()),
+			mResponder("", LLRegionPresenceVerifier::ResponsePtr(mResponse),
+					   LLSD(), 3)
+		{
+		}
+		
+		LLTestResponse* mResponse;
+		LLRegionPresenceVerifier::VerifiedDestinationResponder mResponder;
+	};
+
+	typedef test_group<LLRegionPresenceVerifierData> factory;
+	typedef factory::object object;
+}
+
+namespace
+{
+	tut::factory tf("LLRegionPresenceVerifier test");
+}
+
+namespace tut
+{
+	// Test that VerifiedDestinationResponder does retry
+    // on error when shouldRetry returns true.
+	template<> template<>
+	void object::test<1>()
+	{
+		mResponder.error(500, "Internal server error");
+		ensure_equals(mResponse->mHttpInterface.mGetUrl.size(), 1);
+	}
+
+	// Test that VerifiedDestinationResponder only retries
+	// on error until shouldRetry returns false.
+	template<> template<>
+	void object::test<2>()
+	{
+		mResponder.error(500, "Internal server error");
+		mResponder.error(500, "Internal server error");
+		mResponder.error(500, "Internal server error");
+		mResponder.error(500, "Internal server error");
+		ensure_equals(mResponse->mHttpInterface.mGetUrl.size(), 3);
+	}
+}
+
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp
index c9632ebdad..c1dde32993 100644
--- a/indra/llprimitive/llprimtexturelist.cpp
+++ b/indra/llprimitive/llprimtexturelist.cpp
@@ -386,8 +386,18 @@ void LLPrimTextureList::setSize(S32 new_size)
 		mEntryList.resize(new_size);
 		for (S32 index = current_size; index < new_size; ++index)
 		{
-			LLTextureEntry* new_entry = LLPrimTextureList::newTextureEntry();
-			mEntryList[index] = new_entry;
+			if (current_size > 0
+				&& mEntryList[current_size - 1])
+			{
+				// copy the last valid entry for the new one
+				mEntryList[index] = mEntryList[current_size - 1]->newCopy();
+			}
+			else
+			{
+				// no valid enries to copy, so we new one up
+				LLTextureEntry* new_entry = LLPrimTextureList::newTextureEntry();
+				mEntryList[index] = new_entry;
+			}
 		}
 	}
 	else if (new_size < current_size)
diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp
index e231002a52..452594c7e7 100755
--- a/indra/llvfs/llpidlock.cpp
+++ b/indra/llvfs/llpidlock.cpp
@@ -61,7 +61,7 @@ class LLPidLockFile
 			mSaving(FALSE), mWaiting(FALSE), 
 			mClean(TRUE), mPID(getpid())
 		{
-			mLockName = gDirUtilp->getTempDir() + "/savelock";
+			mLockName = gDirUtilp->getTempDir() + gDirUtilp->getDirDelimiter() + "savelock";
 		}
 		bool requestLock(LLNameTable<void *> *name_table, bool autosave,
 						bool force_immediate=FALSE, F32 timeout=300.0);
diff --git a/indra/lscript/lscript_byteformat.h b/indra/lscript/lscript_byteformat.h
index ba2c46bef2..a54ebd5831 100644
--- a/indra/lscript/lscript_byteformat.h
+++ b/indra/lscript/lscript_byteformat.h
@@ -556,7 +556,7 @@ const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] =
 // http_request string constants
 extern const char* URL_REQUEST_GRANTED;
 extern const char* URL_REQUEST_DENIED;
-extern const U64 LSL_HTTP_REQUEST_TIMEOUT;
+extern const U64 LSL_HTTP_REQUEST_TIMEOUT_USEC;
 
 #endif
 
diff --git a/indra/lscript/lscript_compile/lscript_tree.cpp b/indra/lscript/lscript_compile/lscript_tree.cpp
index e291d4c6f8..a15f1fee11 100644
--- a/indra/lscript/lscript_compile/lscript_tree.cpp
+++ b/indra/lscript/lscript_compile/lscript_tree.cpp
@@ -631,9 +631,7 @@ static void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetTy
 		switch(targetType)
 		{
 		case LST_INTEGER:
-			//fprintf(fp, "call int32 [LslLibrary]LindenLab.SecondLife.LslRunTime::ToInteger(float32)\n");
-			fprintf(fp, "conv.i4\n"); // TODO replace this line with the above
-			// we the entire grid is > 1.25.1
+			fprintf(fp, "call int32 [LslLibrary]LindenLab.SecondLife.LslRunTime::ToInteger(float32)\n");
 			break;
 		case LST_STRING:
 			fprintf(fp, "call string [LslLibrary]LindenLab.SecondLife.LslRunTime::ToString(float32)\n");
@@ -8375,10 +8373,18 @@ void LLScriptStateChange::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 			chunk->addInteger(mIdentifier->mScopeEntry->mCount);
 		}
 		break;
+	case LSCP_TYPE:
+		mReturnType = basetype;
+		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
 		fprintf(fp, "ldarg.0\n");
 		fprintf(fp, "ldstr \"%s\"\n", mIdentifier->mName);
 		fprintf(fp, "call instance void class [LslUserScript]LindenLab.SecondLife.LslUserScript::ChangeState(string)\n");
+		// We are doing a state change. In the LSL interpreter, this is basically a longjmp. We emulate it
+		// here using a call to the ChangeState followed by a short cut return of the current method. To
+		// maintain type safety we need to push an arbitrary variable of the current method's return type
+		// onto the stack before returning. This will be ignored and discarded.
+		print_cil_init_variable(fp, mReturnType);
 		fprintf(fp, "ret\n");
 		break;
 	default:
@@ -8793,7 +8799,8 @@ void LLScriptIf::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass p
 		}
 		break;
 	case LSCP_PRUNE:
-		prunearg = FALSE;
+		prunearg = TRUE;
+		mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
 	case LSCP_TYPE:
 		mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -8979,7 +8986,8 @@ void LLScriptFor::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass
 		}
 		break;
 	case LSCP_PRUNE:
-		prunearg = FALSE;
+		prunearg = TRUE;
+		mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
 	case LSCP_TYPE:
 		if(mSequence)
@@ -9083,7 +9091,8 @@ void LLScriptDoWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompileP
 		}
 		break;
 	case LSCP_PRUNE:
-		prunearg = FALSE;
+		prunearg = TRUE;
+		mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
 	case LSCP_TYPE:
 		mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -9159,7 +9168,8 @@ void LLScriptWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas
 		}
 		break;
 	case LSCP_PRUNE:
-		prunearg = FALSE;
+		prunearg = TRUE;
+		mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
 	case LSCP_TYPE:
 		mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -10127,7 +10137,10 @@ void LLScriptGlobalFunctions::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 			mStatements->recurse(fp, tabs, tabsize, pass, LSPRUNE_GLOBAL_NON_VOIDS, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			if (!prunearg)
 			{
-				gErrorToText.writeError(fp, this, LSERROR_NO_RETURN);
+				if (!gErrorToText.getErrors()) // Hide this error when a state change has been made in a global function
+				{
+					gErrorToText.writeError(fp, this, LSERROR_NO_RETURN);
+				}
 			}
 		}
 		else
diff --git a/indra/lscript/lscript_compile/lscript_tree.h b/indra/lscript/lscript_compile/lscript_tree.h
index 12c16908af..a667e1eb5b 100644
--- a/indra/lscript/lscript_compile/lscript_tree.h
+++ b/indra/lscript/lscript_compile/lscript_tree.h
@@ -1888,6 +1888,7 @@ public:
 	S32 getSize();
 
 	LLScriptIdentifier *mIdentifier;
+	LSCRIPTType mReturnType;
 };
 
 class LLScriptJump : public LLScriptStatement
diff --git a/indra/lscript/lscript_execute.h b/indra/lscript/lscript_execute.h
index 9a631c4c8f..8549482299 100644
--- a/indra/lscript/lscript_execute.h
+++ b/indra/lscript/lscript_execute.h
@@ -369,8 +369,7 @@ class LLScriptExecute
 {
 public:
 	LLScriptExecute();
-	virtual ~LLScriptExecute() {;}
-
+	virtual ~LLScriptExecute()  = 0;
 	virtual S32 getVersion() const = 0;
 	virtual void deleteAllEvents() = 0;
 	virtual void addEvent(LLScriptDataCollection* event) = 0;
diff --git a/indra/lscript/lscript_execute/lscript_execute.cpp b/indra/lscript/lscript_execute/lscript_execute.cpp
index 05fee9a419..1f908eb675 100644
--- a/indra/lscript/lscript_execute/lscript_execute.cpp
+++ b/indra/lscript/lscript_execute/lscript_execute.cpp
@@ -41,6 +41,8 @@
 #include "lscript_library.h"
 #include "lscript_heapruntime.h"
 #include "lscript_alloc.h"
+#include "llstat.h"
+
 
 // Static
 const	S32	DEFAULT_SCRIPT_TIMER_CHECK_SKIP = 4;
@@ -72,7 +74,7 @@ const char* URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
 const char* URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
 
 // HTTP Requests to LSL scripts will time out after 25 seconds.
-const U64 LSL_HTTP_REQUEST_TIMEOUT = 25 * USEC_PER_SEC; 
+const U64 LSL_HTTP_REQUEST_TIMEOUT_USEC = 25 * USEC_PER_SEC; 
 
 LLScriptExecuteLSL2::LLScriptExecuteLSL2(LLFILE *fp)
 {
@@ -110,6 +112,7 @@ LLScriptExecuteLSL2::LLScriptExecuteLSL2(const U8* bytecode, U32 bytecode_size)
 	init();
 }
 
+LLScriptExecute::~LLScriptExecute() {}
 LLScriptExecuteLSL2::~LLScriptExecuteLSL2()
 {
 	delete[] mBuffer;
@@ -4234,19 +4237,16 @@ S32 lscript_push_variable(LLScriptLibData *data, U8 *buffer)
 	return 4;
 }
 
-BOOL run_calllib(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
+
+// Shared code for run_calllib() and run_calllib_two_byte()
+BOOL run_calllib_common(U8 *buffer, S32 &offset, const LLUUID &id, U16 arg)
 {
-	if (b_print)
-		printf("[0x%X]\tCALLLIB ", offset);
-	offset++;
-	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
 	if (arg >= gScriptLibrary.mNextNumber)
 	{
 		set_fault(buffer, LSRF_BOUND_CHECK_ERROR);
 		return FALSE;
 	}
-	if (b_print)
-		printf("%d (%s)\n", (U32)arg, gScriptLibrary.mFunctions[arg]->mName);
+	LLScriptLibraryFunction *function = gScriptLibrary.mFunctions[arg];
 
 	// pull out the arguments and the return values
 	LLScriptLibData	*arguments = NULL;
@@ -4254,14 +4254,14 @@ BOOL run_calllib(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 
 	S32 i, number;
 
-	if (gScriptLibrary.mFunctions[arg]->mReturnType)
+	if (function->mReturnType)
 	{
 		returnvalue = new LLScriptLibData;
 	}
 
-	if (gScriptLibrary.mFunctions[arg]->mArgs)
+	if (function->mArgs)
 	{
-		number = (S32)strlen(gScriptLibrary.mFunctions[arg]->mArgs);		/*Flawfinder: ignore*/
+		number = (S32)strlen(function->mArgs);		//Flawfinder: ignore
 		arguments = new LLScriptLibData[number];
 	}
 	else
@@ -4271,24 +4271,18 @@ BOOL run_calllib(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 
 	for (i = number - 1; i >= 0; i--)
 	{
-		lscript_pop_variable(&arguments[i], buffer, gScriptLibrary.mFunctions[arg]->mArgs[i]);
+		lscript_pop_variable(&arguments[i], buffer, function->mArgs[i]);
 	}
 
-	if (b_print)
-	{
-		printf("%s\n", gScriptLibrary.mFunctions[arg]->mDesc);
-	}
+	// Actually execute the function call
+	function->mExecFunc(returnvalue, arguments, id);
 
-	{
-		// LLFastTimer time_in_libraries1(LLFastTimer::FTM_TEMP7);
-		gScriptLibrary.mFunctions[arg]->mExecFunc(returnvalue, arguments, id);
-	}
-	add_register_fp(buffer, LREG_ESR, -gScriptLibrary.mFunctions[arg]->mEnergyUse);
-	add_register_fp(buffer, LREG_SLR, gScriptLibrary.mFunctions[arg]->mSleepTime);
+	add_register_fp(buffer, LREG_ESR, -(function->mEnergyUse));
+	add_register_fp(buffer, LREG_SLR, function->mSleepTime);
 
 	if (returnvalue)
 	{
-		returnvalue->mType = char2type(*gScriptLibrary.mFunctions[arg]->mReturnType);
+		returnvalue->mType = char2type(*function->mReturnType);
 		lscript_push_return_variable(returnvalue, buffer);
 	}
 
@@ -4305,72 +4299,32 @@ BOOL run_calllib(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 }
 
 
-BOOL run_calllib_two_byte(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
+BOOL run_calllib(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 {
-	if (b_print)
-		printf("[0x%X]\tCALLLIB ", offset);
 	offset++;
-	U16 arg = safe_instruction_bytestream2u16(buffer, offset);
-	if (arg >= gScriptLibrary.mNextNumber)
-	{
-		set_fault(buffer, LSRF_BOUND_CHECK_ERROR);
-		return FALSE;
-	}
-	if (b_print)
-		printf("%d (%s)\n", (U32)arg, gScriptLibrary.mFunctions[arg]->mName);
-
-	// pull out the arguments and the return values
-	LLScriptLibData	*arguments = NULL;
-	LLScriptLibData	*returnvalue = NULL;
-
-	S32 i, number;
-
-	if (gScriptLibrary.mFunctions[arg]->mReturnType)
-	{
-		returnvalue = new LLScriptLibData;
-	}
-
-	if (gScriptLibrary.mFunctions[arg]->mArgs)
+	U16 arg = (U16) safe_instruction_bytestream2byte(buffer, offset);
+	if (b_print &&
+		arg < gScriptLibrary.mNextNumber)
 	{
-		number = (S32)strlen(gScriptLibrary.mFunctions[arg]->mArgs);		/*Flawfinder: ignore*/
-		arguments = new LLScriptLibData[number];
-	}
-	else
-	{
-		number = 0;
-	}
-
-	for (i = number - 1; i >= 0; i--)
-	{
-		lscript_pop_variable(&arguments[i], buffer, gScriptLibrary.mFunctions[arg]->mArgs[i]);
-	}
-
-	if (b_print)
-	{
-		printf("%s\n", gScriptLibrary.mFunctions[arg]->mDesc);
-	}
-
-	{
-		// LLFastTimer time_in_libraries2(LLFastTimer::FTM_TEMP8);
-		gScriptLibrary.mFunctions[arg]->mExecFunc(returnvalue, arguments, id);
+		printf("[0x%X]\tCALLLIB ", offset);
+		LLScriptLibraryFunction *function = gScriptLibrary.mFunctions[arg];
+		printf("%d (%s)\n", (U32)arg, function->mName);
+		printf("%s\n", function->mDesc);
 	}
-	add_register_fp(buffer, LREG_ESR, -gScriptLibrary.mFunctions[arg]->mEnergyUse);
-	add_register_fp(buffer, LREG_SLR, gScriptLibrary.mFunctions[arg]->mSleepTime);
+	return run_calllib_common(buffer, offset, id, arg);
+}
 
-	if (returnvalue)
+BOOL run_calllib_two_byte(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
+{
+	offset++;
+	U16 arg = safe_instruction_bytestream2u16(buffer, offset);
+	if (b_print &&
+		arg < gScriptLibrary.mNextNumber)
 	{
-		returnvalue->mType = char2type(*gScriptLibrary.mFunctions[arg]->mReturnType);
-		lscript_push_return_variable(returnvalue, buffer);
+		printf("[0x%X]\tCALLLIB ", (offset-1));
+		LLScriptLibraryFunction *function = gScriptLibrary.mFunctions[arg];
+		printf("%d (%s)\n", (U32)arg, function->mName);
+		printf("%s\n", function->mDesc);
 	}
-
-	delete [] arguments;
-	delete returnvalue;
-
-	// reset the BP after calling the library files
-	S32 bp = lscript_pop_int(buffer);
-	set_bp(buffer, bp);
-
-	// pop off the spot for the instruction pointer
-	lscript_poparg(buffer, 4);
-	return FALSE;
+	return run_calllib_common(buffer, offset, id, arg);
 }
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 06c1b2c12b..9d6c26d834 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -3063,7 +3063,7 @@ bool LLDispatchEstateUpdateInfo::operator()(
 	regionp->setOwner(owner_id);
 	// Update estate owner name in UI
 	const BOOL is_group = FALSE;
-	gCacheName->get(owner_id, is_group, LLPanelEstateInfo::callbackCacheName);
+	gCacheName->getNameFromUUID(owner_id, is_group, LLPanelEstateInfo::callbackCacheName);
 
 	U32 estate_id = strtoul(strings[2].c_str(), NULL, 10);
 	panel->setEstateID(estate_id);
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index a90ea39265..5b3f3952c9 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -932,7 +932,8 @@ void LLIMMgr::inviteToSession(
 	{
 		if (caller_name.empty())
 		{
-			gCacheName->getName(caller_id, onInviteNameLookup, new LLSD(payload));
+			BOOL is_group = FALSE;		// Inviter must be a person
+			gCacheName->getNameFromUUID(caller_id, is_group, onInviteNameLookup, new LLSD(payload));
 		}
 		else
 		{
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp
index 40b1c64146..a840b59140 100644
--- a/indra/newview/llmutelist.cpp
+++ b/indra/newview/llmutelist.cpp
@@ -566,7 +566,7 @@ BOOL LLMuteList::autoRemove(const LLUUID& agent_id, const EAutoReason reason, co
 			else
 			{
 				// not in cache, lookup name from cache
-				gCacheName->get(agent_id, FALSE, notify_automute_callback, (void *)reason);
+				gCacheName->getNameFromUUID(agent_id, FALSE, notify_automute_callback, (void *)reason);
 			}
 		}
 		else
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index bbfd480e0b..7664d7ee07 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1040,7 +1040,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 	// * we can't build two messages at once.
 	if (2 == button)
 	{
-		gCacheName->get(mFromID, mFromGroup, inventory_offer_mute_callback, this);
+		gCacheName->getNameFromUUID(mFromID, mFromGroup, inventory_offer_mute_callback, this);
 	}
 
 	LLMessageSystem* msg = gMessageSystem;
@@ -4428,7 +4428,7 @@ void process_mean_collision_alert_message(LLMessageSystem *msgsystem, void **use
 			LLMeanCollisionData *mcd = new LLMeanCollisionData(gAgentID, perp, time, type, mag);
 			gMeanCollisionList.push_front(mcd);
 			const BOOL is_group = FALSE;
-			gCacheName->get(perp, is_group, mean_name_callback);
+			gCacheName->getNameFromUUID(perp, is_group, mean_name_callback);
 		}
 	}
 }
@@ -5375,7 +5375,7 @@ void process_load_url(LLMessageSystem* msg, void**)
 	// Add to list of pending name lookups
 	gLoadUrlList.push_back(payload);
 
-	gCacheName->get(owner_id, owner_is_group, callback_load_url_name);
+	gCacheName->getNameFromUUID(owner_id, owner_is_group, callback_load_url_name);
 }
 
 
@@ -5469,7 +5469,9 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
 	LLPanelLandCovenant::updateLastModified(last_modified);
 	LLFloaterBuyLand::updateLastModified(last_modified);
 
-	gCacheName->getName(estate_owner_id, callbackCacheEstateOwnerName);
+	// Estates can't be owned by groups
+	BOOL is_group = FALSE;
+	gCacheName->getNameFromUUID(estate_owner_id, is_group, callbackCacheEstateOwnerName);
 	
 	// load the actual covenant asset data
 	const BOOL high_priority = TRUE;
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 94407ed08c..232885b3f6 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -6901,7 +6901,8 @@ void LLVoiceClient::notifyFriendObservers()
 
 void LLVoiceClient::lookupName(const LLUUID &id)
 {
-	gCacheName->getName(id, onAvatarNameLookup);
+	BOOL is_group = FALSE;
+	gCacheName->getNameFromUUID(id, is_group, onAvatarNameLookup);
 }
 
 //static
-- 
cgit v1.2.3


From a05617a65472b94b0b0f02f26fc396d8584faa4f Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Tue, 7 Jul 2009 18:30:20 +0000
Subject: svn merge -r 126003:126087  
 svn+ssh://svn/svn/linden/qa/light-texture-params/light-texture-params-2 into
 trunk

---
 indra/llprimitive/llprimitive.cpp | 78 +++++++++++++++++++++++++++++++++++++++
 indra/llprimitive/llprimitive.h   | 25 ++++++++++++-
 2 files changed, 102 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index 13facc0d58..58aaf97a76 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -1314,6 +1314,8 @@ BOOL LLNetworkData::isValid(U16 param_type, U32 size)
 		return (size == 16);
 	case PARAMS_SCULPT:
 		return (size == 17);
+	case PARAMS_LIGHT_IMAGE:
+		return (size == 28);
 	}
 	
 	return FALSE;
@@ -1646,3 +1648,79 @@ bool LLSculptParams::fromLLSD(LLSD& sd)
 	return false;
 }
 
+//============================================================================
+
+LLLightImageParams::LLLightImageParams()
+{
+	mType = PARAMS_LIGHT_IMAGE;
+	mParams.setVec(F_PI*0.5f, 0.f, 0.f);
+}
+
+BOOL LLLightImageParams::pack(LLDataPacker &dp) const
+{
+	dp.packUUID(mLightTexture, "texture");
+	dp.packVector3(mParams, "params");
+
+	return TRUE;
+}
+
+BOOL LLLightImageParams::unpack(LLDataPacker &dp)
+{
+	dp.unpackUUID(mLightTexture, "texture");
+	dp.unpackVector3(mParams, "params");
+	
+	return TRUE;
+}
+
+bool LLLightImageParams::operator==(const LLNetworkData& data) const
+{
+	if (data.mType != PARAMS_LIGHT_IMAGE)
+	{
+		return false;
+	}
+	
+	const LLLightImageParams *param = (const LLLightImageParams*)&data;
+	if ( (param->mLightTexture != mLightTexture) )
+	{
+		return false;
+	}
+
+	if ( (param->mParams != mParams ) )
+	{
+		return false;
+	}
+	
+	return true;
+}
+
+void LLLightImageParams::copy(const LLNetworkData& data)
+{
+	const LLLightImageParams *param = (LLLightImageParams*)&data;
+	mLightTexture = param->mLightTexture;
+	mParams = param->mParams;
+}
+
+
+
+LLSD LLLightImageParams::asLLSD() const
+{
+	LLSD sd;
+	
+	sd["texture"] = mLightTexture;
+	sd["params"] = mParams.getValue();
+		
+	return sd;
+}
+
+bool LLLightImageParams::fromLLSD(LLSD& sd)
+{
+	if (sd.has("texture"))
+	{
+		setLightTexture( sd["texture"] );
+		setParams( sd["params"] );
+		return true;
+	} 
+	
+	return false;
+}
+
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h
index c25df0a40f..01389a0e04 100644
--- a/indra/llprimitive/llprimitive.h
+++ b/indra/llprimitive/llprimitive.h
@@ -107,7 +107,8 @@ public:
 	{
 		PARAMS_FLEXIBLE = 0x10,
 		PARAMS_LIGHT    = 0x20,
-		PARAMS_SCULPT   = 0x30
+		PARAMS_SCULPT   = 0x30,
+		PARAMS_LIGHT_IMAGE = 0x40,
 	};
 	
 public:
@@ -267,6 +268,28 @@ public:
 	U8 getSculptType()                      { return mSculptType; }
 };
 
+class LLLightImageParams : public LLNetworkData
+{
+protected:
+	LLUUID mLightTexture;
+	LLVector3 mParams;
+	
+public:
+	LLLightImageParams();
+	/*virtual*/ BOOL pack(LLDataPacker &dp) const;
+	/*virtual*/ BOOL unpack(LLDataPacker &dp);
+	/*virtual*/ bool operator==(const LLNetworkData& data) const;
+	/*virtual*/ void copy(const LLNetworkData& data);
+	LLSD asLLSD() const;
+	operator LLSD() const { return asLLSD(); }
+	bool fromLLSD(LLSD& sd);
+
+	void setLightTexture(const LLUUID& id) { mLightTexture = id; }
+	LLUUID getLightTexture() const         { return mLightTexture; }
+	void setParams(const LLVector3& params) { mParams = params; }
+	LLVector3 getParams() const			   { return mParams; }
+	
+};
 
 
 class LLPrimitive : public LLXform
-- 
cgit v1.2.3


From c2e425e5395c1b1b43a2f477565e374d919f10ee Mon Sep 17 00:00:00 2001
From: Dave Hiller <daveh@lindenlab.com>
Date: Tue, 14 Jul 2009 16:52:40 +0000
Subject: QAR-1651

svn merge -r126784:126785 svn+ssh://svn.lindenlab.com/svn/linden/branches/mock-3 into trunk
---
 indra/cmake/GoogleMock.cmake             | 27 ++++++++++++++
 indra/cmake/LLAddBuildTest.cmake         | 11 +++++-
 indra/llmessage/tests/llmockhttpclient.h | 61 ++++++++++++++++++++++++++++++++
 indra/test/CMakeLists.txt                | 17 ++++++---
 indra/test/test.cpp                      |  6 ++++
 5 files changed, 117 insertions(+), 5 deletions(-)
 create mode 100644 indra/cmake/GoogleMock.cmake
 create mode 100644 indra/llmessage/tests/llmockhttpclient.h

(limited to 'indra')

diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake
new file mode 100644
index 0000000000..ca5a8034ba
--- /dev/null
+++ b/indra/cmake/GoogleMock.cmake
@@ -0,0 +1,27 @@
+# -*- cmake -*-
+include(Prebuilt)
+include(Linking)
+
+use_prebuilt_binary(googlemock)
+
+set(GOOGLEMOCK_INCLUDE_DIRS 
+    ${LIBS_PREBUILT_DIR}/include)
+
+if (LINUX)
+    set(GOOGLEMOCK_LIBRARIES 
+        gmock  
+        gtest)
+elseif(WINDOWS)
+    set(GOOGLEMOCK_LIBRARIES 
+        gmock)
+    set(GOOGLEMOCK_INCLUDE_DIRS 
+        ${LIBS_PREBUILT_DIR}/include
+        ${LIBS_PREBUILT_DIR}/include/gmock
+        ${LIBS_PREBUILT_DIR}/include/gmock/boost/tr1/tr1)
+elseif(DARWIN)
+    set(GOOGLEMOCK_LIBRARIES
+        gmock
+        gtest)
+endif(LINUX)
+
+
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 4a61725e09..4da0824120 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -13,6 +13,8 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
   #
   # WARNING: do NOT modify this code without working with poppy or daveh -
   # there is another branch that will conflict heavily with any changes here.
+INCLUDE(GoogleMock)
+
 
   IF(LL_TEST_VERBOSE)
     MESSAGE("LL_ADD_PROJECT_UNIT_TESTS UNITTEST_PROJECT_${project} sources: ${sources}")
@@ -32,8 +34,10 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
     ${LLMATH_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
     ${LIBS_OPEN_DIR}/test
+    ${GOOGLEMOCK_INCLUDE_DIRS}
     )
   SET(alltest_LIBRARIES
+    ${GOOGLEMOCK_LIBRARIES}
     ${PTHREAD_LIBRARY}
     ${WINDOWS_LIBRARIES}
     )
@@ -42,6 +46,11 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
     ${CMAKE_SOURCE_DIR}/test/test.h
     )
 
+  # Use the default flags
+  if (LINUX)
+    SET(CMAKE_EXE_LINKER_FLAGS "")
+  endif (LINUX)
+
   # start the source test executable definitions
   SET(${project}_TEST_OUTPUT "")
   FOREACH (source ${sources})
@@ -84,9 +93,9 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
       MESSAGE("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_additional_INCLUDE_DIRS ${${name}_test_additional_INCLUDE_DIRS}")
     ENDIF(LL_TEST_VERBOSE)
 
+
     # Setup target
     ADD_EXECUTABLE(PROJECT_${project}_TEST_${name} ${${name}_test_SOURCE_FILES})
-
     #
     # Per-codefile additional / external project dep and lib dep property extraction
     #
diff --git a/indra/llmessage/tests/llmockhttpclient.h b/indra/llmessage/tests/llmockhttpclient.h
new file mode 100644
index 0000000000..0de8246446
--- /dev/null
+++ b/indra/llmessage/tests/llmockhttpclient.h
@@ -0,0 +1,61 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2008&license=internal$
+ * 
+ * Copyright (c) 2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+/* Macro Definitions */
+#ifndef LL_LLMOCKHTTPCLIENT_H
+#define LL_LLMOCKHTTPCLIENT_H
+
+#include "linden_common.h"
+#include "llhttpclientinterface.h"
+
+#include <gmock/gmock.h>
+
+class LLMockHTTPClient : public LLHTTPClientInterface
+{
+public:
+  MOCK_METHOD2(get, void(const std::string& url, LLCurl::ResponderPtr responder));
+  MOCK_METHOD3(get, void(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers));
+  MOCK_METHOD3(put, void(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder));
+};
+
+// A helper to match responder types
+template<typename T>
+struct ResponderType
+{
+	bool operator()(LLCurl::ResponderPtr ptr) const
+	{
+		T* p = dynamic_cast<T*>(ptr.get());
+		return p != NULL;
+	}
+};
+
+inline bool operator==(const LLSD& l, const LLSD& r)
+{
+	std::ostringstream ls, rs;
+	ls << l;
+	rs << r;
+	return ls.str() == rs.str();
+
+}
+
+
+#endif //LL_LLMOCKHTTPCLIENT_H
+
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 49a0a8f361..53109ca196 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -14,6 +14,7 @@ include(LScript)
 include(Linking)
 include(Tut)
 include(Boost)
+include(GoogleMock)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
@@ -24,6 +25,7 @@ include_directories(
     ${LLVFS_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     ${LSCRIPT_INCLUDE_DIRS}
+    ${GOOGLEMOCK_INCLUDE_DIRS}
     )
 
 set(test_SOURCE_FILES
@@ -121,6 +123,7 @@ target_link_libraries(test
     ${LLXML_LIBRARIES}
     ${LSCRIPT_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
+    ${GOOGLEMOCK_LIBRARIES}
     ${APRICONV_LIBRARIES}
     ${PTHREAD_LIBRARY}
     ${WINDOWS_LIBRARIES}
@@ -137,12 +140,18 @@ endif (WINDOWS)
 
 get_target_property(TEST_EXE test LOCATION)
 
+SET(TEST_CMD ${TEST_EXE} --touch=${TEST_OUTPUT} --sourcedir=${CMAKE_CURRENT_SOURCE_DIR})
+
+SET(TEST_LD_CMD 
+  ${CMAKE_COMMAND} 
+  -DLD_LIBRARY_PATH=${ARCH_PREBUILT_DIRS}:/usr/lib
+  -DTEST_CMD:STRING="${TEST_CMD}" 
+  -P ${CMAKE_SOURCE_DIR}/cmake/RunBuildTest.cmake
+  )
+
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cpp_tests_ok.txt
-  COMMAND ${TEST_EXE}
-  ARGS
-    --output=${CMAKE_CURRENT_BINARY_DIR}/cpp_test_results.txt
-    --touch=${CMAKE_CURRENT_BINARY_DIR}/cpp_tests_ok.txt
+  COMMAND ${TEST_LD_CMD}
   DEPENDS test
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   COMMENT "C++ unit tests"
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index ba81c6e49e..c9e985c914 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -54,6 +54,9 @@
 #	include "ctype_workaround.h"
 #endif
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 namespace tut
 {
 	std::string sSourceDir;
@@ -238,6 +241,9 @@ void wouldHaveCrashed(const std::string& message)
 
 int main(int argc, char **argv)
 {
+	// The following line must be executed to initialize Google Mock
+	// (and Google Test) before running the tests.
+	::testing::InitGoogleMock(&argc, argv);
 	LLError::initForApplication(".");
 	LLError::setFatalFunction(wouldHaveCrashed);
 	LLError::setDefaultLevel(LLError::LEVEL_ERROR);
-- 
cgit v1.2.3


From d025b721e0d39f53ef796f9c9e28e94b6d1cea20 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Wed, 15 Jul 2009 17:55:58 +0000
Subject: svn merge -r126867:127217
 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691 Effective merge: svn merge
 -r125827:127126
 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27 QAR-1691

---
 indra/llmessage/lliohttpserver.cpp             | 14 +++++++---
 indra/llmessage/llxfermanager.cpp              | 36 +++++++++++++++-----------
 indra/llprimitive/llprimtexturelist.cpp        |  5 ++--
 indra/lscript/lscript_compile/lscript_tree.cpp | 17 ++++--------
 4 files changed, 38 insertions(+), 34 deletions(-)

(limited to 'indra')

diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp
index 83dfa94f00..ce815cc85b 100644
--- a/indra/llmessage/lliohttpserver.cpp
+++ b/indra/llmessage/lliohttpserver.cpp
@@ -520,7 +520,7 @@ protected:
 	 * seek orfor string assignment.
 	 * @returns Returns true if a line was found.
 	 */
-	bool readLine(
+	bool readHeaderLine(
 		const LLChannelDescriptors& channels,
 		buffer_ptr_t buffer,
 		U8* dest,
@@ -591,7 +591,7 @@ LLHTTPResponder::~LLHTTPResponder()
 	//lldebugs << "destroying LLHTTPResponder" << llendl;
 }
 
-bool LLHTTPResponder::readLine(
+bool LLHTTPResponder::readHeaderLine(
 	const LLChannelDescriptors& channels,
 	buffer_ptr_t buffer,
 	U8* dest,
@@ -669,7 +669,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
 #endif
 		
 		PUMP_DEBUG;
-		if(readLine(channels, buffer, (U8*)buf, len))
+		if(readHeaderLine(channels, buffer, (U8*)buf, len))
 		{
 			bool read_next_line = false;
 			bool parse_all = true;
@@ -733,7 +733,13 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
 					if(read_next_line)
 					{
 						len = HEADER_BUFFER_SIZE;	
-						readLine(channels, buffer, (U8*)buf, len);
+						if (!readHeaderLine(channels, buffer, (U8*)buf, len))
+						{
+							// Failed to read the header line, probably too long.
+							// readHeaderLine already marked the channel/buffer as bad.
+							keep_parsing = false;
+							break;
+						}
 					}
 					if(0 == len)
 					{
diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp
index 08c9192c9f..209bdb2249 100644
--- a/indra/llmessage/llxfermanager.cpp
+++ b/indra/llmessage/llxfermanager.cpp
@@ -760,30 +760,36 @@ static bool remove_prefix(std::string& filename, const std::string& prefix)
 static bool verify_cache_filename(const std::string& filename)
 {
 	//NOTE: This routine is only used to check file names that our own
-	// code places in the cache directory.  As such, it can be limited
-	// to this very restrictive file name pattern.  It does not need to
-	// handle other characters.
-
+	// code places in the cache directory.	As such, it can be limited
+	// to this very restrictive file name pattern.	It does not need to
+	// handle other characters. The only known uses of this are (with examples):
+	//	sim to sim object pass:			fc0b72d8-9456-63d9-a802-a557ef847313.tmp
+	//	sim to viewer mute list:		mute_b78eacd0-1244-448e-93ca-28ede242f647.tmp
+	//	sim to viewer task inventory:	inventory_d8ab59d2-baf0-0e79-c4c2-a3f99b9fcf45.tmp
+	
+	//IMPORTANT: Do not broaden the filenames accepted by this routine
+	// without careful analysis. Anything allowed by this function can
+	// be downloaded by the viewer.
+	
 	size_t len = filename.size();
-	//const boost::regex expr("[a-zA-Z0-9][-_.a-zA-Z0-9]<0,49>");
-	if (len < 1 || len > 50)
-	{
+	//const boost::regex expr("[0-9a-zA-Z_-]<1,46>\.tmp");
+	if (len < 5 || len > 50)
+	{	
 		return false;
 	}
-	for(unsigned i=0; i<len; ++i)
-	{
+	for(size_t i=0; i<(len-4); ++i)
+	{	
 		char c = filename[i];
-		bool ok = isalnum(c);
-		if (!ok && i > 0)
-		{
-			ok = '_'==c || '-'==c || '.'==c;
-		}
+		bool ok = isalnum(c) || '_'==c || '-'==c;
 		if (!ok)
 		{
 			return false;
 		}
 	}
-	return true;
+	return filename[len-4] == '.'
+		&& filename[len-3] == 't'
+		&& filename[len-2] == 'm'
+		&& filename[len-1] == 'p';
 }
 
 void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user_data*/)
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp
index c1dde32993..b02d4c50bd 100644
--- a/indra/llprimitive/llprimtexturelist.cpp
+++ b/indra/llprimitive/llprimtexturelist.cpp
@@ -134,13 +134,12 @@ S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry& te)
 {
 	if (S32(index) >= mEntryList.size())
 	{
-		// TODO -- assert here
 		S32 current_size = mEntryList.size();
-		llerrs << "index = " << S32(index) << "  current_size = " << current_size << llendl;
+		llwarns << "ignore copy of index = " << S32(index) << " into texture entry list of size = " << current_size << llendl;
 		return TEM_CHANGE_NONE;
 	}
 
-	// we're changing an existing entry
+		// we're changing an existing entry
 	llassert(mEntryList[index]);
 	delete (mEntryList[index]);
 	if  (&te)
diff --git a/indra/lscript/lscript_compile/lscript_tree.cpp b/indra/lscript/lscript_compile/lscript_tree.cpp
index a15f1fee11..7fa115bb20 100644
--- a/indra/lscript/lscript_compile/lscript_tree.cpp
+++ b/indra/lscript/lscript_compile/lscript_tree.cpp
@@ -8799,8 +8799,7 @@ void LLScriptIf::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass p
 		}
 		break;
 	case LSCP_PRUNE:
-		prunearg = TRUE;
-		mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		prunearg = FALSE;
 		break;
 	case LSCP_TYPE:
 		mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -8986,8 +8985,7 @@ void LLScriptFor::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass
 		}
 		break;
 	case LSCP_PRUNE:
-		prunearg = TRUE;
-		mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		prunearg = FALSE;
 		break;
 	case LSCP_TYPE:
 		if(mSequence)
@@ -9091,8 +9089,7 @@ void LLScriptDoWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompileP
 		}
 		break;
 	case LSCP_PRUNE:
-		prunearg = TRUE;
-		mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		prunearg = FALSE;
 		break;
 	case LSCP_TYPE:
 		mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -9168,8 +9165,7 @@ void LLScriptWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas
 		}
 		break;
 	case LSCP_PRUNE:
-		prunearg = TRUE;
-		mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		prunearg = FALSE;
 		break;
 	case LSCP_TYPE:
 		mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -10137,10 +10133,7 @@ void LLScriptGlobalFunctions::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 			mStatements->recurse(fp, tabs, tabsize, pass, LSPRUNE_GLOBAL_NON_VOIDS, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			if (!prunearg)
 			{
-				if (!gErrorToText.getErrors()) // Hide this error when a state change has been made in a global function
-				{
-					gErrorToText.writeError(fp, this, LSERROR_NO_RETURN);
-				}
+				gErrorToText.writeError(fp, this, LSERROR_NO_RETURN);
 			}
 		}
 		else
-- 
cgit v1.2.3


From c15b6d7d40ac03957b417cbe0e67d9c1bfa7703f Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Thu, 16 Jul 2009 20:00:21 +0000
Subject: Make googlemock publicly available

---
 indra/llmessage/tests/llmockhttpclient.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llmessage/tests/llmockhttpclient.h b/indra/llmessage/tests/llmockhttpclient.h
index 0de8246446..2f55e97fcc 100644
--- a/indra/llmessage/tests/llmockhttpclient.h
+++ b/indra/llmessage/tests/llmockhttpclient.h
@@ -2,7 +2,7 @@
  * @file 
  * @brief 
  *
- * $LicenseInfo:firstyear=2008&license=internal$
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
  * 
  * Copyright (c) 2008, Linden Research, Inc.
  * 
-- 
cgit v1.2.3


From 858f7846715f5182ed9b5e8da7f98ae972297b10 Mon Sep 17 00:00:00 2001
From: Monty Brandenberg <monty@lindenlab.com>
Date: Wed, 22 Jul 2009 17:30:16 +0000
Subject: Merge of Parcel API V1 to trunk for 1.30 release.  Hallelujah!
 QAR-1687 Merge request for Parcel API project for 1.30 release svn merge
 -r127262:127300
 svn+ssh://svn/svn/linden/branches/parcel-api/merge-qar-1687-parcel-api-2
 trunk

---
 indra/llcommon/metapropertyt.h      | 13 +++++++++++++
 indra/llinventory/llparcel.h        |  6 +++---
 indra/llinventory/llpermissions.cpp |  2 ++
 3 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/metapropertyt.h b/indra/llcommon/metapropertyt.h
index 79a536a224..5ad230d1d5 100644
--- a/indra/llcommon/metapropertyt.h
+++ b/indra/llcommon/metapropertyt.h
@@ -93,6 +93,13 @@ inline const LLReflective* LLMetaPropertyT<LLUUID>::get(const LLReflective* obje
 	return NULL;
 }
 
+template <>
+inline const LLReflective* LLMetaPropertyT<bool>::get(const LLReflective* object) const
+{
+	checkObjectClass(object);
+	return NULL;
+}
+
 template <>
 inline LLSD LLMetaPropertyT<S32>::getLLSD(const LLReflective* object) const
 {
@@ -111,6 +118,12 @@ inline LLSD LLMetaPropertyT<LLUUID>::getLLSD(const LLReflective* object) const
 	return *(getProperty(object));
 }
 
+template <>
+inline LLSD LLMetaPropertyT<bool>::getLLSD(const LLReflective* object) const
+{
+	return *(getProperty(object));
+}
+
 template<class TObject, class TProperty>
 class LLMetaPropertyTT : public LLMetaPropertyT<TProperty>
 {
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 40bbb7b2e0..5ba32c0600 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -135,9 +135,9 @@ class LLSD;
 class LLAccessEntry
 {
 public:
-	LLUUID		mID;
-	S32			mTime;
-	U32			mFlags;
+	LLUUID		mID;		// Agent ID
+	S32			mTime;		// Time (unix seconds) when entry expires
+	U32			mFlags;		// Not used - currently should always be zero
 };
 
 typedef std::map<LLUUID,LLAccessEntry>::iterator access_map_iterator;
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
index 2a27f3fc8d..e4f8b0dffd 100644
--- a/indra/llinventory/llpermissions.cpp
+++ b/indra/llinventory/llpermissions.cpp
@@ -954,6 +954,8 @@ void LLMetaClassT<LLPermissions>::reflectProperties(LLMetaClass& meta_class)
 {
 	reflectProperty(meta_class, "mCreator", &LLPermissions::mCreator);
 	reflectProperty(meta_class, "mOwner", &LLPermissions::mOwner);
+	reflectProperty(meta_class, "mGroup", &LLPermissions::mGroup);
+	reflectProperty(meta_class, "mIsGroupOwned", &LLPermissions::mIsGroupOwned);
 }
 
 // virtual
-- 
cgit v1.2.3


From 17b9cda4325a035f00e077a6a8e33a8c4f2d5a89 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 24 Jul 2009 00:46:26 +0000
Subject: For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP
 Changes [SIM]"

svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk

This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.
---
 indra/llcommon/CMakeLists.txt             |   1 +
 indra/llcommon/llassettype.cpp            | 340 ++++++++++++++++--------------
 indra/llcommon/llassettype.h              | 170 ++++++++-------
 indra/llcommon/lldictionary.h             | 106 ++++++++++
 indra/llcommon/stdenums.h                 |   3 +-
 indra/llinventory/llinventory.cpp         |  54 ++++-
 indra/llinventory/llinventory.h           |  26 ++-
 indra/llinventory/llinventorytype.cpp     | 241 ++++++++++-----------
 indra/llinventory/llinventorytype.h       |  10 +-
 indra/llinventory/llparcel.h              |   4 +-
 indra/llinventory/llpermissions.cpp       |  11 +
 indra/llinventory/llpermissions.h         |   3 +
 indra/llmessage/lltransfersourceasset.cpp |  48 +++--
 indra/llmessage/message_prehash.cpp       |   1 +
 indra/llmessage/message_prehash.h         |   1 +
 indra/newview/llinventorybridge.cpp       |   9 +-
 indra/newview/llviewerinventory.cpp       |   4 +-
 17 files changed, 635 insertions(+), 397 deletions(-)
 create mode 100644 indra/llcommon/lldictionary.h

(limited to 'indra')

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index beac8df636..7bfcd43684 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -99,6 +99,7 @@ set(llcommon_HEADER_FILES
     lldefs.h
     lldependencies.h
     lldepthstack.h
+    lldictionary.h
     lldlinked.h
     lldqueueptr.h
     llendianswizzle.h
diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp
index cf3bf89b4f..b852e4c00f 100644
--- a/indra/llcommon/llassettype.cpp
+++ b/indra/llcommon/llassettype.cpp
@@ -33,145 +33,125 @@
 #include "linden_common.h"
 
 #include "llassettype.h"
+#include "lldictionary.h"
+#include "llmemory.h"
 
-#include "llstring.h"
-#include "lltimer.h"
+///----------------------------------------------------------------------------
+/// Class LLAssetType
+///----------------------------------------------------------------------------
+struct AssetEntry : public LLDictionaryEntry
+{
+	AssetEntry(const char *desc_name,
+			   const char *type_name, // 8 character limit!
+			   const char *human_name, // for decoding to human readable form; put any and as many printable characters you want in each one
+			   const char *category_name, // used by llinventorymodel when creating new categories
+			   EDragAndDropType dad_type,
+			   bool can_link, // can you create a link to this type?
+			   bool is_protected) // can the viewer change categories of this type?
+		:
+		LLDictionaryEntry(desc_name),
+		mTypeName(type_name),
+		mHumanName(human_name),
+		mCategoryName(category_name),
+		mDadType(dad_type),
+		mCanLink(can_link),
+		mIsProtected(is_protected)
+	{
+		llassert(strlen(mTypeName) <= 8);
+	}
 
-// I added lookups for exact text of asset type enums in addition to the ones below, so shoot me. -Steve
+	const char *mTypeName;
+	const char *mHumanName;
+	const char *mCategoryName;
+	EDragAndDropType mDadType;
+	bool mCanLink;
+	bool mIsProtected;
+};
 
-struct asset_info_t
+class LLAssetDictionary : public LLSingleton<LLAssetDictionary>,
+						  public LLDictionary<LLAssetType::EType, AssetEntry>
 {
-	LLAssetType::EType type;
-	const char* desc;
+public:
+	LLAssetDictionary();
 };
 
-asset_info_t asset_types[] =
+LLAssetDictionary::LLAssetDictionary()
 {
-	{ LLAssetType::AT_TEXTURE, "TEXTURE" },
-	{ LLAssetType::AT_SOUND, "SOUND" },
-	{ LLAssetType::AT_CALLINGCARD, "CALLINGCARD" },
-	{ LLAssetType::AT_LANDMARK, "LANDMARK" },
-	{ LLAssetType::AT_SCRIPT, "SCRIPT" },
-	{ LLAssetType::AT_CLOTHING, "CLOTHING" },
-	{ LLAssetType::AT_OBJECT, "OBJECT" },
-	{ LLAssetType::AT_NOTECARD, "NOTECARD" },
-	{ LLAssetType::AT_CATEGORY, "CATEGORY" },
-	{ LLAssetType::AT_ROOT_CATEGORY, "ROOT_CATEGORY" },
-	{ LLAssetType::AT_LSL_TEXT, "LSL_TEXT" },
-	{ LLAssetType::AT_LSL_BYTECODE, "LSL_BYTECODE" },
-	{ LLAssetType::AT_TEXTURE_TGA, "TEXTURE_TGA" },
-	{ LLAssetType::AT_BODYPART, "BODYPART" },
-	{ LLAssetType::AT_TRASH, "TRASH" },
-	{ LLAssetType::AT_SNAPSHOT_CATEGORY, "SNAPSHOT_CATEGORY" },
-	{ LLAssetType::AT_LOST_AND_FOUND, "LOST_AND_FOUND" },
-	{ LLAssetType::AT_SOUND_WAV, "SOUND_WAV" },
-	{ LLAssetType::AT_IMAGE_TGA, "IMAGE_TGA" },
-	{ LLAssetType::AT_IMAGE_JPEG, "IMAGE_JPEG" },
-	{ LLAssetType::AT_ANIMATION, "ANIMATION" },
-	{ LLAssetType::AT_GESTURE, "GESTURE" },
-	{ LLAssetType::AT_SIMSTATE, "SIMSTATE" },
-	{ LLAssetType::AT_NONE, "NONE" },
+	//       												   DESCRIPTION			TYPE NAME	HUMAN NAME			CATEGORY NAME 		DRAG&DROP		CAN LINK?	PROTECTED?
+	//      												  |--------------------|-----------|-------------------|-------------------|---------------|-----------|-----------|
+	addEntry(LLAssetType::AT_TEXTURE, 			new AssetEntry("TEXTURE",			"texture",	"texture",			"Textures", 		DAD_TEXTURE,	FALSE,		TRUE));
+	addEntry(LLAssetType::AT_SOUND, 			new AssetEntry("SOUND",				"sound",	"sound",			"Sounds", 			DAD_SOUND,		FALSE,		TRUE));
+	addEntry(LLAssetType::AT_CALLINGCARD, 		new AssetEntry("CALLINGCARD",		"callcard",	"calling card",		"Calling Cards", 	DAD_CALLINGCARD, FALSE,		TRUE));
+	addEntry(LLAssetType::AT_LANDMARK, 			new AssetEntry("LANDMARK",			"landmark",	"landmark",			"Landmarks", 		DAD_LANDMARK,	FALSE,		TRUE));
+	addEntry(LLAssetType::AT_SCRIPT, 			new AssetEntry("SCRIPT",			"script",	"legacy script",	"Scripts", 			DAD_NONE,		FALSE,		TRUE));
+	addEntry(LLAssetType::AT_CLOTHING, 			new AssetEntry("CLOTHING",			"clothing",	"clothing",			"Clothing", 		DAD_CLOTHING,	TRUE,		TRUE));
+	addEntry(LLAssetType::AT_OBJECT, 			new AssetEntry("OBJECT",			"object",	"object",			"Objects", 			DAD_OBJECT,		TRUE,		TRUE));
+	addEntry(LLAssetType::AT_NOTECARD, 			new AssetEntry("NOTECARD",			"notecard",	"note card",		"Notecards", 		DAD_NOTECARD,	FALSE,		TRUE));
+	addEntry(LLAssetType::AT_CATEGORY, 			new AssetEntry("CATEGORY",			"category",	"folder",			"New Folder", 		DAD_CATEGORY,	TRUE,		TRUE));
+	addEntry(LLAssetType::AT_ROOT_CATEGORY, 	new AssetEntry("ROOT_CATEGORY",		"root",		"root",				"Inventory", 		DAD_ROOT_CATEGORY, TRUE,	TRUE));
+	addEntry(LLAssetType::AT_LSL_TEXT, 			new AssetEntry("LSL_TEXT",			"lsltext",	"lsl2 script",		"Scripts", 			DAD_SCRIPT,		FALSE,		TRUE));
+	addEntry(LLAssetType::AT_LSL_BYTECODE, 		new AssetEntry("LSL_BYTECODE",		"lslbyte",	"lsl bytecode",		"Scripts", 			DAD_NONE,		FALSE,		TRUE));
+	addEntry(LLAssetType::AT_TEXTURE_TGA, 		new AssetEntry("TEXTURE_TGA",		"txtr_tga",	"tga texture",		"Uncompressed Images", DAD_NONE,	FALSE,		TRUE));
+	addEntry(LLAssetType::AT_BODYPART, 			new AssetEntry("BODYPART",			"bodypart",	"body part",		"Body Parts", 		DAD_BODYPART,	TRUE,		TRUE));
+	addEntry(LLAssetType::AT_TRASH, 			new AssetEntry("TRASH",				"trash",	"trash",			"Trash", 			DAD_NONE,		FALSE,		TRUE));
+	addEntry(LLAssetType::AT_SNAPSHOT_CATEGORY, new AssetEntry("SNAPSHOT_CATEGORY", "snapshot",	"snapshot",			"Photo Album", 		DAD_NONE,		FALSE,		TRUE));
+	addEntry(LLAssetType::AT_LOST_AND_FOUND, 	new AssetEntry("LOST_AND_FOUND", 	"lstndfnd",	"lost and found",	"Lost And Found", 	DAD_NONE,		FALSE,		TRUE));
+	addEntry(LLAssetType::AT_SOUND_WAV, 		new AssetEntry("SOUND_WAV",			"snd_wav",	"sound",			"Uncompressed SoundS", DAD_NONE,	FALSE,		TRUE));
+	addEntry(LLAssetType::AT_IMAGE_TGA, 		new AssetEntry("IMAGE_TGA",			"img_tga",	"targa image",		"Uncompressed Images", DAD_NONE,	FALSE,		TRUE));
+	addEntry(LLAssetType::AT_IMAGE_JPEG, 		new AssetEntry("IMAGE_JPEG",		"jpeg",		"jpeg image",		"Uncompressed Images", DAD_NONE,	FALSE,		TRUE));
+	addEntry(LLAssetType::AT_ANIMATION, 		new AssetEntry("ANIMATION",			"animatn",	"animation",		"Animations", 		DAD_ANIMATION,	FALSE,		TRUE));
+	addEntry(LLAssetType::AT_GESTURE, 			new AssetEntry("GESTURE",			"gesture",	"gesture",			"Gestures", 		DAD_GESTURE,	FALSE,		TRUE));
+	addEntry(LLAssetType::AT_SIMSTATE, 			new AssetEntry("SIMSTATE",			"simstate",	"simstate",			"New Folder", 		DAD_NONE,		FALSE,		TRUE));
+	addEntry(LLAssetType::AT_FAVORITE, 			new AssetEntry("FAVORITE",			"favorite",	"favorite",			"favorite", 		DAD_NONE,		FALSE,		TRUE));
+
+	addEntry(LLAssetType::AT_LINK, 				new AssetEntry("LINK",				"link",		"symbolic link",	"Link", 			DAD_LINK,		FALSE,		TRUE));
+	addEntry(LLAssetType::AT_LINK_FOLDER, 		new AssetEntry("FOLDER_LINK",		"link_f", 	"symbolic folder link", "New Folder", 	DAD_LINK,		FALSE,		TRUE));
+
+	for (S32 ensemble_num = S32(LLAssetType::AT_FOLDER_ENSEMBLE_START); 
+		 ensemble_num <= S32(LLAssetType::AT_FOLDER_ENSEMBLE_END); 
+		 ensemble_num++)
+	{
+		addEntry(LLAssetType::EType(ensemble_num), new AssetEntry("ENSEMBLE",		"ensemble", "ensemble", 		"New Folder", 		DAD_CATEGORY,	TRUE,		FALSE)); 
+	}
+
+	addEntry(LLAssetType::AT_CURRENT_OUTFIT, 	new AssetEntry("CURRENT",			"current",	"current outfit",	"Current Outfit", 	DAD_CATEGORY,	FALSE,		TRUE));
+	addEntry(LLAssetType::AT_OUTFIT, 			new AssetEntry("OUTFIT",			"outfit",	"outfit",			"Outfit", 			DAD_CATEGORY,	TRUE,		FALSE));
+	addEntry(LLAssetType::AT_MY_OUTFITS, 		new AssetEntry("MY_OUTFITS",		"my_otfts",	"my outfits",		"My Outfits", 		DAD_CATEGORY,	FALSE,		TRUE));
+		 
+	addEntry(LLAssetType::AT_NONE, 				new AssetEntry("NONE",				"-1",		NULL,		  		"New Folder", 		DAD_NONE,		FALSE,		FALSE));
 };
 
-LLAssetType::EType LLAssetType::getType(const std::string& sin)
+// static
+LLAssetType::EType LLAssetType::getType(const std::string& desc_name)
 {
-	std::string s = sin;
+	std::string s = desc_name;
 	LLStringUtil::toUpper(s);
-	for (S32 idx = 0; ;idx++)
-	{
-		asset_info_t* info = asset_types + idx;
-		if (info->type == LLAssetType::AT_NONE)
-			break;
-		if (s == info->desc)
-			return info->type;
-	}
-	return LLAssetType::AT_NONE;
+	return LLAssetDictionary::getInstance()->lookup(s);
 }
 
-std::string LLAssetType::getDesc(LLAssetType::EType type)
+// static
+const std::string &LLAssetType::getDesc(LLAssetType::EType asset_type)
 {
-	for (S32 idx = 0; ;idx++)
+	const AssetEntry *entry = LLAssetDictionary::getInstance()->lookup(asset_type);
+	if (entry)
+	{
+		return entry->mName;
+	}
+	else
 	{
-		asset_info_t* info = asset_types + idx;
-		if (type == info->type)
-			return info->desc;
-		if (info->type == LLAssetType::AT_NONE)
-			break;
+		static const std::string error_string = "BAD TYPE";
+		return error_string;
 	}
-	return "BAD TYPE";
 }
 
-//============================================================================
-
-// The asset type names are limited to 8 characters.
-// static
-const char* LLAssetType::mAssetTypeNames[LLAssetType::AT_COUNT] =
-{ 
-	"texture",
-	"sound",
-	"callcard",
-	"landmark",
-	"script",
-	"clothing",
-	"object",
-	"notecard",
-	"category",
-	"root",
-	"lsltext",
-	"lslbyte",
-	"txtr_tga",// Intentionally spelled this way.  Limited to eight characters.
-	"bodypart",
-	"trash",
-	"snapshot",
-	"lstndfnd",
-	"snd_wav",
-	"img_tga",
-	"jpeg",
-	"animatn",
-	"gesture",
-	"simstate"
-};
-
-// This table is meant for decoding to human readable form. Put any
-// and as many printable characters you want in each one.
-// See also llinventory.cpp INVENTORY_TYPE_HUMAN_NAMES
-const char* LLAssetType::mAssetTypeHumanNames[LLAssetType::AT_COUNT] =
-{ 
-	"texture",
-	"sound",
-	"calling card",
-	"landmark",
-	"legacy script",
-	"clothing",
-	"object",
-	"note card",
-	"folder",
-	"root",
-	"lsl2 script",
-	"lsl bytecode",
-	"tga texture",
-	"body part",
-	"trash",
-	"snapshot",
-	"lost and found",
-	"sound",
-	"targa image",
-	"jpeg image",
-	"animation",
-	"gesture",
-	"simstate"
-};
-
-///----------------------------------------------------------------------------
-/// class LLAssetType
-///----------------------------------------------------------------------------
-
 // static
-const char* LLAssetType::lookup( LLAssetType::EType type )
+const char *LLAssetType::lookup(LLAssetType::EType asset_type)
 {
-	if( (type >= 0) && (type < AT_COUNT ))
+	const LLAssetDictionary *dict = LLAssetDictionary::getInstance();
+	const AssetEntry *entry = dict->lookup(asset_type);
+	if (entry)
 	{
-		return mAssetTypeNames[ S32( type ) ];
+		return entry->mTypeName;
 	}
 	else
 	{
@@ -180,30 +160,35 @@ const char* LLAssetType::lookup( LLAssetType::EType type )
 }
 
 // static
-LLAssetType::EType LLAssetType::lookup( const char* name )
+LLAssetType::EType LLAssetType::lookup(const char* name)
 {
 	return lookup(ll_safe_string(name));
 }
 
-LLAssetType::EType LLAssetType::lookup( const std::string& name )
+LLAssetType::EType LLAssetType::lookup(const std::string& type_name)
 {
-	for( S32 i = 0; i < AT_COUNT; i++ )
+	const LLAssetDictionary *dict = LLAssetDictionary::getInstance();
+	for (LLAssetDictionary::const_iterator iter = dict->begin();
+		 iter != dict->end();
+		 iter++)
 	{
-		if( name == mAssetTypeNames[i] )
+		const AssetEntry *entry = iter->second;
+		if (type_name == entry->mTypeName)
 		{
-			// match
-			return (EType)i;
+			return iter->first;
 		}
 	}
 	return AT_NONE;
 }
 
 // static
-const char* LLAssetType::lookupHumanReadable(LLAssetType::EType type)
+const char *LLAssetType::lookupHumanReadable(LLAssetType::EType asset_type)
 {
-	if( (type >= 0) && (type < AT_COUNT ))
+	const LLAssetDictionary *dict = LLAssetDictionary::getInstance();
+	const AssetEntry *entry = dict->lookup(asset_type);
+	if (entry)
 	{
-		return mAssetTypeHumanNames[S32(type)];
+		return entry->mHumanName;
 	}
 	else
 	{
@@ -212,49 +197,94 @@ const char* LLAssetType::lookupHumanReadable(LLAssetType::EType type)
 }
 
 // static
-LLAssetType::EType LLAssetType::lookupHumanReadable( const char* name )
+LLAssetType::EType LLAssetType::lookupHumanReadable(const char* name)
 {
 	return lookupHumanReadable(ll_safe_string(name));
 }
 
-LLAssetType::EType LLAssetType::lookupHumanReadable( const std::string& name )
+LLAssetType::EType LLAssetType::lookupHumanReadable(const std::string& readable_name)
 {
-	for( S32 i = 0; i < AT_COUNT; i++ )
+	const LLAssetDictionary *dict = LLAssetDictionary::getInstance();
+	for (LLAssetDictionary::const_iterator iter = dict->begin();
+		 iter != dict->end();
+		 iter++)
 	{
-		if( name == mAssetTypeHumanNames[i] )
+		const AssetEntry *entry = iter->second;
+		if (readable_name == entry->mHumanName)
 		{
-			// match
-			return (EType)i;
+			return iter->first;
 		}
 	}
 	return AT_NONE;
 }
 
-EDragAndDropType LLAssetType::lookupDragAndDropType( EType asset )
+// static
+const char *LLAssetType::lookupCategoryName(LLAssetType::EType asset_type)
+{
+	const LLAssetDictionary *dict = LLAssetDictionary::getInstance();
+	const AssetEntry *entry = dict->lookup(asset_type);
+	if (entry)
+	{
+		return entry->mCategoryName;
+	}
+	else
+	{
+		return "New Folder";
+	}
+}
+
+// static
+EDragAndDropType LLAssetType::lookupDragAndDropType(EType asset_type)
+{
+	const LLAssetDictionary *dict = LLAssetDictionary::getInstance();
+	const AssetEntry *entry = dict->lookup(asset_type);
+	if (entry)
+		return entry->mDadType;
+	else
+		return DAD_NONE;
+}
+
+// static
+bool LLAssetType::lookupCanLink(EType asset_type)
+{
+	const LLAssetDictionary *dict = LLAssetDictionary::getInstance();
+	const AssetEntry *entry = dict->lookup(asset_type);
+	if (entry)
+	{
+		return entry->mCanLink;
+	}
+	return false;
+}
+
+// static
+// Not adding this to dictionary since we probably will only have these two types
+bool LLAssetType::lookupIsLinkType(EType asset_type)
+{
+	if (asset_type == AT_LINK || asset_type == AT_LINK_FOLDER)
+	{
+		return true;
+	}
+	return false;
+}
+
+// static
+// Only ensembles and plain folders aren't protected.  "Protected" means
+// you can't change certain properties such as their type.
+bool LLAssetType::lookupIsProtectedCategoryType(EType asset_type)
 {
-	switch( asset )
+	const LLAssetDictionary *dict = LLAssetDictionary::getInstance();
+	const AssetEntry *entry = dict->lookup(asset_type);
+	if (entry)
 	{
-	case AT_TEXTURE:		return DAD_TEXTURE;
-	case AT_SOUND:			return DAD_SOUND;
-	case AT_CALLINGCARD:	return DAD_CALLINGCARD;
-	case AT_LANDMARK:		return DAD_LANDMARK;
-	case AT_SCRIPT:			return DAD_NONE;
-	case AT_CLOTHING:		return DAD_CLOTHING;
-	case AT_OBJECT:			return DAD_OBJECT;
-	case AT_NOTECARD:		return DAD_NOTECARD;
-	case AT_CATEGORY:		return DAD_CATEGORY;
-	case AT_ROOT_CATEGORY:	return DAD_ROOT_CATEGORY;
-	case AT_LSL_TEXT:		return DAD_SCRIPT;
-	case AT_BODYPART:		return DAD_BODYPART;
-	case AT_ANIMATION:		return DAD_ANIMATION;
-	case AT_GESTURE:		return DAD_GESTURE;
-	default: 				return DAD_NONE;
-	};
+		return entry->mIsProtected;
+	}
+	return true;
 }
 
+
 // static. Generate a good default description
-void LLAssetType::generateDescriptionFor(LLAssetType::EType type,
-										 std::string& desc)
+void LLAssetType::generateDescriptionFor(LLAssetType::EType asset_type,
+										 std::string& description)
 {
 	const S32 BUF_SIZE = 30;
 	char time_str[BUF_SIZE];	/* Flawfinder: ignore */
@@ -262,6 +292,6 @@ void LLAssetType::generateDescriptionFor(LLAssetType::EType type,
 	time(&now);
 	memset(time_str, '\0', BUF_SIZE);
 	strftime(time_str, BUF_SIZE - 1, "%Y-%m-%d %H:%M:%S ", localtime(&now));
-	desc.assign(time_str);
-	desc.append(LLAssetType::lookupHumanReadable(type));
+	description.assign(time_str);
+	description.append(LLAssetType::lookupHumanReadable(asset_type));
 }
diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h
index 4077b8d2c1..5c30c8354f 100644
--- a/indra/llcommon/llassettype.h
+++ b/indra/llcommon/llassettype.h
@@ -30,8 +30,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLASSETTYPE
-#define LL_LLASSETTYPE
+#ifndef LL_LLASSETTYPE_H
+#define LL_LLASSETTYPE_H
 
 #include <string>
 
@@ -42,137 +42,163 @@ class LLAssetType
 public:
 	enum EType
 	{
-		// Used for painting the faces of geometry.
-		// Stored in typical j2c stream format
 		AT_TEXTURE = 0,
+			// Used for painting the faces of geometry.
+			// Stored in typical j2c stream format.
 
-		// Used to fill the aural spectrum.
 		AT_SOUND = 1, 
+			// Used to fill the aural spectrum.
 
-		// Links instant message access to the user on the card. eg, a
-		// card for yourself, a card for linden support, a card for
-		// the guy you were talking to in the coliseum.
 		AT_CALLINGCARD = 2,
+		    // Links instant message access to the user on the card.
+			// : E.G. A card for yourself, for linden support, for
+			// : the guy you were talking to in the coliseum.
 
-		// Links to places in the world with location and a screen
-		// shot or image saved. eg, home, linden headquarters, the
-		// coliseum, or destinations where we want to increase
-		// traffic.
 		AT_LANDMARK = 3,
+			// Links to places in the world with location and a screen shot or image saved.
+			// : E.G. Home, linden headquarters, the coliseum, destinations where 
+			// : we want to increase traffic.
 
-		// Valid scripts that can be attached to an object. eg. open a
-		// door, jump into the air.
 		AT_SCRIPT = 4,
+			// Valid scripts that can be attached to an object.
+			// : E.G. Open a door, jump into the air.
 
-		// A collection of textures and parameters that can be worn
-		// by an avatar.
 		AT_CLOTHING = 5,
+			// A collection of textures and parameters that can be worn by an avatar.
 
-		// Any combination of textures, sounds, and scripts that are
-		// associated with a fixed piece of geometry. eg, a hot tub, a
-		// house with working door.
 		AT_OBJECT = 6,
+			// Any combination of textures, sounds, and scripts that are
+			// associated with a fixed piece of geometry.
+			// : E.G. A hot tub, a house with working door.
 
-		// Just text
 		AT_NOTECARD = 7,
+			// Just text.
 
-		// A category holds a collection of inventory items. It's
-		// treated as an item in the inventory, and therefore needs a
-		// type.
 		AT_CATEGORY = 8,
+			// Holds a collection of inventory items.
+			// It's treated as an item in the inventory and therefore needs a type.
 
-		// A root category is a user's root inventory category. We
-		// decided to expose it visually, so it seems logical to fold
-		// it into the asset types.
 		AT_ROOT_CATEGORY = 9,
+			// A user's root inventory category.
+			// We decided to expose it visually, so it seems logical to fold
+			// it into the asset types.
 
-		// The LSL is the brand spanking new scripting language. We've
-		// split it into a text and bytecode representation.
 		AT_LSL_TEXT = 10,
 		AT_LSL_BYTECODE = 11,
+			// The LSL is the scripting language. 
+			// We've split it into a text and bytecode representation.
 		
-		// uncompressed TGA texture
 		AT_TEXTURE_TGA = 12,
+			// Uncompressed TGA texture.
 
-		// A collection of textures and parameters that can be worn
-		// by an avatar.
 		AT_BODYPART = 13,
+			// A collection of textures and parameters that can be worn by an avatar.
 
-		// This asset type is meant to only be used as a marker for a
-		// category preferred type. Using this, we can throw things in
-		// the trash before completely deleting.
 		AT_TRASH = 14,
+			// Only to be used as a marker for a category preferred type. 
+			// Using this, we can throw things in the trash before completely deleting.
 
-		// This is a marker for a folder meant for snapshots. No
-		// actual assets will be snapshots, though if there were, you
-		// could interpret them as textures.
 		AT_SNAPSHOT_CATEGORY = 15,
+			// A marker for a folder meant for snapshots. 
+			// No actual assets will be snapshots, though if there were, you
+			// could interpret them as textures.
 
-		// This is used to stuff lost&found items into
 		AT_LOST_AND_FOUND = 16,
+			// Used to stuff lost&found items into.
 
-		// uncompressed sound
 		AT_SOUND_WAV = 17,
+			// Uncompressed sound.
 
-		// uncompressed image, non-square, and not appropriate for use
-		// as a texture.
 		AT_IMAGE_TGA = 18,
+			// Uncompressed image, non-square.
+			// Not appropriate for use as a texture.
 
-		// compressed image, non-square, and not appropriate for use
-		// as a texture.
 		AT_IMAGE_JPEG = 19,
+			// Compressed image, non-square.
+			// Not appropriate for use as a texture.
 
-		// animation
 		AT_ANIMATION = 20,
+			// Animation.
 
-		// gesture, sequence of animations, sounds, chat, wait steps
 		AT_GESTURE = 21,
+			// Gesture, sequence of animations, sounds, chat, wait steps.
 
-		// simstate file
 		AT_SIMSTATE = 22,
+			// Simstate file.
 
-		// +*********************************************+
-		// |  TO ADD AN ELEMENT TO THIS ENUM:            |
-		// +*********************************************+
-		// | 1. INSERT BEFORE AT_COUNT                   |
-		// | 2. INCREMENT AT_COUNT BY 1                  |
-		// | 3. ADD TO LLAssetType::mAssetTypeNames      |
-		// | 4. ADD TO LLAssetType::mAssetTypeHumanNames |
-		// +*********************************************+
+		AT_FAVORITE = 23,
+			// favorite items
 
-		AT_COUNT = 23,
+		AT_LINK = 24,
+			// Inventory symbolic link
+
+		AT_LINK_FOLDER = 25,
+			// Inventory folder link
+
+		AT_FOLDER_ENSEMBLE_START = 26,
+		AT_FOLDER_ENSEMBLE_END = 45,
+			// This range is reserved for special clothing folder types.
+
+		AT_CURRENT_OUTFIT = 46,
+			// Current outfit
+
+		AT_OUTFIT = 47,
+			// Predefined outfit ("look")
+
+		AT_MY_OUTFITS = 48,
+			// Folder that holds your outfits.
+
+		
+		AT_COUNT = 49,
+
+			// +*********************************************************+
+			// |  TO ADD AN ELEMENT TO THIS ENUM:                        |
+			// +*********************************************************+
+			// | 1. INSERT BEFORE AT_COUNT                               |
+			// | 2. INCREMENT AT_COUNT BY 1                              |
+			// | 3. ADD TO LLAssetDictionary in LLAssetType.cpp          |
+			// | 3. ADD TO DEFAULT_ASSET_FOR_INV in LLInventoryType.cpp  |
+			// +*********************************************************+
 
 		AT_NONE = -1
 	};
 
 	// machine transation between type and strings
-	static EType lookup(const char* name); // safe conversion to std::string, *TODO: deprecate
-	static EType lookup(const std::string& name);
-	static const char* lookup(EType type);
+	static EType 				lookup(const char* name); // safe conversion to std::string, *TODO: deprecate
+	static EType 				lookup(const std::string& type_name);
+	static const char*			lookup(EType asset_type);
 
 	// translation from a type to a human readable form.
-	static EType lookupHumanReadable( const char* name ); // safe conversion to std::string, *TODO: deprecate
-	static EType lookupHumanReadable( const std::string& name );
-	static const char* lookupHumanReadable(EType type);
-
-	static EDragAndDropType lookupDragAndDropType( EType );
+	static EType 				lookupHumanReadable(const char* desc_name); // safe conversion to std::string, *TODO: deprecate
+	static EType 				lookupHumanReadable(const std::string& readable_name);
+	static const char*			lookupHumanReadable(EType asset_type);
 
 	// Generate a good default description. You may want to add a verb
 	// or agent name after this depending on your application.
-	static void generateDescriptionFor(LLAssetType::EType type,
-									   std::string& desc);
+	static void 				generateDescriptionFor(LLAssetType::EType asset_type,
+													   std::string& description);
+
+	static EType 				getType(const std::string& desc_name);
+	static const std::string&	getDesc(EType asset_type);
+	static EDragAndDropType   	lookupDragAndDropType(EType asset_type);
+
+	static bool 				lookupCanLink(EType asset_type);
+	static bool 				lookupIsLinkType(EType asset_type);
 
-	static EType getType(const std::string& sin);
-	static std::string getDesc(EType type);
+	static const char*  		lookupCategoryName(EType asset_type);
+	static bool 				lookupIsProtectedCategoryType(EType asset_type);
+
+	/* TODO: Change return types from "const char *" to "const std::string &".
+	This is fairly straightforward, but requires changing some calls to use .c_str().
+	e.g.:
+	-	fprintf(fp, "\t\ttype\t%s\n", LLAssetType::lookup(mType));
+	+	fprintf(fp, "\t\ttype\t%s\n", LLAssetType::lookup(mType).c_str());
+	*/
 	
 private:
 	// don't instantiate or derive one of these objects
 	LLAssetType( void ) {}
 	~LLAssetType( void ) {}
-
-private:
-	static const char* mAssetTypeNames[];
-	static const char* mAssetTypeHumanNames[];
 };
 
-#endif // LL_LLASSETTYPE
+#endif // LL_LLASSETTYPE_H
diff --git a/indra/llcommon/lldictionary.h b/indra/llcommon/lldictionary.h
new file mode 100644
index 0000000000..436b689ca6
--- /dev/null
+++ b/indra/llcommon/lldictionary.h
@@ -0,0 +1,106 @@
+/** 
+ * @file lldictionary.h
+ * @brief Lldictionary class header file
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLDICTIONARY_H
+#define LL_LLDICTIONARY_H
+
+#include <map>
+
+struct LLDictionaryEntry
+{
+	LLDictionaryEntry(const std::string &name) :
+		mName(name)
+	{
+		mNameCapitalized = mName;
+		LLStringUtil::replaceChar(mNameCapitalized, '-', ' ');
+		LLStringUtil::replaceChar(mNameCapitalized, '_', ' ');
+		for (U32 i=0; i < mNameCapitalized.size(); i++)
+		{
+			if (i == 0 || mNameCapitalized[i-1] == ' ') // don't change ordering of this statement or crash
+			{
+				mNameCapitalized[i] = toupper(mNameCapitalized[i]);
+			}
+		}
+	}
+	virtual ~LLDictionaryEntry() {}
+	const std::string mName;
+	std::string mNameCapitalized;
+};
+
+template <class Index, class Entry>
+class LLDictionary : public std::map<Index, Entry *>
+{
+public:
+	typedef std::map<Index, Entry *> map_t;
+	typedef typename map_t::iterator iterator_t;
+	typedef typename map_t::const_iterator const_iterator_t;
+	
+	LLDictionary() {}
+	virtual ~LLDictionary()
+	{
+		for (iterator_t iter = map_t::begin(); iter != map_t::end(); ++iter)
+			delete (iter->second);
+	}
+
+	const Entry *lookup(Index index) const
+	{
+		const_iterator_t dictionary_iter = map_t::find(index);
+		if (dictionary_iter == map_t::end()) return NULL;
+		return dictionary_iter->second;
+	}
+	const Index lookup(const std::string &name) const 
+	{
+		for (const_iterator_t dictionary_iter = map_t::begin();
+			 dictionary_iter != map_t::end();
+			 dictionary_iter++)
+		{
+			const Entry *entry = dictionary_iter->second;
+			if (entry->mName == name)
+			{
+				return dictionary_iter->first;
+			}
+		}
+		llassert(false);
+		return Index(-1);
+	}
+
+protected:
+	void addEntry(Index index, Entry *entry)
+	{
+		if (lookup(index))
+		{
+			llerrs << "Dictionary entry already added (attempted to add duplicate entry)" << llendl;
+		}
+		(*this)[index] = entry;
+	}
+};
+
+#endif // LL_LLDICTIONARY_H
diff --git a/indra/llcommon/stdenums.h b/indra/llcommon/stdenums.h
index 41da51fce3..1a5678dde1 100644
--- a/indra/llcommon/stdenums.h
+++ b/indra/llcommon/stdenums.h
@@ -54,7 +54,8 @@ enum EDragAndDropType
 	DAD_BODYPART		= 11,
 	DAD_ANIMATION		= 12,
 	DAD_GESTURE			= 13,
-	DAD_COUNT			= 14,   // number of types in this enum
+	DAD_LINK			= 14,
+	DAD_COUNT			= 15,   // number of types in this enum
 };
 
 // Reasons for drags to be denied.
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 2823cf7be9..e45bb59881 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -126,6 +126,20 @@ const std::string& LLInventoryObject::getName() const
 	return mName;
 }
 
+// To bypass linked items, since llviewerinventory's getType
+// will return the linked-to item's type instead of this object's type.
+LLAssetType::EType LLInventoryObject::getActualType() const
+{
+	return mType;
+}
+
+// See LLInventoryItem override.
+// virtual
+const LLUUID& LLInventoryObject::getLinkedUUID() const
+{
+	return mUUID;
+}
+
 LLAssetType::EType LLInventoryObject::getType() const
 {
 	return mType;
@@ -296,6 +310,7 @@ LLInventoryItem::LLInventoryItem(
 {
 	LLStringUtil::replaceNonstandardASCII(mDescription, ' ');
 	LLStringUtil::replaceChar(mDescription, '|', ' ');
+	mPermissions.initMasks(inv_type);
 }
 
 LLInventoryItem::LLInventoryItem() :
@@ -333,6 +348,19 @@ void LLInventoryItem::copyItem(const LLInventoryItem* other)
 	mCreationDate = other->mCreationDate;
 }
 
+// If this is a linked item, then the UUID of the base object is
+// this item's assetID.
+// virtual
+const LLUUID& LLInventoryItem::getLinkedUUID() const
+{
+	if (LLAssetType::lookupIsLinkType(getActualType()))
+	{
+		return mAssetUUID;
+	}
+
+	return LLInventoryObject::getLinkedUUID();
+}
+
 const LLPermissions& LLInventoryItem::getPermissions() const
 {
 	return mPermissions;
@@ -405,6 +433,9 @@ void LLInventoryItem::setDescription(const std::string& d)
 void LLInventoryItem::setPermissions(const LLPermissions& perm)
 {
 	mPermissions = perm;
+
+	// Override permissions to unrestricted if this is a landmark
+	mPermissions.initMasks(mInventoryType);
 }
 
 void LLInventoryItem::setInventoryType(LLInventoryType::EType inv_type)
@@ -476,6 +507,7 @@ BOOL LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32
 	mType = static_cast<LLAssetType::EType>(type);
 	msg->getS8(block, "InvType", type, block_num);
 	mInventoryType = static_cast<LLInventoryType::EType>(type);
+	mPermissions.initMasks(mInventoryType);
 
 	msg->getU32Fast(block, _PREHASH_Flags, mFlags, block_num);
 
@@ -666,6 +698,9 @@ BOOL LLInventoryItem::importFile(LLFILE* fp)
 		lldebugs << "Resetting inventory type for " << mUUID << llendl;
 		mInventoryType = LLInventoryType::defaultForAssetType(mType);
 	}
+
+	mPermissions.initMasks(mInventoryType);
+
 	return success;
 }
 
@@ -705,8 +740,8 @@ BOOL LLInventoryItem::exportFile(LLFILE* fp, BOOL include_asset_key) const
 		fprintf(fp, "\t\tasset_id\t%s\n", uuid_str.c_str());
 	}
 	fprintf(fp, "\t\ttype\t%s\n", LLAssetType::lookup(mType));
-	const char* inv_type_str = LLInventoryType::lookup(mInventoryType);
-	if(inv_type_str) fprintf(fp, "\t\tinv_type\t%s\n", inv_type_str);
+	const std::string inv_type_str = LLInventoryType::lookup(mInventoryType);
+	if(!inv_type_str.empty()) fprintf(fp, "\t\tinv_type\t%s\n", inv_type_str.c_str());
 	fprintf(fp, "\t\tflags\t%08x\n", mFlags);
 	mSaleInfo.exportFile(fp);
 	fprintf(fp, "\t\tname\t%s|\n", mName.c_str());
@@ -869,6 +904,9 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
 		lldebugs << "Resetting inventory type for " << mUUID << llendl;
 		mInventoryType = LLInventoryType::defaultForAssetType(mType);
 	}
+
+	mPermissions.initMasks(mInventoryType);
+
 	return success;
 }
 
@@ -908,8 +946,8 @@ BOOL LLInventoryItem::exportLegacyStream(std::ostream& output_stream, BOOL inclu
 		output_stream << "\t\tasset_id\t" << uuid_str << "\n";
 	}
 	output_stream << "\t\ttype\t" << LLAssetType::lookup(mType) << "\n";
-	const char* inv_type_str = LLInventoryType::lookup(mInventoryType);
-	if(inv_type_str) 
+	const std::string inv_type_str = LLInventoryType::lookup(mInventoryType);
+	if(!inv_type_str.empty()) 
 		output_stream << "\t\tinv_type\t" << inv_type_str << "\n";
 	std::string buffer;
 	buffer = llformat( "\t\tflags\t%08x\n", mFlags);
@@ -951,8 +989,8 @@ void LLInventoryItem::asLLSD( LLSD& sd ) const
 	}
 	sd[INV_ASSET_TYPE_LABEL] = LLAssetType::lookup(mType);
 	sd[INV_INVENTORY_TYPE_LABEL] = mInventoryType;
-	const char* inv_type_str = LLInventoryType::lookup(mInventoryType);
-	if(inv_type_str)
+	const std::string inv_type_str = LLInventoryType::lookup(mInventoryType);
+	if(!inv_type_str.empty())
 	{
 		sd[INV_INVENTORY_TYPE_LABEL] = inv_type_str;
 	}
@@ -1091,6 +1129,8 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd)
 		mInventoryType = LLInventoryType::defaultForAssetType(mType);
 	}
 
+	mPermissions.initMasks(mInventoryType);
+
 	return true;
 fail:
 	return false;
@@ -1698,7 +1738,7 @@ LLSD ll_create_sd_from_inventory_category(LLPointer<LLInventoryCategory> cat)
 	rv[INV_PARENT_ID_LABEL] = cat->getParentUUID();
 	rv[INV_NAME_LABEL] = cat->getName();
 	rv[INV_ASSET_TYPE_LABEL] = LLAssetType::lookup(cat->getType());
-	if(LLAssetType::AT_NONE != cat->getPreferredType())
+	if(LLAssetType::lookupIsProtectedCategoryType(cat->getPreferredType()))
 	{
 		rv[INV_PREFERRED_TYPE_LABEL] =
 			LLAssetType::lookup(cat->getPreferredType());
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index d34046c310..094aebe93b 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -91,8 +91,11 @@ public:
 	// accessors
 	virtual const LLUUID& getUUID() const;
 	const LLUUID& getParentUUID() const;
-	const std::string& getName() const;
-	LLAssetType::EType getType() const;
+	virtual const LLUUID& getLinkedUUID() const; // get the inventoryID that this item points to, else this item's inventoryID
+
+	virtual const std::string& getName() const;
+	virtual LLAssetType::EType getType() const;
+	LLAssetType::EType getActualType() const; // bypasses indirection for linked items
 
 	// mutators - will not call updateServer();
 	void setUUID(const LLUUID& new_uuid);
@@ -238,15 +241,16 @@ public:
 	void generateUUID() { mUUID.generate(); }
 	
 	// accessors
-	const LLPermissions& getPermissions() const;
-	const LLUUID& getCreatorUUID() const;
-	const LLUUID& getAssetUUID() const;
-	const std::string& getDescription() const;
-	const LLSaleInfo& getSaleInfo() const;
-	LLInventoryType::EType getInventoryType() const;
-	U32 getFlags() const;
-	time_t getCreationDate() const;
-	U32 getCRC32() const; // really more of a checksum.
+	virtual const LLUUID& getLinkedUUID() const;
+	virtual const LLPermissions& getPermissions() const;
+	virtual const LLUUID& getCreatorUUID() const;
+	virtual const LLUUID& getAssetUUID() const;
+	virtual const std::string& getDescription() const;
+	virtual const LLSaleInfo& getSaleInfo() const;
+	virtual LLInventoryType::EType getInventoryType() const;
+	virtual U32 getFlags() const;
+	virtual time_t getCreationDate() const;
+	virtual U32 getCRC32() const; // really more of a checksum.
 	
 	// mutators - will not call updateServer(), and will never fail
 	// (though it may correct to sane values)
diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp
index a161a0ee00..866d6722a0 100644
--- a/indra/llinventory/llinventorytype.cpp
+++ b/indra/llinventory/llinventorytype.cpp
@@ -33,66 +33,72 @@
 #include "linden_common.h"
 
 #include "llinventorytype.h"
+#include "lldictionary.h"
+#include "llmemory.h"
+
+static const std::string empty_string;
 
 ///----------------------------------------------------------------------------
 /// Class LLInventoryType
 ///----------------------------------------------------------------------------
-
-// Unlike asset type names, not limited to 8 characters.
-// Need not match asset type names.
-static const char* INVENTORY_TYPE_NAMES[LLInventoryType::IT_COUNT] =
-{ 
-	"texture",      // 0
-	"sound",
-	"callcard",
-	"landmark",
-	NULL,
-	NULL,           // 5
-	"object",
-	"notecard",
-	"category",
-	"root",
-	"script",       // 10
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	"snapshot",     // 15
-	NULL,
-	"attach",
-	"wearable",
-	"animation",
-	"gesture",		// 20
+struct InventoryEntry : public LLDictionaryEntry
+{
+	InventoryEntry(const std::string &name, // unlike asset type names, not limited to 8 characters; need not match asset type names
+				   const std::string &human_name, // for decoding to human readable form; put any and as many printable characters you want in each one.
+				   int num_asset_types = 0, ...)
+		:
+		LLDictionaryEntry(name),
+		mHumanName(human_name)
+	{
+		va_list argp;
+		va_start(argp, num_asset_types);
+		// Read in local textures
+		for (U8 i=0; i < num_asset_types; i++)
+		{
+			LLAssetType::EType t = (LLAssetType::EType)va_arg(argp,int);
+			mAssetTypes.push_back(t);
+		}
+	}
+		
+	const std::string mHumanName;
+	typedef std::vector<LLAssetType::EType> asset_vec_t;
+	asset_vec_t mAssetTypes;
 };
 
-// This table is meant for decoding to human readable form. Put any
-// and as many printable characters you want in each one.
-// See also LLAssetType::mAssetTypeHumanNames
-static const char* INVENTORY_TYPE_HUMAN_NAMES[LLInventoryType::IT_COUNT] =
-{ 
-	"texture",      // 0
-	"sound",
-	"calling card",
-	"landmark",
-	NULL,
-	NULL,           // 5
-	"object",
-	"note card",
-	"folder",
-	"root",
-	"script",       // 10
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	"snapshot",     // 15
-	NULL,
-	"attachment",
-	"wearable",
-	"animation",
-	"gesture",		// 20
+class LLInventoryDictionary : public LLSingleton<LLInventoryDictionary>,
+							  public LLDictionary<LLInventoryType::EType, InventoryEntry>
+{
+public:
+	LLInventoryDictionary();
 };
 
+LLInventoryDictionary::LLInventoryDictionary()
+{
+	addEntry(LLInventoryType::IT_TEXTURE,             new InventoryEntry("texture",   "texture",       1, LLAssetType::AT_TEXTURE));
+	addEntry(LLInventoryType::IT_SOUND,               new InventoryEntry("sound",     "sound",         1, LLAssetType::AT_SOUND));
+	addEntry(LLInventoryType::IT_CALLINGCARD,         new InventoryEntry("callcard",  "calling card",  1, LLAssetType::AT_CALLINGCARD));
+	addEntry(LLInventoryType::IT_LANDMARK,            new InventoryEntry("landmark",  "landmark",      1, LLAssetType::AT_LANDMARK));
+	//addEntry(LLInventoryType::IT_SCRIPT,            new InventoryEntry(NULL,NULL));
+	//addEntry(LLInventoryType::IT_CLOTHING,          new InventoryEntry(NULL,NULL));
+	addEntry(LLInventoryType::IT_OBJECT,              new InventoryEntry("object",    "object",        1, LLAssetType::AT_OBJECT));
+	addEntry(LLInventoryType::IT_NOTECARD,            new InventoryEntry("notecard",  "note card",     1, LLAssetType::AT_NOTECARD));
+	addEntry(LLInventoryType::IT_CATEGORY,            new InventoryEntry("category",  "folder"         ));
+	addEntry(LLInventoryType::IT_ROOT_CATEGORY,       new InventoryEntry("root",      "root"           ));
+	addEntry(LLInventoryType::IT_LSL,                 new InventoryEntry("script",    "script",        2, LLAssetType::AT_LSL_TEXT, LLAssetType::AT_LSL_BYTECODE));
+	//addEntry(LLInventoryType::IT_LSL_BYTECODE,      new InventoryEntry(NULL,NULL));
+	//addEntry(LLInventoryType::IT_TEXTURE_TGA,       new InventoryEntry(NULL,NULL));
+	//addEntry(LLInventoryType::IT_BODYPART,          new InventoryEntry(NULL,NULL));
+	//addEntry(LLInventoryType::IT_TRASH,             new InventoryEntry(NULL,NULL));
+	addEntry(LLInventoryType::IT_SNAPSHOT,            new InventoryEntry("snapshot",  "snapshot",      1, LLAssetType::AT_TEXTURE));
+	//addEntry(LLInventoryType::IT_LOST_AND_FOUND,    new InventoryEntry(NULL,NULL, ));
+	addEntry(LLInventoryType::IT_ATTACHMENT,          new InventoryEntry("attach",    "attachment",    1, LLAssetType::AT_OBJECT));
+	addEntry(LLInventoryType::IT_WEARABLE,            new InventoryEntry("wearable",  "wearable",      2, LLAssetType::AT_CLOTHING, LLAssetType::AT_BODYPART));
+	addEntry(LLInventoryType::IT_ANIMATION,           new InventoryEntry("animation", "animation",     1, LLAssetType::AT_ANIMATION));  
+	addEntry(LLInventoryType::IT_GESTURE,             new InventoryEntry("gesture",   "gesture",       1, LLAssetType::AT_GESTURE)); 
+	addEntry(LLInventoryType::IT_FAVORITE,            new InventoryEntry("favorite",  "favorite",      1, LLAssetType::AT_FAVORITE)); 
+}
+
+
 // Maps asset types to the default inventory type for that kind of asset.
 // Thus, "Lost and Found" is a "Category"
 static const LLInventoryType::EType
@@ -120,76 +126,60 @@ DEFAULT_ASSET_FOR_INV_TYPE[LLAssetType::AT_COUNT] =
 	LLInventoryType::IT_NONE,			// AT_IMAGE_JPEG
 	LLInventoryType::IT_ANIMATION,		// AT_ANIMATION
 	LLInventoryType::IT_GESTURE,		// AT_GESTURE
-};
+	LLInventoryType::IT_NONE,			// AT_SIMSTATE
+	LLInventoryType::IT_FAVORITE,		// AT_FAVORITE
 
-static const int MAX_POSSIBLE_ASSET_TYPES = 2;
-static const LLAssetType::EType
-INVENTORY_TO_ASSET_TYPE[LLInventoryType::IT_COUNT][MAX_POSSIBLE_ASSET_TYPES] =
-{
-	{ LLAssetType::AT_TEXTURE, LLAssetType::AT_NONE },		// IT_TEXTURE
-	{ LLAssetType::AT_SOUND, LLAssetType::AT_NONE },		// IT_SOUND
-	{ LLAssetType::AT_CALLINGCARD, LLAssetType::AT_NONE },	// IT_CALLINGCARD
-	{ LLAssetType::AT_LANDMARK, LLAssetType::AT_NONE },		// IT_LANDMARK
-	{ LLAssetType::AT_NONE, LLAssetType::AT_NONE },
-	{ LLAssetType::AT_NONE, LLAssetType::AT_NONE },
-	{ LLAssetType::AT_OBJECT, LLAssetType::AT_NONE },		// IT_OBJECT
-	{ LLAssetType::AT_NOTECARD, LLAssetType::AT_NONE },		// IT_NOTECARD
-	{ LLAssetType::AT_NONE, LLAssetType::AT_NONE },			// IT_CATEGORY
-	{ LLAssetType::AT_NONE, LLAssetType::AT_NONE },			// IT_ROOT_CATEGORY
-	{ LLAssetType::AT_LSL_TEXT, LLAssetType::AT_LSL_BYTECODE }, // IT_LSL
-	{ LLAssetType::AT_NONE, LLAssetType::AT_NONE },
-	{ LLAssetType::AT_NONE, LLAssetType::AT_NONE },
-	{ LLAssetType::AT_NONE, LLAssetType::AT_NONE },
-	{ LLAssetType::AT_NONE, LLAssetType::AT_NONE },
-	{ LLAssetType::AT_TEXTURE, LLAssetType::AT_NONE },		// IT_SNAPSHOT
-	{ LLAssetType::AT_NONE, LLAssetType::AT_NONE },
-	{ LLAssetType::AT_OBJECT, LLAssetType::AT_NONE },		// IT_ATTACHMENT
-	{ LLAssetType::AT_CLOTHING, LLAssetType::AT_BODYPART },	// IT_WEARABLE
-	{ LLAssetType::AT_ANIMATION, LLAssetType::AT_NONE },	// IT_ANIMATION
-	{ LLAssetType::AT_GESTURE, LLAssetType::AT_NONE },		// IT_GESTURE
+	LLInventoryType::IT_NONE,			// AT_LINK
+	LLInventoryType::IT_NONE,			// AT_LINK_FOLDER
+
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
+
+	LLInventoryType::IT_CATEGORY,		// AT_CURRENT_OUTFIT
+	LLInventoryType::IT_CATEGORY,		// AT_OUTFIT
+	LLInventoryType::IT_CATEGORY,		// AT_MY_OUTFITS
 };
 
 // static
-const char* LLInventoryType::lookup(EType type)
+const std::string &LLInventoryType::lookup(EType type)
 {
-	if((type >= 0) && (type < IT_COUNT))
-	{
-		return INVENTORY_TYPE_NAMES[S32(type)];
-	}
-	else
-	{
-		return NULL;
-	}
+	const InventoryEntry *entry = LLInventoryDictionary::getInstance()->lookup(type);
+	if (!entry) return empty_string;
+	return entry->mName;
 }
 
 // static
 LLInventoryType::EType LLInventoryType::lookup(const std::string& name)
 {
-	for(S32 i = 0; i < IT_COUNT; ++i)
-	{
-		if((INVENTORY_TYPE_NAMES[i])
-		   && (name == INVENTORY_TYPE_NAMES[i]))
-		{
-			// match
-			return (EType)i;
-		}
-	}
-	return IT_NONE;
+	return LLInventoryDictionary::getInstance()->lookup(name);
 }
 
 // XUI:translate
 // translation from a type to a human readable form.
 // static
-const char* LLInventoryType::lookupHumanReadable(EType type)
+const std::string &LLInventoryType::lookupHumanReadable(EType type)
 {
-	if((type >= 0) && (type < IT_COUNT))
-	{
-		return INVENTORY_TYPE_HUMAN_NAMES[S32(type)];
-	}
-	else
-	{
-		return NULL;
-	}
+	const InventoryEntry *entry = LLInventoryDictionary::getInstance()->lookup(type);
+	if (!entry) return empty_string;
+	return entry->mHumanName;
 }
 
 // return the default inventory for the given asset type.
@@ -206,21 +196,36 @@ LLInventoryType::EType LLInventoryType::defaultForAssetType(LLAssetType::EType a
 	}
 }
 
-bool inventory_and_asset_types_match(
-	LLInventoryType::EType inventory_type,
-	LLAssetType::EType asset_type)
+
+// add any types that we don't want the user to be able to change permissions on.
+// static
+bool LLInventoryType::cannotRestrictPermissions(LLInventoryType::EType type)
 {
-	bool rv = false;
-	if((inventory_type >= 0) && (inventory_type < LLInventoryType::IT_COUNT))
+	switch(type)
+	{
+		case IT_CALLINGCARD:
+		case IT_LANDMARK:
+			return true;
+		default:
+			return false;
+	}
+}
+
+bool inventory_and_asset_types_match(LLInventoryType::EType inventory_type,
+									 LLAssetType::EType asset_type)
+{
+	const InventoryEntry *entry = LLInventoryDictionary::getInstance()->lookup(inventory_type);
+	if (!entry) return false;
+
+	for (InventoryEntry::asset_vec_t::const_iterator iter = entry->mAssetTypes.begin();
+		 iter != entry->mAssetTypes.end();
+		 iter++)
 	{
-		for(S32 i = 0; i < MAX_POSSIBLE_ASSET_TYPES; ++i)
+		const LLAssetType::EType type = (*iter);
+		if(type == asset_type)
 		{
-			if(INVENTORY_TO_ASSET_TYPE[inventory_type][i] == asset_type)
-			{
-				rv = true;
-				break;
-			}
+			return true;
 		}
 	}
-	return rv;
+	return false;
 }
diff --git a/indra/llinventory/llinventorytype.h b/indra/llinventory/llinventorytype.h
index d3effc0e6d..8961ff96e7 100644
--- a/indra/llinventory/llinventorytype.h
+++ b/indra/llinventory/llinventorytype.h
@@ -67,21 +67,25 @@ public:
 		IT_WEARABLE = 18,
 		IT_ANIMATION = 19,
 		IT_GESTURE = 20,
-		IT_COUNT = 21,
+		IT_FAVORITE = 21,
+		IT_COUNT = 22,
 
 		IT_NONE = -1
 	};
 
 	// machine transation between type and strings
 	static EType lookup(const std::string& name);
-	static const char* lookup(EType type);
+	static const std::string &lookup(EType type);
 
 	// translation from a type to a human readable form.
-	static const char* lookupHumanReadable(EType type);
+	static const std::string &lookupHumanReadable(EType type);
 
 	// return the default inventory for the given asset type.
 	static EType defaultForAssetType(LLAssetType::EType asset_type);
 
+	// true if this type cannot have restricted permissions.
+	static bool cannotRestrictPermissions(EType type);
+
 private:
 	// don't instantiate or derive one of these objects
 	LLInventoryType( void );
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 5ba32c0600..5a865d27ba 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -446,8 +446,10 @@ public:
 	BOOL	getAllowFly() const
 					{ return (mParcelFlags & PF_ALLOW_FLY) ? TRUE : FALSE; }
 
+	// Remove permission restrictions for creating landmarks.
+	// We should eventually remove this flag completely.
 	BOOL	getAllowLandmark() const
-					{ return (mParcelFlags & PF_ALLOW_LANDMARK) ? TRUE : FALSE; }
+					{ return TRUE; }
 
 	BOOL	getAllowGroupScripts() const
 					{ return (mParcelFlags & PF_ALLOW_GROUP_SCRIPTS) ? TRUE : FALSE; }
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
index e4f8b0dffd..036231ccf8 100644
--- a/indra/llinventory/llpermissions.cpp
+++ b/indra/llinventory/llpermissions.cpp
@@ -83,6 +83,17 @@ void LLPermissions::initMasks(PermissionMask base, PermissionMask owner,
 	fix();
 }
 
+// ! BACKWARDS COMPATIBILITY ! Override masks for inventory types that
+// no longer can have restricted permissions.  This takes care of previous
+// version landmarks that could have had no copy/mod/transfer bits set.
+void LLPermissions::initMasks(LLInventoryType::EType type)
+{
+	if (LLInventoryType::cannotRestrictPermissions(type))
+	{
+		initMasks(PERM_ALL, PERM_ALL, PERM_ALL, PERM_ALL, PERM_ALL);
+	}
+}
+
 BOOL LLPermissions::getOwnership(LLUUID& owner_id, BOOL& is_group_owned) const
 {
 	if(mOwner.notNull())
diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h
index 9280629e0c..f03045e265 100644
--- a/indra/llinventory/llpermissions.h
+++ b/indra/llinventory/llpermissions.h
@@ -38,6 +38,7 @@
 #include "lluuid.h"
 #include "llxmlnode.h"
 #include "reflective.h"
+#include "llinventorytype.h"
 
 // prototypes
 class LLMessageSystem;
@@ -129,6 +130,8 @@ public:
 	void initMasks(PermissionMask base, PermissionMask owner,
 				   PermissionMask everyone, PermissionMask group,
 				   PermissionMask next);
+	// adjust permissions based on inventory type.
+	void initMasks(LLInventoryType::EType type);
 
 	//
 	// ACCESSORS
diff --git a/indra/llmessage/lltransfersourceasset.cpp b/indra/llmessage/lltransfersourceasset.cpp
index a4d59275b9..5a1cd95ffc 100644
--- a/indra/llmessage/lltransfersourceasset.cpp
+++ b/indra/llmessage/lltransfersourceasset.cpp
@@ -264,16 +264,17 @@ bool is_asset_fetch_by_id_allowed(LLAssetType::EType type)
 	bool rv = false;
 	switch(type)
 	{
-	case LLAssetType::AT_SOUND:
-	case LLAssetType::AT_LANDMARK:
-	case LLAssetType::AT_CLOTHING:
-	case LLAssetType::AT_BODYPART:
-	case LLAssetType::AT_ANIMATION:
-	case LLAssetType::AT_GESTURE:
-		rv = true;
-		break;
-	default:
-		break;
+		case LLAssetType::AT_SOUND:
+		case LLAssetType::AT_LANDMARK:
+		case LLAssetType::AT_CLOTHING:
+		case LLAssetType::AT_BODYPART:
+		case LLAssetType::AT_ANIMATION:
+		case LLAssetType::AT_GESTURE:
+		case LLAssetType::AT_FAVORITE:
+			rv = true;
+			break;
+		default:
+			break;
 	}
 	return rv;
 }
@@ -284,18 +285,21 @@ bool is_asset_id_knowable(LLAssetType::EType type)
 	bool rv = false;
 	switch(type)
 	{
-	case LLAssetType::AT_TEXTURE:
-	case LLAssetType::AT_SOUND:
-	case LLAssetType::AT_LANDMARK:
-	case LLAssetType::AT_CLOTHING:
-	case LLAssetType::AT_NOTECARD:
-	case LLAssetType::AT_BODYPART:
-	case LLAssetType::AT_ANIMATION:
-	case LLAssetType::AT_GESTURE:
-		rv = true;
-		break;
-	default:
-		break;
+		case LLAssetType::AT_TEXTURE:
+		case LLAssetType::AT_SOUND:
+		case LLAssetType::AT_LANDMARK:
+		case LLAssetType::AT_CLOTHING:
+		case LLAssetType::AT_NOTECARD:
+		case LLAssetType::AT_BODYPART:
+		case LLAssetType::AT_ANIMATION:
+		case LLAssetType::AT_GESTURE:
+		case LLAssetType::AT_FAVORITE:
+		case LLAssetType::AT_LINK:
+		case LLAssetType::AT_LINK_FOLDER:
+			rv = true;
+			break;
+		default:
+			break;
 	}
 	return rv;
 }
diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp
index 43b5f8e224..30af58e430 100644
--- a/indra/llmessage/message_prehash.cpp
+++ b/indra/llmessage/message_prehash.cpp
@@ -174,6 +174,7 @@ char* _PREHASH_UpdateInventoryItem = LLMessageStringTable::getInstance()->getStr
 char* _PREHASH_UpdateCreateInventoryItem = LLMessageStringTable::getInstance()->getString("UpdateCreateInventoryItem");
 char* _PREHASH_MoveInventoryItem = LLMessageStringTable::getInstance()->getString("MoveInventoryItem");
 char* _PREHASH_CopyInventoryItem = LLMessageStringTable::getInstance()->getString("CopyInventoryItem");
+char* _PREHASH_LinkInventoryItem = LLMessageStringTable::getInstance()->getString("LinkInventoryItem");
 char* _PREHASH_RemoveInventoryItem = LLMessageStringTable::getInstance()->getString("RemoveInventoryItem");
 char* _PREHASH_CreateInventoryItem = LLMessageStringTable::getInstance()->getString("CreateInventoryItem");
 char* _PREHASH_PathTwistBegin = LLMessageStringTable::getInstance()->getString("PathTwistBegin");
diff --git a/indra/llmessage/message_prehash.h b/indra/llmessage/message_prehash.h
index f8ef610408..e73ec3e5e1 100644
--- a/indra/llmessage/message_prehash.h
+++ b/indra/llmessage/message_prehash.h
@@ -174,6 +174,7 @@ extern char * _PREHASH_UpdateInventoryItem;
 extern char * _PREHASH_UpdateCreateInventoryItem;
 extern char * _PREHASH_MoveInventoryItem;
 extern char * _PREHASH_CopyInventoryItem;
+extern char * _PREHASH_LinkInventoryItem;
 extern char * _PREHASH_RemoveInventoryItem;
 extern char * _PREHASH_CreateInventoryItem;
 extern char * _PREHASH_PathTwistBegin;
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 5d09d8748f..d96bcf5bbf 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -602,13 +602,12 @@ void LLInvFVBridge::changeCategoryParent(LLInventoryModel* model,
 }
 
 
-const char* safe_inv_type_lookup(LLInventoryType::EType inv_type)
+const std::string safe_inv_type_lookup(LLInventoryType::EType inv_type)
 {
-	const char* rv = LLInventoryType::lookup(inv_type);
-	if(!rv)
+	const std::string rv= LLInventoryType::lookup(inv_type);
+	if(rv.empty())
 	{
-		const char* INVALID_TYPE = "<invalid>";
-		rv = INVALID_TYPE;
+		return std::string("<invalid>");
 	}
 	return rv;
 }
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index f47d0777b0..bad2e174c9 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -307,8 +307,8 @@ bool LLViewerInventoryItem::exportFileLocal(LLFILE* fp) const
 	fprintf(fp, "\t\tparent_id\t%s\n", uuid_str.c_str());
 	mPermissions.exportFile(fp);
 	fprintf(fp, "\t\ttype\t%s\n", LLAssetType::lookup(mType));
-	const char* inv_type_str = LLInventoryType::lookup(mInventoryType);
-	if(inv_type_str) fprintf(fp, "\t\tinv_type\t%s\n", inv_type_str);
+	const std::string inv_type_str = LLInventoryType::lookup(mInventoryType);
+	if(!inv_type_str.empty()) fprintf(fp, "\t\tinv_type\t%s\n", inv_type_str.c_str());
 	fprintf(fp, "\t\tname\t%s|\n", mName.c_str());
 	fprintf(fp, "\t\tcreation_date\t%d\n", (S32) mCreationDate);
 	fprintf(fp,"\t}\n");
-- 
cgit v1.2.3


From 87776b19443030bece31c26290d1092bf6cbb3e6 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Wed, 29 Jul 2009 22:16:52 +0000
Subject: svn merge -r128774:128808
 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1737 effective merge: svn merge
 -r127126:128746
 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27

---
 indra/llinventory/llinventory.cpp |  33 +++++++
 indra/llinventory/llinventory.h   |   4 +
 indra/llmessage/llmail.cpp        |  18 +++-
 indra/llprimitive/llprimitive.cpp | 187 +++++++++++++++++++++++++++++++++++++-
 4 files changed, 238 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index e45bb59881..76de357e2b 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -453,6 +453,39 @@ void LLInventoryItem::setCreationDate(time_t creation_date_utc)
 	mCreationDate = creation_date_utc;
 }
 
+void LLInventoryItem::accumulatePermissionSlamBits(const LLInventoryItem& old_item)
+{
+	// Remove any pre-existing II_FLAGS_PERM_OVERWRITE_MASK flags 
+	// because we now detect when they should be set.
+	setFlags( old_item.getFlags() | (getFlags() & ~(LLInventoryItem::II_FLAGS_PERM_OVERWRITE_MASK)) );
+
+	// Enforce the PERM_OVERWRITE flags for any masks that are different
+	// but only for AT_OBJECT's since that is the only asset type that can 
+	// exist in-world (instead of only in-inventory or in-object-contents).
+	if (LLAssetType::AT_OBJECT == getType())
+	{
+		LLPermissions old_permissions = old_item.getPermissions();
+		U32 flags_to_be_set = 0;
+		if(old_permissions.getMaskNextOwner() != getPermissions().getMaskNextOwner())
+		{
+			flags_to_be_set |= LLInventoryItem::II_FLAGS_OBJECT_SLAM_PERM;
+		}
+		if(old_permissions.getMaskEveryone() != getPermissions().getMaskEveryone())
+		{
+			flags_to_be_set |= LLInventoryItem::II_FLAGS_OBJECT_PERM_OVERWRITE_EVERYONE;
+		}
+		if(old_permissions.getMaskGroup() != getPermissions().getMaskGroup())
+		{
+			flags_to_be_set |= LLInventoryItem::II_FLAGS_OBJECT_PERM_OVERWRITE_GROUP;
+		}
+		LLSaleInfo old_sale_info = old_item.getSaleInfo();
+		if(old_sale_info != getSaleInfo())
+		{
+			flags_to_be_set |= LLInventoryItem::II_FLAGS_OBJECT_SLAM_SALE;
+		}
+		setFlags(getFlags() | flags_to_be_set);
+	}
+}
 
 const LLSaleInfo& LLInventoryItem::getSaleInfo() const
 {
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index 094aebe93b..08e3958533 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -262,6 +262,10 @@ public:
 	void setFlags(U32 flags);
 	void setCreationDate(time_t creation_date_utc);
 
+	// Check for changes in permissions masks and sale info
+	// and set the corresponding bits in mFlags
+	void accumulatePermissionSlamBits(const LLInventoryItem& old_item);
+
 	// Put this inventory item onto the current outgoing mesage. It
 	// assumes you have already called nextBlock().
 	virtual void packMessage(LLMessageSystem* msg) const;
diff --git a/indra/llmessage/llmail.cpp b/indra/llmessage/llmail.cpp
index d52ff6c7e8..ce206d8d7d 100644
--- a/indra/llmessage/llmail.cpp
+++ b/indra/llmessage/llmail.cpp
@@ -265,7 +265,7 @@ std::string LLMail::buildSMTPTransaction(
 // static
 bool LLMail::send(
 	const std::string& header,
-	const std::string& message,
+	const std::string& raw_message,
 	const char* from_address,
 	const char* to_address)
 {
@@ -276,8 +276,20 @@ bool LLMail::send(
 		return false;
 	}
 
-	// *FIX: this translation doesn't deal with a single period on a
-	// line by itself.
+	// remove any "." SMTP commands to prevent injection (DEV-35777)
+	// we don't need to worry about "\r\n.\r\n" because of the 
+	// "\n" --> "\n\n" conversion going into rfc2822_msg below
+	std::string message = raw_message;
+	std::string bad_string = "\n.\n";
+	std::string good_string = "\n..\n";
+	while (1)
+	{
+		int index = message.find(bad_string);
+		if (index == std::string::npos) break;
+		message.replace(index, bad_string.size(), good_string);
+	}
+
+	// convert all "\n" into "\r\n"
 	std::ostringstream rfc2822_msg;
 	for(U32 i = 0; i < message.size(); ++i)
 	{
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index 58aaf97a76..7b755a7d17 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -746,16 +746,201 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
 
 	U32 old_face_mask = mVolumep->mFaceMask;
 
+	S32 face_bit = 0;
+	S32 cur_mask = 0;
+
+	// Grab copies of the old faces from the original shape, ordered by type.
+	// We will use these to figure out what old texture info gets mapped to new
+	// faces in the new shape.
+	std::vector<LLProfile::Face> old_faces; 
+	for (S32 face = 0; face < mVolumep->getNumFaces(); face++)
+	{
+		old_faces.push_back(mVolumep->getProfile().mFaces[face]);
+	}
+
+	// Copy the old texture info off to the side, but not in the order in which
+	// they live in the mTextureList, rather in order of ther "face id" which
+	// is the corresponding value of LLVolueParams::LLProfile::mFaces::mIndex.
+	//
+	// Hence, some elements of old_tes::mEntryList will be invalid.  It is
+	// initialized to a size of 9 (max number of possible faces on a volume?)
+	// and only the ones with valid types are filled in.
+	LLPrimTextureList old_tes;
+	old_tes.setSize(9);
+	for (face_bit = 0; face_bit < 9; face_bit++)
+	{
+		cur_mask = 0x1 << face_bit;
+		if (old_face_mask & cur_mask)
+		{
+			S32 te_index = face_index_from_id(cur_mask, old_faces);
+			old_tes.copyTexture(face_bit, *(getTE(te_index)));
+			//llinfos << face_bit << ":" << te_index << ":" << old_tes[face_bit].getID() << llendl;
+		}
+	}
+
+
 	// build the new object
 	sVolumeManager->unrefVolume(mVolumep);
 	mVolumep = volumep;
 	
 	U32 new_face_mask = mVolumep->mFaceMask;
-	if (old_face_mask != new_face_mask) 
+	S32 i;
+
+	if (old_face_mask == new_face_mask) 
 	{
+		// nothing to do
+		return TRUE;
+	}
+
+	if (mVolumep->getNumFaces() == 0 && new_face_mask != 0)
+	{
+		llwarns << "Object with 0 faces found...INCORRECT!" << llendl;
 		setNumTEs(mVolumep->getNumFaces());
+		return TRUE;
+	}
+
+	// initialize face_mapping
+	S32 face_mapping[9];
+	for (face_bit = 0; face_bit < 9; face_bit++)
+	{
+		face_mapping[face_bit] = face_bit;
+	}
+
+	// The new shape may have more faces than the original, but we can't just
+	// add them to the end -- the ordering matters and it may be that we must
+	// insert the new faces in the middle of the list.  When we add a face it
+	// will pick up the texture/color info of one of the old faces an so we
+	// now figure out which old face info gets mapped to each new face, and 
+	// store in the face_mapping lookup table.
+	for (face_bit = 0; face_bit < 9; face_bit++)
+	{
+		cur_mask = 0x1 << face_bit;
+		if (!(new_face_mask & cur_mask))
+		{
+			// Face doesn't exist in new map.
+			face_mapping[face_bit] = -1;
+			continue;
+		}
+		else if (old_face_mask & cur_mask)
+		{
+			// Face exists in new and old map.
+			face_mapping[face_bit] = face_bit;
+			continue;
+		}
+
+		// OK, how we've got a mismatch, where we have to fill a new face with one from
+		// the old face.
+		if (cur_mask & (LL_FACE_PATH_BEGIN | LL_FACE_PATH_END | LL_FACE_INNER_SIDE))
+		{
+			// It's a top/bottom/hollow interior face.
+			if (old_face_mask & LL_FACE_PATH_END)
+			{
+				face_mapping[face_bit] = 1;
+				continue;
+			}
+			else
+			{
+				S32 cur_outer_mask = LL_FACE_OUTER_SIDE_0;
+				for (i = 0; i < 4; i++)
+				{
+					if (old_face_mask & cur_outer_mask)
+					{
+						face_mapping[face_bit] = 5 + i;
+						break;
+					}
+					cur_outer_mask <<= 1;
+				}
+				if (i == 4)
+				{
+					llwarns << "No path end or outer face in volume!" << llendl;
+				}
+				continue;
+			}
+		}
+
+		if (cur_mask & (LL_FACE_PROFILE_BEGIN | LL_FACE_PROFILE_END))
+		{
+			// A cut slice.  Use the hollow interior if we have it.
+			if (old_face_mask & LL_FACE_INNER_SIDE)
+			{
+				face_mapping[face_bit] = 2;
+				continue;
+			}
+
+			// No interior, use the bottom face.
+			// Could figure out which of the outer faces was nearest, but that would be harder.
+			if (old_face_mask & LL_FACE_PATH_END)
+			{
+				face_mapping[face_bit] = 1;
+				continue;
+			}
+			else
+			{
+				S32 cur_outer_mask = LL_FACE_OUTER_SIDE_0;
+				for (i = 0; i < 4; i++)
+				{
+					if (old_face_mask & cur_outer_mask)
+					{
+						face_mapping[face_bit] = 5 + i;
+						break;
+					}
+					cur_outer_mask <<= 1;
+				}
+				if (i == 4)
+				{
+					llwarns << "No path end or outer face in volume!" << llendl;
+				}
+				continue;
+			}
+		}
+
+		// OK, the face that's missing is an outer face...
+		// Pull from the nearest adjacent outer face (there's always guaranteed to be one...
+		S32 cur_outer = face_bit - 5;
+		S32 min_dist = 5;
+		S32 min_outer_bit = -1;
+		S32 i;
+		for (i = 0; i < 4; i++)
+		{
+			if (old_face_mask & (LL_FACE_OUTER_SIDE_0 << i))
+			{
+				S32 dist = abs(i - cur_outer);
+				if (dist < min_dist)
+				{
+					min_dist = dist;
+					min_outer_bit = i + 5;
+				}
+			}
+		}
+		if (-1 == min_outer_bit)
+		{
+			llinfos << (LLVolume *)mVolumep << llendl;
+			llwarns << "Bad!  No outer faces, impossible!" << llendl;
+		}
+		face_mapping[face_bit] = min_outer_bit;
 	}
+	
 
+	setNumTEs(mVolumep->getNumFaces());
+	for (face_bit = 0; face_bit < 9; face_bit++)
+	{
+		// For each possible face type on the new shape we check to see if that
+		// face exists and if it does we create a texture entry that is a copy
+		// of one of the originals.  Since the originals might not have a
+		// matching face, we use the face_mapping lookup table to figure out
+		// which face information to copy.
+		cur_mask = 0x1 << face_bit;
+		if (new_face_mask & cur_mask)
+		{
+			if (-1 == face_mapping[face_bit])
+			{
+				llwarns << "No mapping from old face to new face!" << llendl;
+			}
+
+			S32 te_num = face_index_from_id(cur_mask, mVolumep->getProfile().mFaces);
+			setTE(te_num, *(old_tes.getTexture(face_mapping[face_bit])));
+		}
+	}
 	return TRUE;
 }
 
-- 
cgit v1.2.3


From 6603a2d21004b78754e3a7d5f5731552800873be Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Thu, 30 Jul 2009 01:09:49 +0000
Subject: Reduce job count for linux builds to something the build farm can
 survive

---
 indra/develop.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/develop.py b/indra/develop.py
index b40e81bb07..39bb48dfa5 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -383,16 +383,20 @@ class LinuxSetup(UnixSetup):
 
         if job_count is None:
             hosts, job_count = count_distcc_hosts()
+            hostname = socket.gethostname()
             if hosts == 1:
-                hostname = socket.gethostname()
                 if hostname.startswith('station'):
                     hosts, job_count = mk_distcc_hosts('station', 36, 2)
                     os.environ['DISTCC_HOSTS'] = hosts
                 if hostname.startswith('eniac'):
                     hosts, job_count = mk_distcc_hosts('eniac', 71, 2)
                     os.environ['DISTCC_HOSTS'] = hosts
-            if job_count > 12:
-                job_count = 12;
+            if hostname.startswith('build'):
+                max_jobs = 6
+            else:
+                max_jobs = 12
+            if job_count > max_jobs:
+                job_count = max_jobs;
             opts.extend(['-j', str(job_count)])
 
         if targets:
-- 
cgit v1.2.3


From 181bf2ba8efa49d3a2456cf5cc68537e39d387dd Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Thu, 30 Jul 2009 01:19:13 +0000
Subject: Bump trunk version to 1.31

---
 indra/llcommon/llversionserver.h              | 4 ++--
 indra/newview/English.lproj/InfoPlist.strings | 4 ++--
 indra/newview/Info-SecondLife.plist           | 2 +-
 indra/newview/res/viewerRes.rc                | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index c0fc06ee6e..a2c1819d8d 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -34,9 +34,9 @@
 #define LL_LLVERSIONSERVER_H
 
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 29;
+const S32 LL_VERSION_MINOR = 31;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 120909;
+const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Server";
 
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 0a1235b85d..8263a2381e 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -2,6 +2,6 @@
 
 CFBundleName = "Second Life";
 
-CFBundleShortVersionString = "Second Life version 1.24.0.0";
-CFBundleGetInfoString = "Second Life version 1.24.0.0, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.24.4.0";
+CFBundleGetInfoString = "Second Life version 1.24.4.0, Copyright 2004-2008 Linden Research, Inc.";
 
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index baa5ccf1b9..ba7e7965cd 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.24.0.0</string>
+	<string>1.24.4.0</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index a902a6dff0..352d5cab55 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -138,8 +138,8 @@ TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,24,0,0
- PRODUCTVERSION 1,24,0,0
+ FILEVERSION 1,24,4,0
+ PRODUCTVERSION 1,24,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -156,12 +156,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.24.0.0"
+            VALUE "FileVersion", "1.24.4.0"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.24.0.0"
+            VALUE "ProductVersion", "1.24.4.0"
         END
     END
     BLOCK "VarFileInfo"
-- 
cgit v1.2.3


From ff11d74820c89822cd067b51727d9df1dc87d0d0 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Wed, 26 Aug 2009 10:57:38 -0700
Subject: Add Mercurial-specific build version info. Pilfered from billc.

---
 indra/lib/python/indra/util/llversion.py | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/lib/python/indra/util/llversion.py b/indra/lib/python/indra/util/llversion.py
index 770b861ddc..c48ab679f4 100644
--- a/indra/lib/python/indra/util/llversion.py
+++ b/indra/lib/python/indra/util/llversion.py
@@ -1,7 +1,7 @@
 """@file llversion.py
 @brief Utility for parsing llcommon/llversion${server}.h
        for the version string and channel string
-       Utility that parses svn info for branch and revision
+       Utility that parses hg or svn info for branch and revision
 
 $LicenseInfo:firstyear=2006&license=mit$
 
@@ -79,8 +79,8 @@ def get_svn_status_matching(regular_expression):
     status, output = commands.getstatusoutput('svn info %s' % get_src_root())
     m = regular_expression.search(output)
     if not m:
-        print "Failed to parse svn info output, resultfollows:"
-        print output
+        print >> sys.stderr, "Failed to parse svn info output, result follows:"
+        print >> sys.stderr, output
         raise Exception, "No matching svn status in "+src_root
     return m.group(1)
 
@@ -92,4 +92,25 @@ def get_svn_revision():
     last_rev_re = re.compile('Last Changed Rev: (\d+)')
     return get_svn_status_matching(last_rev_re)
 
-
+def get_hg_repo():
+    status, output = commands.getstatusoutput('hg showconfig paths.default')
+    if status:
+        print >> sys.stderr, output
+        sys.exit(1)
+    if not output:
+        print >> sys.stderr, 'ERROR: cannot find repo we cloned from'
+        sys.exit(1)
+    return output
+
+def get_hg_changeset():
+    status, output = commands.getstatusoutput('hg id -i')
+    if status:
+        print >> sys.stderr, output
+        sys.exit(1)
+    return output
+
+def using_svn():
+    return os.path.isdir(os.path.join(get_src_root(), '.svn'))
+
+def using_hg():
+    return os.path.isdir(os.path.join(get_src_root(), '.hg'))
-- 
cgit v1.2.3


From 89de8e5b552b997335a429ad41f86e4200441b11 Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Mon, 31 Aug 2009 13:26:35 -0700
Subject: Port over the new build scripts from para-test, tweek
 update_version_files to use the repo revision number for now.

---
 indra/llcommon/llversionserver.h              | 2 +-
 indra/llcommon/llversionviewer.h              | 2 +-
 indra/newview/English.lproj/InfoPlist.strings | 4 ++--
 indra/newview/Info-SecondLife.plist           | 2 +-
 indra/newview/res/viewerRes.rc                | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 23e39ceb08..e9e21cffb6 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 29;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 2425;
 
 const char * const LL_CHANNEL = "Second Life Server";
 
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 45810a101d..04cf98ce19 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 2;
 const S32 LL_VERSION_MINOR = 0;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 2425;
 
 const char * const LL_CHANNEL = "Second Life 2009";
 
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 735424c647..28853ba032 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -2,6 +2,6 @@
 
 CFBundleName = "Second Life";
 
-CFBundleShortVersionString = "Second Life version 2.0.0.0";
-CFBundleGetInfoString = "Second Life version 2.0.0.0, Copyright 2004-2009 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 2.0.0.2425";
+CFBundleGetInfoString = "Second Life version 2.0.0.2425, Copyright 2004-2009 Linden Research, Inc.";
 
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 7264044d37..c0a33feaec 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.0.0</string>
+	<string>2.0.0.2425</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index 87a8bd5787..a5ee78df2c 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -138,8 +138,8 @@ TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 2,0,0,2425
+ PRODUCTVERSION 2,0,0,2425
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -156,12 +156,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "2.0.0.0"
+            VALUE "FileVersion", "2.0.0.2425"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "2.0.0.0"
+            VALUE "ProductVersion", "2.0.0.2425"
         END
     END
     BLOCK "VarFileInfo"
-- 
cgit v1.2.3


From f4f02f0f34d5a26472ea4a6c681a380a2174d1bd Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 31 Aug 2009 15:09:13 -0700
Subject: Fix up some post-merge breakage.

---
 indra/llcommon/CMakeLists.txt   | 2 +-
 indra/llcommon/llassettype.cpp  | 2 --
 indra/llinventory/llinventory.h | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index a93623d24e..b57798af0c 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -242,7 +242,7 @@ SET(llcommon_TEST_SOURCE_FILES
 LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}")
 
 #set(TEST_DEBUG on)
-set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES})
+set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES} gmock gtest)
 LL_ADD_INTEGRATION_TEST(lllazy lllazy.cpp "${test_libs}")
 
 # *TODO - reenable these once tcmalloc libs no longer break the build.
diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp
index 6d4043b8e0..66c8bcac6a 100644
--- a/indra/llcommon/llassettype.cpp
+++ b/indra/llcommon/llassettype.cpp
@@ -287,8 +287,6 @@ bool LLAssetType::lookupIsEnsembleCategoryType(EType asset_type)
 {
 	return (asset_type >= AT_FOLDER_ENSEMBLE_START &&
 			asset_type <= AT_FOLDER_ENSEMBLE_END);
-	}
-	return true;
 }
 
 
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index b953e91309..32f19d6be5 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -93,10 +93,6 @@ public:
 	virtual const LLUUID& getUUID() const;
 	const LLUUID& getParentUUID() const;
 	virtual const LLUUID& getLinkedUUID() const; // get the inventoryID that this item points to, else this item's inventoryID
-	virtual const std::string& getName() const;
-	virtual LLAssetType::EType getType() const;
-	LLAssetType::EType getActualType() const; // bypasses indirection for linked items
-
 	virtual const std::string& getName() const;
 	virtual LLAssetType::EType getType() const;
 	LLAssetType::EType getActualType() const; // bypasses indirection for linked items
-- 
cgit v1.2.3


From 2149be5df273e4b68bae3c797f26e507bb7951be Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Mon, 31 Aug 2009 17:16:02 -0700
Subject: Attempt to invoke the code signer differently

---
 indra/newview/viewer_manifest.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ae3b1ba43e..6476e56681 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -395,9 +395,14 @@ class WindowsManifest(ViewerManifest):
         self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
         # self.remove(self.dst_path_of(tempfile))
         # If we're on a build machine, sign the code using our Authenticode certificate. JC
-        sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
+        sign_py = os.path.expandvars("${SIGN}")
+        if not sign_py or sign_py == "${SIGN}":
+            sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
+        python = os.path.expandvars("${PYTHON}")
+        if not python or python == "${PYTHON}":
+            python = 'python'
         if os.path.exists(sign_py):
-            self.run_command(sign_py + ' ' + self.dst_path_of(installer_file))
+            self.run_command("%s %s %s" % (python, sign_py self.dst_path_of(installer_file)))
         else:
             print "Skipping code signing,", sign_py, "does not exist"
         self.created_path(self.dst_path_of(installer_file))
-- 
cgit v1.2.3


From 7eafa3209c6b8a7ef9b7d677943752f5345ff3f2 Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Mon, 31 Aug 2009 18:34:03 -0700
Subject: Fix syntax error in viewer_manifest.py

---
 indra/newview/viewer_manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 6476e56681..66ebd607c4 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -402,7 +402,7 @@ class WindowsManifest(ViewerManifest):
         if not python or python == "${PYTHON}":
             python = 'python'
         if os.path.exists(sign_py):
-            self.run_command("%s %s %s" % (python, sign_py self.dst_path_of(installer_file)))
+            self.run_command("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file)))
         else:
             print "Skipping code signing,", sign_py, "does not exist"
         self.created_path(self.dst_path_of(installer_file))
-- 
cgit v1.2.3


From 1a6be4eb17372273b74fd9b849799372f23a15e9 Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Mon, 31 Aug 2009 20:09:56 -0700
Subject: Quote any backslashes so they get preserved when invoking python.

---
 indra/newview/viewer_manifest.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 66ebd607c4..024f2f655c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -398,6 +398,8 @@ class WindowsManifest(ViewerManifest):
         sign_py = os.path.expandvars("${SIGN}")
         if not sign_py or sign_py == "${SIGN}":
             sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
+        else:
+            sign_py = sign_py.replace('\\', '\\\\')
         python = os.path.expandvars("${PYTHON}")
         if not python or python == "${PYTHON}":
             python = 'python'
-- 
cgit v1.2.3


From a6ff5974c36f8ea860b2065c549333d8cfc6a458 Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Tue, 1 Sep 2009 09:00:02 -0700
Subject: Also quite the backslashes in the argument for the sign command

---
 indra/newview/viewer_manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 024f2f655c..99c9abfddf 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -404,7 +404,7 @@ class WindowsManifest(ViewerManifest):
         if not python or python == "${PYTHON}":
             python = 'python'
         if os.path.exists(sign_py):
-            self.run_command("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file)))
+            self.run_command("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file).replace('\\', '\\\\')))
         else:
             print "Skipping code signing,", sign_py, "does not exist"
         self.created_path(self.dst_path_of(installer_file))
-- 
cgit v1.2.3


From 5f3a7fa6f3ba45d875ec437c5df9e712f3c6b5a2 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Tue, 1 Sep 2009 11:18:33 -0700
Subject: Patch in some other useful scripts from trunk.

---
 indra/lib/python/indra/util/llversion.py | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/lib/python/indra/util/llversion.py b/indra/lib/python/indra/util/llversion.py
index 770b861ddc..c48ab679f4 100644
--- a/indra/lib/python/indra/util/llversion.py
+++ b/indra/lib/python/indra/util/llversion.py
@@ -1,7 +1,7 @@
 """@file llversion.py
 @brief Utility for parsing llcommon/llversion${server}.h
        for the version string and channel string
-       Utility that parses svn info for branch and revision
+       Utility that parses hg or svn info for branch and revision
 
 $LicenseInfo:firstyear=2006&license=mit$
 
@@ -79,8 +79,8 @@ def get_svn_status_matching(regular_expression):
     status, output = commands.getstatusoutput('svn info %s' % get_src_root())
     m = regular_expression.search(output)
     if not m:
-        print "Failed to parse svn info output, resultfollows:"
-        print output
+        print >> sys.stderr, "Failed to parse svn info output, result follows:"
+        print >> sys.stderr, output
         raise Exception, "No matching svn status in "+src_root
     return m.group(1)
 
@@ -92,4 +92,25 @@ def get_svn_revision():
     last_rev_re = re.compile('Last Changed Rev: (\d+)')
     return get_svn_status_matching(last_rev_re)
 
-
+def get_hg_repo():
+    status, output = commands.getstatusoutput('hg showconfig paths.default')
+    if status:
+        print >> sys.stderr, output
+        sys.exit(1)
+    if not output:
+        print >> sys.stderr, 'ERROR: cannot find repo we cloned from'
+        sys.exit(1)
+    return output
+
+def get_hg_changeset():
+    status, output = commands.getstatusoutput('hg id -i')
+    if status:
+        print >> sys.stderr, output
+        sys.exit(1)
+    return output
+
+def using_svn():
+    return os.path.isdir(os.path.join(get_src_root(), '.svn'))
+
+def using_hg():
+    return os.path.isdir(os.path.join(get_src_root(), '.hg'))
-- 
cgit v1.2.3


From dd628f29af0fcd0ec5f62ee71fc201c1e523a32a Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Tue, 1 Sep 2009 11:54:34 -0700
Subject: Use rev numbers instead of changeset IDs for now.

---
 indra/lib/python/indra/util/llversion.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/lib/python/indra/util/llversion.py b/indra/lib/python/indra/util/llversion.py
index c48ab679f4..2718a85f41 100644
--- a/indra/lib/python/indra/util/llversion.py
+++ b/indra/lib/python/indra/util/llversion.py
@@ -103,11 +103,21 @@ def get_hg_repo():
     return output
 
 def get_hg_changeset():
-    status, output = commands.getstatusoutput('hg id -i')
+    # The right thing to do:
+    # status, output = commands.getstatusoutput('hg id -i')
+    # if status:
+    #     print >> sys.stderr, output
+    #    sys.exit(1)
+
+    # The temporary hack:
+    status, output = commands.getstatusoutput('hg parents --template "{rev}"')
     if status:
         print >> sys.stderr, output
         sys.exit(1)
-    return output
+    lines = output.splitlines()
+    if len(lines) > 1:
+        print >> sys.stderr, 'ERROR: working directory has %d parents' % len(lines)
+    return lines[0]
 
 def using_svn():
     return os.path.isdir(os.path.join(get_src_root(), '.svn'))
-- 
cgit v1.2.3


From 40743eaf99c9cbfee08f0bb44bc7c614bc660f34 Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Tue, 1 Sep 2009 13:36:08 -0700
Subject: Try double-quoting backslashes

---
 indra/newview/viewer_manifest.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 99c9abfddf..e85fddbc99 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -399,12 +399,12 @@ class WindowsManifest(ViewerManifest):
         if not sign_py or sign_py == "${SIGN}":
             sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
         else:
-            sign_py = sign_py.replace('\\', '\\\\')
+            sign_py = sign_py.replace('\\', '\\\\\\\\')
         python = os.path.expandvars("${PYTHON}")
         if not python or python == "${PYTHON}":
             python = 'python'
         if os.path.exists(sign_py):
-            self.run_command("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file).replace('\\', '\\\\')))
+            self.run_command("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file).replace('\\', '\\\\\\\\')))
         else:
             print "Skipping code signing,", sign_py, "does not exist"
         self.created_path(self.dst_path_of(installer_file))
-- 
cgit v1.2.3


From 0f0853a6fe23c6eb4341d6a5a0752e224cdf1b22 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Tue, 1 Sep 2009 18:16:04 -0400
Subject: Fix up some more post-merge breakage.

---
 indra/llprimitive/llprimitive.cpp                 |  2 +-
 indra/lscript/lscript_execute/lscript_execute.cpp | 36 +++++++++++------------
 indra/newview/llviewermessage.cpp                 |  3 +-
 indra/newview/llvoiceclient.cpp                   |  4 +--
 4 files changed, 22 insertions(+), 23 deletions(-)

(limited to 'indra')

diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index 2177f5c365..dcfb5cfae6 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -1902,7 +1902,7 @@ bool LLLightImageParams::fromLLSD(LLSD& sd)
 	if (sd.has("texture"))
 	{
 		setLightTexture( sd["texture"] );
-		setParams( sd["params"] );
+		setParams( LLVector3( sd["params"] ) );
 		return true;
 	} 
 	
diff --git a/indra/lscript/lscript_execute/lscript_execute.cpp b/indra/lscript/lscript_execute/lscript_execute.cpp
index 1f908eb675..e849fa9a6e 100644
--- a/indra/lscript/lscript_execute/lscript_execute.cpp
+++ b/indra/lscript/lscript_execute/lscript_execute.cpp
@@ -4241,12 +4241,12 @@ S32 lscript_push_variable(LLScriptLibData *data, U8 *buffer)
 // Shared code for run_calllib() and run_calllib_two_byte()
 BOOL run_calllib_common(U8 *buffer, S32 &offset, const LLUUID &id, U16 arg)
 {
-	if (arg >= gScriptLibrary.mNextNumber)
+	if (arg >= gScriptLibrary.mFunctions.size())
 	{
 		set_fault(buffer, LSRF_BOUND_CHECK_ERROR);
 		return FALSE;
 	}
-	LLScriptLibraryFunction *function = gScriptLibrary.mFunctions[arg];
+	LLScriptLibraryFunction const & function = gScriptLibrary.mFunctions[arg];
 
 	// pull out the arguments and the return values
 	LLScriptLibData	*arguments = NULL;
@@ -4254,14 +4254,14 @@ BOOL run_calllib_common(U8 *buffer, S32 &offset, const LLUUID &id, U16 arg)
 
 	S32 i, number;
 
-	if (function->mReturnType)
+	if (function.mReturnType)
 	{
 		returnvalue = new LLScriptLibData;
 	}
 
-	if (function->mArgs)
+	if (function.mArgs)
 	{
-		number = (S32)strlen(function->mArgs);		//Flawfinder: ignore
+		number = (S32)strlen(function.mArgs);		//Flawfinder: ignore
 		arguments = new LLScriptLibData[number];
 	}
 	else
@@ -4271,18 +4271,18 @@ BOOL run_calllib_common(U8 *buffer, S32 &offset, const LLUUID &id, U16 arg)
 
 	for (i = number - 1; i >= 0; i--)
 	{
-		lscript_pop_variable(&arguments[i], buffer, function->mArgs[i]);
+		lscript_pop_variable(&arguments[i], buffer, function.mArgs[i]);
 	}
 
 	// Actually execute the function call
-	function->mExecFunc(returnvalue, arguments, id);
+	function.mExecFunc(returnvalue, arguments, id);
 
-	add_register_fp(buffer, LREG_ESR, -(function->mEnergyUse));
-	add_register_fp(buffer, LREG_SLR, function->mSleepTime);
+	add_register_fp(buffer, LREG_ESR, -(function.mEnergyUse));
+	add_register_fp(buffer, LREG_SLR, function.mSleepTime);
 
 	if (returnvalue)
 	{
-		returnvalue->mType = char2type(*function->mReturnType);
+		returnvalue->mType = char2type(*function.mReturnType);
 		lscript_push_return_variable(returnvalue, buffer);
 	}
 
@@ -4304,12 +4304,12 @@ BOOL run_calllib(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 	offset++;
 	U16 arg = (U16) safe_instruction_bytestream2byte(buffer, offset);
 	if (b_print &&
-		arg < gScriptLibrary.mNextNumber)
+		arg < gScriptLibrary.mFunctions.size())
 	{
 		printf("[0x%X]\tCALLLIB ", offset);
-		LLScriptLibraryFunction *function = gScriptLibrary.mFunctions[arg];
-		printf("%d (%s)\n", (U32)arg, function->mName);
-		printf("%s\n", function->mDesc);
+		LLScriptLibraryFunction const & function = gScriptLibrary.mFunctions[arg];
+		printf("%d (%s)\n", (U32)arg, function.mName);
+		//printf("%s\n", function.mDesc);
 	}
 	return run_calllib_common(buffer, offset, id, arg);
 }
@@ -4319,12 +4319,12 @@ BOOL run_calllib_two_byte(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &i
 	offset++;
 	U16 arg = safe_instruction_bytestream2u16(buffer, offset);
 	if (b_print &&
-		arg < gScriptLibrary.mNextNumber)
+		arg < gScriptLibrary.mFunctions.size())
 	{
 		printf("[0x%X]\tCALLLIB ", (offset-1));
-		LLScriptLibraryFunction *function = gScriptLibrary.mFunctions[arg];
-		printf("%d (%s)\n", (U32)arg, function->mName);
-		printf("%s\n", function->mDesc);
+		LLScriptLibraryFunction const & function = gScriptLibrary.mFunctions[arg];
+		printf("%d (%s)\n", (U32)arg, function.mName);
+		//printf("%s\n", function.mDesc);
 	}
 	return run_calllib_common(buffer, offset, id, arg);
 }
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 28e20d92d0..111cdf7c12 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5590,9 +5590,8 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
 	LLPanelLandCovenant::updateLastModified(last_modified);
 	LLFloaterBuyLand::updateLastModified(last_modified);
 
-	gCacheName->get(estate_owner_id, false, &callbackCacheEstateOwnerName);
 	BOOL is_group = FALSE;
-	gCacheName->getNameFromUUID(estate_owner_id, is_group, callbackCacheEstateOwnerName);
+	gCacheName->get(estate_owner_id, is_group, &callbackCacheEstateOwnerName);
 	
 	// load the actual covenant asset data
 	const BOOL high_priority = TRUE;
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 182850f326..746dc99e35 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -6920,8 +6920,8 @@ void LLVoiceClient::notifyFriendObservers()
 
 void LLVoiceClient::lookupName(const LLUUID &id)
 {
-	gCacheName->get(id, FALSE, &LLVoiceClient::onAvatarNameLookup);
-	gCacheName->getNameFromUUID(id, is_group, onAvatarNameLookup);
+	BOOL is_group = FALSE;
+	gCacheName->get(id, is_group, &LLVoiceClient::onAvatarNameLookup);
 }
 
 //static
-- 
cgit v1.2.3


From 76d05a7e50bee33584f35f2f00f32ffe953752e6 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 4 Sep 2009 02:27:28 +0000
Subject: svn merge -r 129999:132607
 svn+ssh://svn/svn/linden/branches/server/server-1.30 into trunk QAR-1863:
 Merge 525 changes from 1.27 -> 1.30 -> trunk

1.27 Changes:
* QAR-1721: Vivox Recurring Billing (ViRB)
* QAR-1743: 525 AO Classifieds
* DEV-37701: Fix cleanup_indra nightly script so that it doesn't fail, and so that we know if it does
* DEV-37926 - Fairmarket key roll 8/12/2009
* QAR-1744: 525 Landstore
* QAR-1797: disable web services for find_people
* QAR-1758: OpenID and Backup/recovery.
* QAR-1794: ViRB proc fix - proc/recurring_billing/GetLocaleCountryByPackageId.php
* Changing parameter name so the module signal could be used properly in the function below
* QAR-1808 : Self-Reported First Name and Self-Reported Last Name have duplicate entries in the registration table
* DEV-30204 : Moved the registration table from sequence to indra_aux.
* removed dungeon from banned keyword list
* DEV-30204 : Moved the registration table from sequence to indra_aux.  Reviewed by kelly, cg, jarv
* Merging new streambase dwell nightly to server-1.27
* Add update_parcel_dwell.py to serial_maintenance rule in the nightly.make Makefile, removing the dwell rule, since we don't want it running in parallel with other expensive nightly scripts.

1.30 Changes:
* DEV-27476: version-manager only works in Firefox
* DEV-27472: version-manager appears to load javascript from third party site.
* mulib r92 that supports If-Modified-Since header and prevents arbitrary
  filesystem access through host:12107/manager/mochi/..
* Trivial conductor change that prevents a traceback when no regions are
  available to start.
* Fixing "Out of Connections" error when running tests via SCUT
* DEV-37554 - farm_deploy should get its ssh timeout from farm.ini
* undo two lines of debugging changes that accidentally were checked in to farm
* Adding MochiKit to MANIFEST for version-manager.
* revised files for new parcel dwell process
* Changing vault from an 'http' svn extern to a 'svn+ssh' svn extern.
* DEV-38504 RPS map item queries are too verbose
* added --skip-grid-mode-prompt to main in farm
* DEV-38607: Region Presence Service includes disabled regions in estate responses, resulting in high slave query rate.
* DEV-34781 - enable use_space_server_for_map_items and set map_item_request throttle settings in simulator.xml
* DEV-38351 changes to ip_blacklist.xml file never get automatically picked up by the simulator
* DEV-35443 Region border crossing issues.
* DEV-35443 revert overzealous validity checking on neighbor messages.
* DEV-15998 changing settings to re-enable teleport throttle, following DEV-37200 fix
* QAR-1822 CPU Overrides update to indra.xml
* DEV-15998 changing settings to re-enable teleport throttle, following DEV-37200 fix
* DEV-34026 Update LLAgentInfo::forwardViewerStats() to make all viewer statistics
* DEV-38906 Teleport throttle blocks prematurely when agent teleports back and forth between 2 regions
* DEV-38861 Intra-region TP is blocked by inter-region TP throttl
* DEV-38504 RPS map item queries are too verbose
* initial import of deploy_to_dev_grid.sh
---
 indra/llinventory/lltransactiontypes.h       | 12 ++++++++++++
 indra/llmessage/llcurl.cpp                   | 13 +++++++++++--
 indra/llmessage/llcurl.h                     |  6 ++++++
 indra/llmessage/llhttpclient.cpp             |  5 +++++
 indra/llmessage/llregionpresenceverifier.cpp |  2 +-
 5 files changed, 35 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llinventory/lltransactiontypes.h b/indra/llinventory/lltransactiontypes.h
index 1cb7308bd4..2c699bcb87 100644
--- a/indra/llinventory/lltransactiontypes.h
+++ b/indra/llinventory/lltransactiontypes.h
@@ -69,6 +69,12 @@ const S32 TRANS_PARCEL_DIR_FEE		= 2003;
 const S32 TRANS_GROUP_TAX		    = 2004; // Taxes incurred as part of group membership
 const S32 TRANS_CLASSIFIED_RENEW	= 2005;
 
+// Codes 2100-2999 reserved for recurring billing services
+// New codes can be created through an admin interface so may not
+// automatically end up in the list below :-(
+// So make sure you check the transaction_description table
+const S32 TRANS_RECURRING_GENERIC  = 2100;
+
 // Codes 3000-3999 reserved for inventory transactions
 const S32 TRANS_GIVE_INVENTORY		= 3000;
 
@@ -84,6 +90,12 @@ const S32 TRANS_DWELL_BONUS			= 5007;
 const S32 TRANS_PAY_OBJECT			= 5008;
 const S32 TRANS_OBJECT_PAYS			= 5009;
 
+// Codes 5100-5999 reserved for recurring billing transfers between users
+// New codes can be created through an admin interface so may not
+// automatically end up in the list below :-(
+// So make sure you check the transaction_description table
+const S32 TRANS_RECURRING_GENERIC_USER  = 5100;
+
 // Codes 6000-6999 reserved for group transactions
 //const S32 TRANS_GROUP_JOIN		    = 6000;  //reserved for future use
 const S32 TRANS_GROUP_LAND_DEED		= 6001;
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 1a432cd7df..0d0fee6ee6 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -131,7 +131,7 @@ void LLCurl::Responder::error(
 // virtual
 void LLCurl::Responder::error(U32 status, const std::string& reason)
 {
-	llinfos << status << ": " << reason << llendl;
+	llinfos << mURL << " [" << status << "]: " << reason << llendl;
 }
 
 // virtual
@@ -139,6 +139,11 @@ void LLCurl::Responder::result(const LLSD& content)
 {
 }
 
+void LLCurl::Responder::setURL(const std::string& url)
+{
+	mURL = url;
+}
+
 // virtual
 void LLCurl::Responder::completedRaw(
 	U32 status,
@@ -148,7 +153,11 @@ void LLCurl::Responder::completedRaw(
 {
 	LLSD content;
 	LLBufferStream istr(channels, buffer.get());
-	LLSDSerialize::fromXML(content, istr);
+	if (!LLSDSerialize::fromXML(content, istr))
+	{
+		llinfos << "Failed to deserialize LLSD. " << mURL << " [" << status << "]: " << reason << llendl;
+	}
+
 	completed(status, reason, content);
 }
 
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index ff63904c91..6e45cbc8b5 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -120,8 +120,14 @@ public:
 			// of the header can be parsed.  In the ::completed call above only the body is contained in the LLSD.
 			virtual void completedHeader(U32 status, const std::string& reason, const LLSD& content);
 
+			// Used internally to set the url for debugging later.
+			void setURL(const std::string& url);
+
 	public: /* but not really -- don't touch this */
 		U32 mReferenceCount;
+
+	private:
+		std::string mURL;
 	};
 	typedef boost::intrusive_ptr<Responder>	ResponderPtr;
 
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 8b90a4c5ca..12ecbb36eb 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -265,6 +265,11 @@ static void request(
 		}
 	}
 
+	if (responder)
+	{
+		responder->setURL(url);
+	}
+
 	req->setCallback(new LLHTTPClientURLAdaptor(responder));
 
 	if (method == LLURLRequest::HTTP_POST  &&  gMessageSystem)
diff --git a/indra/llmessage/llregionpresenceverifier.cpp b/indra/llmessage/llregionpresenceverifier.cpp
index 08c12f90da..e02a288473 100644
--- a/indra/llmessage/llregionpresenceverifier.cpp
+++ b/indra/llmessage/llregionpresenceverifier.cpp
@@ -67,7 +67,7 @@ void LLRegionPresenceVerifier::RegionResponder::result(const LLSD& content)
 	LLHost destination(host, port);
 	LLUUID id = content["region_id"];
 
-	llinfos << "Verifying " << destination.getString() << " is region " << id << llendl;
+	lldebugs << "Verifying " << destination.getString() << " is region " << id << llendl;
 
 	std::stringstream uri;
 	uri << "http://" << destination.getString() << "/state/basic/";
-- 
cgit v1.2.3


From 74e584add651adbb5784276aba5770de9e295846 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Fri, 4 Sep 2009 18:16:21 +0000
Subject: svn merge -r132607:132665
 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.30
 Propagating to trunk: QAR-1705 DEV-29573 QAR-1859 QAR-1804

---
 indra/llmessage/lltransfersourceasset.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llmessage/lltransfersourceasset.cpp b/indra/llmessage/lltransfersourceasset.cpp
index 5a1cd95ffc..41f3f3f607 100644
--- a/indra/llmessage/lltransfersourceasset.cpp
+++ b/indra/llmessage/lltransfersourceasset.cpp
@@ -270,7 +270,6 @@ bool is_asset_fetch_by_id_allowed(LLAssetType::EType type)
 		case LLAssetType::AT_BODYPART:
 		case LLAssetType::AT_ANIMATION:
 		case LLAssetType::AT_GESTURE:
-		case LLAssetType::AT_FAVORITE:
 			rv = true;
 			break;
 		default:
-- 
cgit v1.2.3


From 91aa2f37f409b7755d460c5a8e9c8d6a9a50557c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Tue, 8 Sep 2009 14:24:22 -0700
Subject: Fix some linking problems for tests.

---
 indra/llcommon/CMakeLists.txt | 2 +-
 indra/newview/CMakeLists.txt  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 6a97446a50..138dc85459 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -240,7 +240,7 @@ SET(llcommon_TEST_SOURCE_FILES
 LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}")
 
 #set(TEST_DEBUG on)
-set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES} gmock gtest)
+set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES} ${GOOGLEMOCK_LIBRARIES})
 # Have to treat lllazy test as an integration test until this issue is resolved:
 # https://jira.lindenlab.com/jira/browse/DEV-29456
 LL_ADD_INTEGRATION_TEST(lllazy lllazy.cpp "${test_libs}")
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b95c5d46dd..b5e4259f89 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1527,6 +1527,7 @@ set(test_libs
   ${LLVFS_LIBRARIES}
   ${LLMATH_LIBRARIES}
   ${LLCOMMON_LIBRARIES} 
+  ${GOOGLEMOCK_LIBRARIES}
   )
 
 LL_ADD_INTEGRATION_TEST(llcapabilitylistener 
-- 
cgit v1.2.3


From 8bed0558f538f7dfb8875e418f20c9d9da93ae17 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Wed, 9 Sep 2009 17:36:28 +0000
Subject: svn merge -r132747:132887
 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.30 Propagate
 QAR-1814 to trunk.

---
 indra/llcommon/CMakeLists.txt        |  2 ++
 indra/llcommon/llsdserialize_xml.cpp | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 7bfcd43684..887ca7dd03 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -4,6 +4,7 @@ project(llcommon)
 
 include(00-Common)
 include(LLCommon)
+include(Boost)
 
 include_directories(
     ${EXPAT_INCLUDE_DIRS}
@@ -200,6 +201,7 @@ target_link_libraries(
     ${APR_LIBRARIES}
     ${EXPAT_LIBRARIES}
     ${ZLIB_LIBRARIES}
+    ${BOOST_REGEX_LIBRARY}
     )
 
 include(LLAddBuildTest)
diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp
index c12ca350de..7e1c2e35e0 100644
--- a/indra/llcommon/llsdserialize_xml.cpp
+++ b/indra/llcommon/llsdserialize_xml.cpp
@@ -37,6 +37,7 @@
 #include <deque>
 
 #include "apr_base64.h"
+#include <boost/regex.hpp>
 
 extern "C"
 {
@@ -777,10 +778,17 @@ void LLSDXMLParser::Impl::endElementHandler(const XML_Char* name)
 		
 		case ELEMENT_BINARY:
 		{
-			S32 len = apr_base64_decode_len(mCurrentContent.c_str());
+			// Regex is expensive, but only fix for whitespace in base64,
+			// created by python and other non-linden systems - DEV-39358
+			// Fortunately we have very little binary passing now,
+			// so performance impact shold be negligible. + poppy 2009-09-04
+			boost::regex r;
+			r.assign("\\s");
+			std::string stripped = boost::regex_replace(mCurrentContent, r, "");
+			S32 len = apr_base64_decode_len(stripped.c_str());
 			std::vector<U8> data;
 			data.resize(len);
-			len = apr_base64_decode_binary(&data[0], mCurrentContent.c_str());
+			len = apr_base64_decode_binary(&data[0], stripped.c_str());
 			data.resize(len);
 			value = data;
 			break;
-- 
cgit v1.2.3


From bc1df4b1db40f2cff98b4002f3f2d3a723c84be5 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Wed, 9 Sep 2009 20:59:38 +0000
Subject: Fix a whole bunch of compilation warnings reported by gcc 4.4

---
 indra/llcommon/llstring.cpp          |  6 +++---
 indra/llcommon/llstringtable.h       | 10 ++++++----
 indra/llmath/v3math.h                |  4 ++--
 indra/llmessage/lliobuffer.cpp       |  4 ++--
 indra/llrender/llrendertarget.cpp    |  4 ++--
 indra/llui/llmenugl.cpp              |  4 ++--
 indra/newview/lldrawpoolbump.cpp     | 12 ++++++------
 indra/newview/llface.cpp             |  2 +-
 indra/newview/llhudeffectlookat.cpp  |  4 ++--
 indra/newview/llspatialpartition.cpp |  4 ++--
 indra/newview/lltoolpie.cpp          |  4 ++--
 indra/newview/llviewercamera.cpp     |  4 ++--
 indra/newview/llviewerkeyboard.cpp   |  2 +-
 indra/newview/llviewerobject.cpp     |  4 ++--
 indra/newview/llvoavatar.cpp         |  6 +++---
 indra/newview/llvosky.cpp            |  4 ++--
 indra/newview/llvovolume.cpp         |  6 +++---
 17 files changed, 43 insertions(+), 41 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 1f653c159c..3287a894d3 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -134,7 +134,7 @@ S32 wchar_to_utf8chars(llwchar in_char, char* outchars)
 		*outchars++ = 0xF0 | (cur_char >> 18);
 		*outchars++ = 0x80 | ((cur_char >> 12) & 0x3F);
 		*outchars++ = 0x80 | ((cur_char >> 6) & 0x3F);
-		*outchars++ = 0x80 | cur_char & 0x3F;
+		*outchars++ = 0x80 | (cur_char & 0x3F);
 	}
 	else if (cur_char < 0x4000000)
 	{
@@ -142,7 +142,7 @@ S32 wchar_to_utf8chars(llwchar in_char, char* outchars)
 		*outchars++ = 0x80 | ((cur_char >> 18) & 0x3F);
 		*outchars++ = 0x80 | ((cur_char >> 12) & 0x3F);
 		*outchars++ = 0x80 | ((cur_char >> 6) & 0x3F);
-		*outchars++ = 0x80 | cur_char & 0x3F;
+		*outchars++ = 0x80 | (cur_char & 0x3F);
 	}
 	else if (cur_char < 0x80000000)
 	{
@@ -151,7 +151,7 @@ S32 wchar_to_utf8chars(llwchar in_char, char* outchars)
 		*outchars++ = 0x80 | ((cur_char >> 18) & 0x3F);
 		*outchars++ = 0x80 | ((cur_char >> 12) & 0x3F);
 		*outchars++ = 0x80 | ((cur_char >> 6) & 0x3F);
-		*outchars++ = 0x80 | cur_char & 0x3F;
+		*outchars++ = 0x80 | (cur_char & 0x3F);
 	}
 	else
 	{
diff --git a/indra/llcommon/llstringtable.h b/indra/llcommon/llstringtable.h
index 4492063275..2a0c0d8d29 100644
--- a/indra/llcommon/llstringtable.h
+++ b/indra/llcommon/llstringtable.h
@@ -48,10 +48,12 @@
 //# define STRING_TABLE_HASH_MAP 1
 #endif
 
-#if LL_WINDOWS
-#include <hash_map>
-#else
-#include <ext/hash_map>
+#if STRING_TABLE_HASH_MAP
+# if LL_WINDOWS
+#  include <hash_map>
+# else
+#  include <ext/hash_map>
+# endif
 #endif
 
 const U32 MAX_STRINGS_LENGTH = 256;
diff --git a/indra/llmath/v3math.h b/indra/llmath/v3math.h
index 7f96800e21..8c65d93302 100644
--- a/indra/llmath/v3math.h
+++ b/indra/llmath/v3math.h
@@ -411,8 +411,8 @@ inline bool operator<(const LLVector3 &a, const LLVector3 &b)
 	return (a.mV[0] < b.mV[0]
 			|| (a.mV[0] == b.mV[0]
 				&& (a.mV[1] < b.mV[1]
-					|| (a.mV[1] == b.mV[1])
-						&& a.mV[2] < b.mV[2])));
+					|| ((a.mV[1] == b.mV[1])
+						&& a.mV[2] < b.mV[2]))));
 }
 
 inline const LLVector3& operator+=(LLVector3 &a, const LLVector3 &b)
diff --git a/indra/llmessage/lliobuffer.cpp b/indra/llmessage/lliobuffer.cpp
index 71c1df8f99..223a23949b 100644
--- a/indra/llmessage/lliobuffer.cpp
+++ b/indra/llmessage/lliobuffer.cpp
@@ -87,7 +87,7 @@ LLIOPipe::EStatus LLIOBuffer::seek(LLIOBuffer::EHead head, S64 delta)
 	{
 	case READ:
 		if(((delta >= 0) && ((mReadHead + delta) <= mWriteHead))
-		   || (delta < 0) && ((mReadHead + delta) >= mBuffer))
+		   || ((delta < 0) && ((mReadHead + delta) >= mBuffer)))
 		{
 			mReadHead += delta;
 			status = STATUS_OK;
@@ -95,7 +95,7 @@ LLIOPipe::EStatus LLIOBuffer::seek(LLIOBuffer::EHead head, S64 delta)
 		break;
 	case WRITE:
 		if(((delta >= 0) && ((mWriteHead + delta) < (mBuffer + mBufferSize)))
-		   || (delta < 0) && ((mWriteHead + delta) > mReadHead))
+		   || ((delta < 0) && ((mWriteHead + delta) > mReadHead)))
 		{
 			mWriteHead += delta;
 			status = STATUS_OK;
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index b7f31779ca..4cf8451dbe 100644
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -139,7 +139,7 @@ void LLRenderTarget::addColorAttachment(U32 color_fmt)
 
 	U32 offset = mTex.size();
 	if (offset >= 4 ||
-		offset > 0 && (mFBO == 0 || !gGLManager.mHasDrawBuffers))
+		(offset > 0 && (mFBO == 0 || !gGLManager.mHasDrawBuffers)))
 	{
 		llerrs << "Too many color attachments!" << llendl;
 	}
@@ -608,7 +608,7 @@ void LLMultisampleBuffer::addColorAttachment(U32 color_fmt)
 
 	U32 offset = mTex.size();
 	if (offset >= 4 ||
-		offset > 0 && (mFBO == 0 || !gGLManager.mHasDrawBuffers))
+		(offset > 0 && (mFBO == 0 || !gGLManager.mHasDrawBuffers)))
 	{
 		llerrs << "Too many color attachments!" << llendl;
 	}
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index a8d06643ff..9af92af530 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -2416,8 +2416,8 @@ void LLMenuGL::createJumpKeys()
 				{
 					char jump_key = uppercase_word[i];
 					
-					if (LLStringOps::isDigit(jump_key) || LLStringOps::isUpper(jump_key) &&
-						mJumpKeys.find(jump_key) == mJumpKeys.end())
+					if (LLStringOps::isDigit(jump_key) || (LLStringOps::isUpper(jump_key) &&
+						mJumpKeys.find(jump_key) == mJumpKeys.end()))
 					{
 						mJumpKeys.insert(std::pair<KEY, LLMenuItemGL*>(jump_key, (*item_it)));
 						(*item_it)->setJumpKey(jump_key);
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index b11dcc1608..644f1695d4 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -309,8 +309,8 @@ void LLDrawPoolBump::endRenderPass(S32 pass)
 void LLDrawPoolBump::beginShiny(bool invisible)
 {
 	LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY);
-	if (!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY)|| 
-		invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY))
+	if ((!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY))|| 
+		(invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY)))
 	{
 		return;
 	}
@@ -384,8 +384,8 @@ void LLDrawPoolBump::beginShiny(bool invisible)
 void LLDrawPoolBump::renderShiny(bool invisible)
 {
 	LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY);
-	if (!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY)|| 
-		invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY))
+	if ((!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY))|| 
+		(invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY)))
 	{
 		return;
 	}
@@ -411,8 +411,8 @@ void LLDrawPoolBump::renderShiny(bool invisible)
 void LLDrawPoolBump::endShiny(bool invisible)
 {
 	LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY);
-	if (!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY)|| 
-		invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY))
+	if ((!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY))|| 
+		(invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY)))
 	{
 		return;
 	}
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 69edccacf0..e179fa866b 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -959,7 +959,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			0.75f
 		};
 
-		if (getPoolType() != LLDrawPool::POOL_ALPHA && (LLPipeline::sRenderDeferred || LLPipeline::sRenderBump && tep->getShiny()))
+		if (getPoolType() != LLDrawPool::POOL_ALPHA && (LLPipeline::sRenderDeferred || (LLPipeline::sRenderBump && tep->getShiny())))
 		{
 			color.mV[3] = U8 (alpha[tep->getShiny()] * 255);
 		}
diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp
index 3a5bec2be0..77461e8f0d 100644
--- a/indra/newview/llhudeffectlookat.cpp
+++ b/indra/newview/llhudeffectlookat.cpp
@@ -421,8 +421,8 @@ BOOL LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec
 	BOOL lookAtChanged = (target_type != mTargetType) || (object != mTargetObject);
 
 	// lookat position has moved a certain amount and we haven't just sent an update
-	lookAtChanged = lookAtChanged || (dist_vec(position, mLastSentOffsetGlobal) > MIN_DELTAPOS_FOR_UPDATE) && 
-		((current_time - mLastSendTime) > (1.f / MAX_SENDS_PER_SEC));
+	lookAtChanged = lookAtChanged || ((dist_vec(position, mLastSentOffsetGlobal) > MIN_DELTAPOS_FOR_UPDATE) && 
+		((current_time - mLastSendTime) > (1.f / MAX_SENDS_PER_SEC)));
 
 	if (lookAtChanged)
 	{
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index f8b824732f..cc3d6a364d 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -1671,9 +1671,9 @@ public:
 	virtual bool earlyFail(LLSpatialGroup* group)
 	{
 		if (mResult || //already found a node, don't check any more
-			group->mOctreeNode->getParent() &&	//never occlusion cull the root node
+			(group->mOctreeNode->getParent() &&	//never occlusion cull the root node
 			LLPipeline::sUseOcclusion &&			//ignore occlusion if disabled
-			group->isState(LLSpatialGroup::OCCLUDED))
+			group->isState(LLSpatialGroup::OCCLUDED)))
 		{
 			return true;
 		}
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 986555db49..92c9f3f553 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -189,8 +189,8 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
 			} // else nothing (fall through to touch)
 			
 		case CLICK_ACTION_PAY:
-			if (object && object->flagTakesMoney()
-				|| parent && parent->flagTakesMoney())
+			if ((object && object->flagTakesMoney())
+				|| (parent && parent->flagTakesMoney()))
 			{
 				// pay event goes to object actually clicked on
 				mClickActionObject = object;
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp
index 72d1494d96..b7612d901c 100644
--- a/indra/newview/llviewercamera.cpp
+++ b/indra/newview/llviewercamera.cpp
@@ -759,8 +759,8 @@ BOOL LLViewerCamera::areVertsVisible(LLViewerObject* volumep, BOOL all_verts)
 
 			BOOL in_frustum = pointInFrustum(LLVector3(vec)) > 0;
 
-			if ( !in_frustum && all_verts ||
-				 in_frustum && !all_verts)
+			if (( !in_frustum && all_verts) ||
+				 (in_frustum && !all_verts))
 			{
 				return !all_verts;
 			}
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
index 15c814829c..cc3d4ea594 100644
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -683,7 +683,7 @@ BOOL LLViewerKeyboard::bindKey(const S32 mode, const KEY key, const MASK mask, c
 			if (idx >=2 && idx <= 12)
 			{
 				U32 keyidx = ((mask<<16)|key);
-				(mRemapKeys[mode])[keyidx] = ((0<<16)|KEY_F1+(idx-1));
+				(mRemapKeys[mode])[keyidx] = ((0<<16)|(KEY_F1+(idx-1)));
 				return TRUE;
 			}
 		}
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 6591cd3b19..8e8f882d75 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -637,8 +637,8 @@ BOOL LLViewerObject::setDrawableParent(LLDrawable* parentp)
 	
 	BOOL ret = mDrawable->mXform.setParent(parentp ? &parentp->mXform : NULL);
 	gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
-	if(	old_parent != parentp &&
-		old_parent || (parentp && parentp->isActive()))
+	if(	(old_parent != parentp && old_parent)
+		|| (parentp && parentp->isActive()))
 	{
 		// *TODO we should not be relying on setDrawable parent to call markMoved
 		gPipeline.markMoved(mDrawable, FALSE);
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 983a580fea..e7f283a11c 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1539,7 +1539,7 @@ BOOL LLVOAvatar::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
 		)
 {
 
-	if (mIsSelf && !gAgent.needsRenderAvatar() || !LLPipeline::sPickAvatar)
+	if ((mIsSelf && !gAgent.needsRenderAvatar()) || !LLPipeline::sPickAvatar)
 	{
 		return FALSE;
 	}
@@ -9015,9 +9015,9 @@ BOOL LLVOAvatar::updateLOD()
 
 	LLFace* facep = mDrawable->getFace(0);
 	if (facep->mVertexBuffer.isNull() ||
-		LLVertexBuffer::sEnableVBOs &&
+		(LLVertexBuffer::sEnableVBOs &&
 		((facep->mVertexBuffer->getUsage() == GL_STATIC_DRAW ? TRUE : FALSE) !=
-		(facep->getPool()->getVertexShaderLevel() > 0 ? TRUE : FALSE)))
+		(facep->getPool()->getVertexShaderLevel() > 0 ? TRUE : FALSE))))
 	{
 		mDirtyMesh = TRUE;
 	}
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index d4df141477..bbc5daf847 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -1095,10 +1095,10 @@ BOOL LLVOSky::updateSky()
 							   mLastTotalAmbient.mV[2] - mTotalAmbient.mV[2]);
 
 			if ( mForceUpdate 
-				 || ((dot_lighting < LIGHT_DIRECTION_THRESHOLD)
+				 || (((dot_lighting < LIGHT_DIRECTION_THRESHOLD)
 				 || (delta_color.length() > COLOR_CHANGE_THRESHOLD)
 				 || !mInitialized)
-				&& !direction.isExactlyZero())
+				&& !direction.isExactlyZero()))
 			{
 				mLastLightingDirection = direction;
 				mLastTotalAmbient = mTotalAmbient;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index dd68733d98..6079f02147 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -470,8 +470,8 @@ void LLVOVolume::updateTextures()
 
 		if (face->mTextureMatrix != NULL)
 		{
-			if (vsize < MIN_TEX_ANIM_SIZE && old_size > MIN_TEX_ANIM_SIZE ||
-				vsize > MIN_TEX_ANIM_SIZE && old_size < MIN_TEX_ANIM_SIZE)
+			if ((vsize < MIN_TEX_ANIM_SIZE && old_size > MIN_TEX_ANIM_SIZE) ||
+				(vsize > MIN_TEX_ANIM_SIZE && old_size < MIN_TEX_ANIM_SIZE))
 			{
 				gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD, FALSE);
 			}
@@ -2387,7 +2387,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 						{ //needs normal + binormal
 							bump_faces.push_back(facep);
 						}
-						else if (te->getShiny() && LLPipeline::sRenderBump ||
+						else if ((te->getShiny() && LLPipeline::sRenderBump) ||
 							!te->getFullbright())
 						{ //needs normal
 							simple_faces.push_back(facep);
-- 
cgit v1.2.3


From be7ac8bbfe991427636656ec1679b8119c9d9dbe Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Thu, 10 Sep 2009 10:31:58 -0700
Subject: Fix a link error with an integration test on OS X.

---
 indra/llmessage/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra')

diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index ec52179a39..453286b83d 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -3,6 +3,7 @@
 project(llmessage)
 
 include(00-Common)
+include(GoogleMock)
 include(LLAddBuildTest)
 include(LLCommon)
 include(LLMath)
@@ -230,6 +231,7 @@ IF (NOT LINUX AND VIEWER)
       ${LLVFS_LIBRARIES}
       ${LLMATH_LIBRARIES}
       ${LLCOMMON_LIBRARIES}
+      ${GOOGLEMOCK_LIBRARIES}
       )
 
     LL_ADD_INTEGRATION_TEST(
-- 
cgit v1.2.3


From 48328db339b5eff70a631f067fb3010b30cb4d3a Mon Sep 17 00:00:00 2001
From: Steve Linden <steve@lindenlab.com>
Date: Thu, 10 Sep 2009 15:36:49 -0700
Subject: #ifdef'd out gmock and gtest for LL_WINDOWS. Does not appear to be
 needed and breaks the build.

---
 indra/test/test.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra')

diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index c9e985c914..e7ba8e33b8 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -54,8 +54,10 @@
 #	include "ctype_workaround.h"
 #endif
 
+#ifndef LL_WINDOWS
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
+#endif
 
 namespace tut
 {
@@ -243,7 +245,9 @@ int main(int argc, char **argv)
 {
 	// The following line must be executed to initialize Google Mock
 	// (and Google Test) before running the tests.
+#ifndef LL_WINDOWS
 	::testing::InitGoogleMock(&argc, argv);
+#endif
 	LLError::initForApplication(".");
 	LLError::setFatalFunction(wouldHaveCrashed);
 	LLError::setDefaultLevel(LLError::LEVEL_ERROR);
-- 
cgit v1.2.3


From 9a8042d5a3edfd07727793a1939c3ab361ceec9a Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Sun, 13 Sep 2009 15:32:28 -0700
Subject: Adapt the build script so it can be invoked from a developer
 checkout.

---
 indra/llcommon/llversionserver.h              | 2 +-
 indra/llcommon/llversionviewer.h              | 2 +-
 indra/newview/English.lproj/InfoPlist.strings | 4 ++--
 indra/newview/Info-SecondLife.plist           | 2 +-
 indra/newview/res/viewerRes.rc                | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index f073bd327b..77a03879bf 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 31;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 2425;
+const S32 LL_VERSION_BUILD = 2639;
 
 const char * const LL_CHANNEL = "Second Life Server";
 
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 04cf98ce19..ccea101cd6 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 2;
 const S32 LL_VERSION_MINOR = 0;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 2425;
+const S32 LL_VERSION_BUILD = 2639;
 
 const char * const LL_CHANNEL = "Second Life 2009";
 
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 28853ba032..0e685c818a 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -2,6 +2,6 @@
 
 CFBundleName = "Second Life";
 
-CFBundleShortVersionString = "Second Life version 2.0.0.2425";
-CFBundleGetInfoString = "Second Life version 2.0.0.2425, Copyright 2004-2009 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 2.0.0.2639";
+CFBundleGetInfoString = "Second Life version 2.0.0.2639, Copyright 2004-2009 Linden Research, Inc.";
 
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index c0a33feaec..0c1d6ea105 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.0.2425</string>
+	<string>2.0.0.2639</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index d64fc7c8da..bdf7631770 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -138,8 +138,8 @@ TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,2425
- PRODUCTVERSION 2,0,0,2425
+ FILEVERSION 2,0,0,2639
+ PRODUCTVERSION 2,0,0,2639
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -156,12 +156,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "2.0.0.2425"
+            VALUE "FileVersion", "2.0.0.2639"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright � 2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "2.0.0.2425"
+            VALUE "ProductVersion", "2.0.0.2639"
         END
     END
     BLOCK "VarFileInfo"
-- 
cgit v1.2.3