From 87377c983ee4add8510e365abf25c566eeaf6d00 Mon Sep 17 00:00:00 2001
From: Kadah <none@none>
Date: Sun, 12 Jun 2011 16:54:56 -0700
Subject: [PATCH 1/7] Copied FS profile chages to default

---
 .../xui/en/panel_profile_secondlife.xml       | 29 ++++++++++++-------
 .../xui/en/panel_profile_secondlife.xml       |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index e1ec2224fc..d97c640a7e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -74,7 +74,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
             <view_border
              left_pad="4"
              height="16"
-             width="310"
+             right="-86"
              bevel_style="in"
              follows="left|top|right"
              name="info_border" />
@@ -82,7 +82,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              left_delta="3"
              bottom_delta="2"
              height="16"
-             width="310"
+             right="-86"
              h_pad="0"
              v_pad="0"
              allow_scroll="false"
@@ -98,7 +98,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              layout="topleft"
              follows="top|right"
              image_overlay="Copy"
-             top_delta="-3"
+             top_delta="-5"
              left_pad="4"
              height="21"
              width="21"
@@ -107,15 +107,15 @@ KC: I used view_border's around text_editor's due to text render issues with bor
 
             <text
              follows="top|right"
-             halign="right"
+             halign="center"
              height="13"
-             top_pad="-17"
+             top_pad="-15"
+             left_pad="2"
              right="-6"
              layout="topleft"
              name="status"
              text_color="LtGray_50"
-             value="Online"
-             width="70" />
+             value="Online" />
 
             <text
              top_pad="2"
@@ -130,7 +130,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
             <view_border
              left_pad="4"
              height="16"
-             right="-6"
+             right="-86"
              bevel_style="in"
              follows="left|top|right"
              name="info_border" />
@@ -138,7 +138,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              left_delta="3"
              bottom_delta="2"
              height="16"
-             right="-6"
+             right="-86"
              h_pad="0"
              v_pad="0"
              allow_scroll="false"
@@ -149,10 +149,19 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              name="user_key"
              value="(loading...)" />
 
+            <button
+             name="copy_uri"
+             left_pad="4"
+             right="-6"
+             bottom_delta="2"
+             height="20"
+             label="Copy URI"
+             enabled="false"
+             follows="top|right" />
 
             <texture_picker
              left="6"
-             top_pad="5"
+             top_pad="3"
              height="180"
              width="220"
              allow_no_texture="true"
diff --git a/indra/newview/skins/firestorm/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/firestorm/xui/en/panel_profile_secondlife.xml
index 57dba371a8..9c81b7fe47 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_profile_secondlife.xml
@@ -62,7 +62,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
 -->
 
             <text
-             top="8"
+             top_pad="8"
              follows="left|top"
              halign="right"
              height="16"

From 541f8715f5e3dfd4f00324cd7479b047d8533c79 Mon Sep 17 00:00:00 2001
From: Kadah <none@none>
Date: Sun, 12 Jun 2011 17:02:21 -0700
Subject: [PATCH 2/7] Moved FS profile layout to default

---
 .../xui/en/panel_profile_secondlife.xml       |  47 +-
 .../xui/en/panel_profile_secondlife.xml       | 450 ------------------
 .../xui/en/panel_profile_secondlife.xml       |  47 +-
 3 files changed, 47 insertions(+), 497 deletions(-)
 delete mode 100644 indra/newview/skins/firestormsidetabs/xui/en/panel_profile_secondlife.xml
 rename indra/newview/skins/{firestorm => metaharper}/xui/en/panel_profile_secondlife.xml (99%)

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index d97c640a7e..9c81b7fe47 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -265,6 +265,29 @@ KC: I used view_border's around text_editor's due to text render issues with bor
             <!--<button follows="left|top" left="15"  top="75" height="20" halign="center"
             label="&lt; &lt;" label_selected="&gt; &gt;" name="bigimg" tool_tip="Open Full Size." width="40" />-->
 
+            <text
+             left="6"
+             top_pad="8"
+             follows="left|top"
+             halign="right"
+             height="16"
+             name="Groups:"
+             width="45"
+             value="Groups:" />
+
+            <group_list
+            left_pad="8"
+            top_delta="0"
+            height="80"
+            right="-6"
+            border_visible="true"
+            for_agent="false"
+            follows="left|top|right"
+            name="group_list" />
+
+            <!--<button follows="left|top" left="15"  top="240" height="20" halign="center"
+            label="+" label_selected="+" name="PhoenixGroupInvite_Button" tool_tip="Invite to Group." width="40" />-->
+
             <text
              left="6"
              top_pad="8"
@@ -297,30 +320,6 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              word_wrap="true"
              parse_urls="true" />
 
-
-            <text
-             left="6"
-             top_pad="8"
-             follows="left|bottom"
-             halign="right"
-             height="16"
-             name="Groups:"
-             width="45"
-             value="Groups:" />
-
-            <group_list
-            left_pad="8"
-            top_delta="0"
-            height="80"
-            right="-6"
-            border_visible="true"
-            for_agent="false"
-            follows="left|bottom|right"
-            name="group_list" />
-
-            <!--<button follows="left|top" left="15"  top="240" height="20" halign="center"
-            label="+" label_selected="+" name="PhoenixGroupInvite_Button" tool_tip="Invite to Group." width="40" />-->
-
             <layout_stack
              top_pad="8"
              left="6"
diff --git a/indra/newview/skins/firestormsidetabs/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/firestormsidetabs/xui/en/panel_profile_secondlife.xml
deleted file mode 100644
index 53b04a097a..0000000000
--- a/indra/newview/skins/firestormsidetabs/xui/en/panel_profile_secondlife.xml
+++ /dev/null
@@ -1,450 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="all"
- height="450"
- label="Profile"
- layout="topleft"
- left="0"
- name="panel_profile"
- top="0"
- width="430">
-    <string
-     name="CaptionTextAcctInfo">
-[ACCTTYPE]
-[PAYMENTINFO]
-[AGEVERIFICATION]
-    </string>
-    <string
-     name="payment_update_link_url">
-        http://www.secondlife.com/account/billing.php?lang=en
-    </string>
-    <string
-     name="partner_edit_link_url">
-        http://www.secondlife.com/account/partners.php?lang=en
-    </string>
-    <string
-     name="my_account_link_url"
-     value="http://secondlife.com/account" />
-    <string
-     name="no_partner_text"
-     value="None" />
-    <string
-     name="no_group_text"
-     value="None" />
-    <string
-     name="RegisterDateFormat">
-[REG_DATE]
-([AGE])
-    </string>
-  <string
-  name="name_text_args">
-    [NAME]
-  </string>
-  <string
-    name="display_name_text_args">
-    [DISPLAY_NAME]
-  </string>
-
-
-          <panel
-           layout="topleft"
-           follows="left|top|right|bottom"
-           height="450"
-           name="second_life_panel"
-           top="0"
-           left="0"
-           width="430">
-
-<!--
-
-KC: I used view_border's around text_editor's due to text render issues with border_visible
-
--->
-
-            <text
-             top="8"
-             follows="left|top"
-             halign="right"
-             height="16"
-             left="6"
-             name="Key:"
-             width="40"
-             value="Key:" />
-
-            <view_border
-             left_pad="4"
-             height="16"
-             right="-86"
-             bevel_style="in"
-             follows="left|top|right"
-             name="info_border" />
-            <text_editor
-             left_delta="3"
-             bottom_delta="2"
-             height="16"
-             right="-86"
-             h_pad="0"
-             v_pad="0"
-             allow_scroll="false"
-             bg_visible="false"
-             enabled="false"
-             follows="left|top|right"
-             max_length="254"
-             name="user_key"
-             value="(loading...)" />
-
-            <button
-             name="copy_uri"
-             left_pad="4"
-             right="-6"
-             height="20"
-             label="Copy URI"
-             enabled="false"
-             follows="top|right" />
-
-            <text
-             top_pad="2"
-             follows="left|top"
-             halign="right"
-             height="16"
-             left="6"
-             name="Name:"
-             width="40"
-             value="Name:" />
-
-            <view_border
-             left_pad="4"
-             height="16"
-             width="310"
-             bevel_style="in"
-             follows="left|top|right"
-             name="info_border" />
-            <text_editor
-             left_delta="3"
-             bottom_delta="2"
-             height="16"
-             width="310"
-             h_pad="0"
-             v_pad="0"
-             allow_scroll="false"
-             bg_visible="false"
-             enabled="false"
-             follows="left|top|right"
-             max_length="254"
-             name="complete_name"
-             value="(loading...)" />
-
-            <button
-             name="copy_to_clipboard"
-             layout="topleft"
-             follows="top|right"
-             image_overlay="Copy"
-             top_delta="-3"
-             left_pad="4"
-             height="21"
-             width="21"
-             tab_stop="false"
-             tool_tip="Copy to Clipboard"/>
-
-            <text
-             follows="top|right"
-             halign="right"
-             height="13"
-             top_pad="-17"
-             right="-6"
-             layout="topleft"
-             name="status"
-             text_color="LtGray_50"
-             value="Online"
-             width="70" />
-
-            <texture_picker
-             left="6"
-             top_pad="5"
-             height="180"
-             width="220"
-             allow_no_texture="true"
-             default_image_name="None"
-             enabled="false"
-             fallback_image="Generic_Person_Large"
-             follows="top|left"
-             name="2nd_life_pic" />
-
-            <text
-             top_pad="-179"
-             left_pad="4"
-             follows="left|top|right"
-             halign="left"
-             height="16"
-             name="label"
-             right="-6"
-             value="Born:" />
-
-            <view_border
-             top_pad="0"
-             left_delta="0"
-             height="32"
-             right="-6"
-             bevel_style="in"
-             follows="left|top|right"
-             name="info_border" />
-            <text
-             top_delta="2"
-             left_delta="2"
-             height="28"
-             right="-6"
-             enabled="true"
-             follows="left|top|right"
-             max_length="254"
-             name="register_date" />
-
-            <text
-             top_pad="7"
-             follows="left|top|right"
-             halign="left"
-             height="16"
-             left_delta="-2"
-             name="label2"
-             right="-6"
-             value="Account:" />
-
-            <view_border
-             top_pad="0"
-             left_delta="0"
-             bevel_style="in"
-             follows="left|top|right"
-             height="48"
-             right="-6"
-             name="acct_border" />
-            <text_editor
-             top_delta="2"
-             left_delta="2"
-             height="44"
-             right="-6"
-             allow_scroll="false"
-             bg_visible="false"
-             follows="left|top|right"
-             h_pad="2"
-             v_pad="0"
-             layout="topleft"
-             name="acc_status_text"
-             read_only="true"
-             translate="false"
-             word_wrap="true"/>
-
-            <text
-             top_pad="7"
-             left_delta="-2"
-             height="16"
-             right="-6"
-             follows="left|top|right"
-             halign="left"
-             name="partner_label"
-             value="Partner:" />
-
-            <view_border
-             top_pad="0"
-             left_delta="0"
-             height="18"
-             right="-6"
-             bevel_style="in"
-             follows="left|top|right"
-             name="info_border" />
-            <text
-             top_delta="2"
-             left_delta="2"
-             height="16"
-             right="-6"
-             border_visible="true"
-             enabled="true"
-             follows="left|top|right"
-             max_length="254"
-             name="partner_text" />
-
-            <!--<button follows="left|top" left="15"  top="75" height="20" halign="center"
-            label="&lt; &lt;" label_selected="&gt; &gt;" name="bigimg" tool_tip="Open Full Size." width="40" />-->
-
-            <text
-             left="6"
-             top_pad="8"
-             follows="left|top"
-             halign="right"
-             height="16"
-             name="Groups:"
-             width="45"
-             value="Groups:" />
-
-            <group_list
-            left_pad="8"
-            top_delta="0"
-            height="80"
-            right="-6"
-            border_visible="true"
-            for_agent="false"
-            follows="left|top|right"
-            name="group_list" />
-
-            <!--<button follows="left|top" left="15"  top="240" height="20" halign="center"
-            label="+" label_selected="+" name="PhoenixGroupInvite_Button" tool_tip="Invite to Group." width="40" />-->
-
-            <text
-             left="6"
-             top_pad="8"
-             height="16"
-             width="45"
-             follows="left|top"
-             halign="right"
-             name="About:"
-             value="About:" />
-
-            <view_border
-             left_pad="6"
-             top_delta="0"
-             height="90"
-             right="-6"
-             bevel_style="in"
-             follows="all"
-             name="info_border" />
-            <text_editor
-             left_delta="1"
-             top_delta="1"
-             height="88"
-             right="-7"
-             read_only="true"
-             enabled="false"
-             follows="all"
-             max_length="512"
-             name="sl_description_edit"
-             h_pad="2"
-             word_wrap="true"
-             parse_urls="true" />
-
-            <layout_stack
-             top_pad="8"
-             left="6"
-             right="-6"
-             orientation="horizontal"
-             follows="left|bottom|right"
-             height="44">
-
-            <layout_panel
-			 name="left_buttonstack"
-             left="2"
-             right="-2"
-             height="42"
-             user_resize="false"
-             follows="all"
-             layout="topleft">
-
-            <button
-             top="2"
-             left="2"
-             height="20"
-             halign="center"
-             label="Find on Map"
-             label_selected="Find on Map"
-             name="show_on_map_btn"
-			 tool_tip="Locate the Resident on the map"
-             follows="left|top|right" />
-
-            <button
-             top_pad="2"
-             height="20"
-             halign="center"
-             label="Pay"
-             label_selected="Pay"
-             name="pay"
-             tool_tip="Pay money to or share inventory with the Resident"
-             follows="left|top|right" />
-
-            </layout_panel>
-            <layout_panel
-			 name="middle_buttonstack"
-             left="2"
-             right="-2"
-             user_resize="false"
-             follows="all"
-             layout="topleft">
-
-            <button
-             top="2"
-             left="2"
-             height="20"
-             halign="center"
-             label="Offer Teleport"
-             label_selected="Offer Teleport"
-             name="teleport"
-			 tool_tip="Offer a teleport to the Resident"
-             follows="left|top|right" />
-
-            <button
-             top_pad="2"
-             height="20"
-             halign="center"
-             label="Instant Message"
-             label_selected="Instant Message"
-             name="im"
-             tool_tip="Open instant message session"
-             follows="left|top|right" />
-
-            </layout_panel>
-            <layout_panel
-			 name="right_buttonstack"
-             left="2"
-             right="-2"
-             user_resize="false"
-             follows="all"
-             layout="topleft">
-
-            <button
-             top="2"
-             left="2"
-             height="20"
-             halign="center"
-             label="Add Friend"
-             label_selected="Add Friend"
-             name="add_friend"
-             tool_tip="Offer friendship to the Resident"
-             follows="left|top|right" />
-
-            <button
-             top_pad="2"
-             height="20"
-             right="-40"
-             label="Block"
-             layout="topleft"
-             name="block"
-             tool_tip="Block this Resident"
-             use_ellipses="true"
-             commit_callback.function="Profile.BlockUnblock"
-             enabled_callback.function="Profile.EnableBlock"
-             follows="left|top|right" />
-
-            <button
-             top_delta="0"
-             height="20"
-             right="-40"
-             label="Unblock"
-             layout="topleft"
-             name="unblock"
-             tool_tip="Unblock this Resident"
-             use_ellipses="true"
-             commit_callback.function="Profile.BlockUnblock"
-             enabled_callback.function="Profile.EnableUnblock"
-             follows="left|top|right" />
-
-            <menu_button
-             left_pad="4"
-             height="20"
-             image_overlay="OptionsMenu_Off"
-             layout="topleft"
-             name="overflow_btn"
-             width="36"
-             follows="top|right" />
-
-            </layout_panel>
-            </layout_stack>
-
-          </panel>
-</panel>
-
diff --git a/indra/newview/skins/firestorm/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml
similarity index 99%
rename from indra/newview/skins/firestorm/xui/en/panel_profile_secondlife.xml
rename to indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml
index 9c81b7fe47..d97c640a7e 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml
@@ -265,29 +265,6 @@ KC: I used view_border's around text_editor's due to text render issues with bor
             <!--<button follows="left|top" left="15"  top="75" height="20" halign="center"
             label="&lt; &lt;" label_selected="&gt; &gt;" name="bigimg" tool_tip="Open Full Size." width="40" />-->
 
-            <text
-             left="6"
-             top_pad="8"
-             follows="left|top"
-             halign="right"
-             height="16"
-             name="Groups:"
-             width="45"
-             value="Groups:" />
-
-            <group_list
-            left_pad="8"
-            top_delta="0"
-            height="80"
-            right="-6"
-            border_visible="true"
-            for_agent="false"
-            follows="left|top|right"
-            name="group_list" />
-
-            <!--<button follows="left|top" left="15"  top="240" height="20" halign="center"
-            label="+" label_selected="+" name="PhoenixGroupInvite_Button" tool_tip="Invite to Group." width="40" />-->
-
             <text
              left="6"
              top_pad="8"
@@ -320,6 +297,30 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              word_wrap="true"
              parse_urls="true" />
 
+
+            <text
+             left="6"
+             top_pad="8"
+             follows="left|bottom"
+             halign="right"
+             height="16"
+             name="Groups:"
+             width="45"
+             value="Groups:" />
+
+            <group_list
+            left_pad="8"
+            top_delta="0"
+            height="80"
+            right="-6"
+            border_visible="true"
+            for_agent="false"
+            follows="left|bottom|right"
+            name="group_list" />
+
+            <!--<button follows="left|top" left="15"  top="240" height="20" halign="center"
+            label="+" label_selected="+" name="PhoenixGroupInvite_Button" tool_tip="Invite to Group." width="40" />-->
+
             <layout_stack
              top_pad="8"
              left="6"

From 8145800cba25c1942f45b26bf2b29f9382a45b8c Mon Sep 17 00:00:00 2001
From: Kadah <none@none>
Date: Sun, 12 Jun 2011 17:36:32 -0700
Subject: [PATCH 3/7] Added missing xui from last commit

---
 .../xui/en/panel_profile_secondlife.xml       | 452 ++++++++++++++++++
 1 file changed, 452 insertions(+)
 create mode 100644 indra/newview/skins/metaharpersidetabs/xui/en/panel_profile_secondlife.xml

diff --git a/indra/newview/skins/metaharpersidetabs/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/metaharpersidetabs/xui/en/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..d97c640a7e
--- /dev/null
+++ b/indra/newview/skins/metaharpersidetabs/xui/en/panel_profile_secondlife.xml
@@ -0,0 +1,452 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="all"
+ height="450"
+ label="Profile"
+ layout="topleft"
+ left="0"
+ name="panel_profile"
+ top="0"
+ width="430">
+    <string
+     name="CaptionTextAcctInfo">
+[ACCTTYPE]
+[PAYMENTINFO]
+[AGEVERIFICATION]
+    </string>
+    <string
+     name="payment_update_link_url">
+        http://www.secondlife.com/account/billing.php?lang=en
+    </string>
+    <string
+     name="partner_edit_link_url">
+        http://www.secondlife.com/account/partners.php?lang=en
+    </string>
+    <string
+     name="my_account_link_url"
+     value="http://secondlife.com/account" />
+    <string
+     name="no_partner_text"
+     value="None" />
+    <string
+     name="no_group_text"
+     value="None" />
+    <string
+     name="RegisterDateFormat">
+[REG_DATE]
+([AGE])
+    </string>
+  <string
+  name="name_text_args">
+    [NAME]
+  </string>
+  <string
+    name="display_name_text_args">
+    [DISPLAY_NAME]
+  </string>
+
+
+          <panel
+           layout="topleft"
+           follows="left|top|right|bottom"
+           height="450"
+           name="second_life_panel"
+           top="0"
+           left="0"
+           width="430">
+
+<!--
+
+KC: I used view_border's around text_editor's due to text render issues with border_visible
+
+-->
+
+            <text
+             top_pad="8"
+             follows="left|top"
+             halign="right"
+             height="16"
+             left="6"
+             name="Name:"
+             width="40"
+             value="Name:" />
+
+            <view_border
+             left_pad="4"
+             height="16"
+             right="-86"
+             bevel_style="in"
+             follows="left|top|right"
+             name="info_border" />
+            <text_editor
+             left_delta="3"
+             bottom_delta="2"
+             height="16"
+             right="-86"
+             h_pad="0"
+             v_pad="0"
+             allow_scroll="false"
+             bg_visible="false"
+             enabled="false"
+             follows="left|top|right"
+             max_length="254"
+             name="complete_name"
+             value="(loading...)" />
+
+            <button
+             name="copy_to_clipboard"
+             layout="topleft"
+             follows="top|right"
+             image_overlay="Copy"
+             top_delta="-5"
+             left_pad="4"
+             height="21"
+             width="21"
+             tab_stop="false"
+             tool_tip="Copy to Clipboard"/>
+
+            <text
+             follows="top|right"
+             halign="center"
+             height="13"
+             top_pad="-15"
+             left_pad="2"
+             right="-6"
+             layout="topleft"
+             name="status"
+             text_color="LtGray_50"
+             value="Online" />
+
+            <text
+             top_pad="2"
+             follows="left|top"
+             halign="right"
+             height="16"
+             left="6"
+             name="Key:"
+             width="40"
+             value="Key:" />
+
+            <view_border
+             left_pad="4"
+             height="16"
+             right="-86"
+             bevel_style="in"
+             follows="left|top|right"
+             name="info_border" />
+            <text_editor
+             left_delta="3"
+             bottom_delta="2"
+             height="16"
+             right="-86"
+             h_pad="0"
+             v_pad="0"
+             allow_scroll="false"
+             bg_visible="false"
+             enabled="false"
+             follows="left|top|right"
+             max_length="254"
+             name="user_key"
+             value="(loading...)" />
+
+            <button
+             name="copy_uri"
+             left_pad="4"
+             right="-6"
+             bottom_delta="2"
+             height="20"
+             label="Copy URI"
+             enabled="false"
+             follows="top|right" />
+
+            <texture_picker
+             left="6"
+             top_pad="3"
+             height="180"
+             width="220"
+             allow_no_texture="true"
+             default_image_name="None"
+             enabled="false"
+             fallback_image="Generic_Person_Large"
+             follows="top|left"
+             name="2nd_life_pic" />
+
+            <text
+             top_pad="-179"
+             left_pad="4"
+             follows="left|top|right"
+             halign="left"
+             height="16"
+             name="label"
+             right="-6"
+             value="Born:" />
+
+            <view_border
+             top_pad="0"
+             left_delta="0"
+             height="32"
+             right="-6"
+             bevel_style="in"
+             follows="left|top|right"
+             name="info_border" />
+            <text
+             top_delta="2"
+             left_delta="2"
+             height="28"
+             right="-6"
+             enabled="true"
+             follows="left|top|right"
+             max_length="254"
+             name="register_date" />
+
+            <text
+             top_pad="7"
+             follows="left|top|right"
+             halign="left"
+             height="16"
+             left_delta="-2"
+             name="label2"
+             right="-6"
+             value="Account:" />
+
+            <view_border
+             top_pad="0"
+             left_delta="0"
+             bevel_style="in"
+             follows="left|top|right"
+             height="48"
+             right="-6"
+             name="acct_border" />
+            <text_editor
+             top_delta="2"
+             left_delta="2"
+             height="44"
+             right="-6"
+             allow_scroll="false"
+             bg_visible="false"
+             follows="left|top|right"
+             h_pad="2"
+             v_pad="0"
+             layout="topleft"
+             name="acc_status_text"
+             read_only="true"
+             translate="false"
+             word_wrap="true"/>
+
+            <text
+             top_pad="7"
+             left_delta="-2"
+             height="16"
+             right="-6"
+             follows="left|top|right"
+             halign="left"
+             name="partner_label"
+             value="Partner:" />
+
+            <view_border
+             top_pad="0"
+             left_delta="0"
+             height="18"
+             right="-6"
+             bevel_style="in"
+             follows="left|top|right"
+             name="info_border" />
+            <text
+             top_delta="2"
+             left_delta="2"
+             height="16"
+             right="-6"
+             border_visible="true"
+             enabled="true"
+             follows="left|top|right"
+             max_length="254"
+             name="partner_text" />
+
+            <!--<button follows="left|top" left="15"  top="75" height="20" halign="center"
+            label="&lt; &lt;" label_selected="&gt; &gt;" name="bigimg" tool_tip="Open Full Size." width="40" />-->
+
+            <text
+             left="6"
+             top_pad="8"
+             height="16"
+             width="45"
+             follows="left|top"
+             halign="right"
+             name="About:"
+             value="About:" />
+
+            <view_border
+             left_pad="6"
+             top_delta="0"
+             height="90"
+             right="-6"
+             bevel_style="in"
+             follows="all"
+             name="info_border" />
+            <text_editor
+             left_delta="1"
+             top_delta="1"
+             height="88"
+             right="-7"
+             read_only="true"
+             enabled="false"
+             follows="all"
+             max_length="512"
+             name="sl_description_edit"
+             h_pad="2"
+             word_wrap="true"
+             parse_urls="true" />
+
+
+            <text
+             left="6"
+             top_pad="8"
+             follows="left|bottom"
+             halign="right"
+             height="16"
+             name="Groups:"
+             width="45"
+             value="Groups:" />
+
+            <group_list
+            left_pad="8"
+            top_delta="0"
+            height="80"
+            right="-6"
+            border_visible="true"
+            for_agent="false"
+            follows="left|bottom|right"
+            name="group_list" />
+
+            <!--<button follows="left|top" left="15"  top="240" height="20" halign="center"
+            label="+" label_selected="+" name="PhoenixGroupInvite_Button" tool_tip="Invite to Group." width="40" />-->
+
+            <layout_stack
+             top_pad="8"
+             left="6"
+             right="-6"
+             orientation="horizontal"
+             follows="left|bottom|right"
+             height="44">
+
+            <layout_panel
+			 name="left_buttonstack"
+             left="2"
+             right="-2"
+             height="42"
+             user_resize="false"
+             follows="all"
+             layout="topleft">
+
+            <button
+             top="2"
+             left="2"
+             height="20"
+             halign="center"
+             label="Find on Map"
+             label_selected="Find on Map"
+             name="show_on_map_btn"
+			 tool_tip="Locate the Resident on the map"
+             follows="left|top|right" />
+
+            <button
+             top_pad="2"
+             height="20"
+             halign="center"
+             label="Pay"
+             label_selected="Pay"
+             name="pay"
+             tool_tip="Pay money to or share inventory with the Resident"
+             follows="left|top|right" />
+
+            </layout_panel>
+            <layout_panel
+			 name="middle_buttonstack"
+             left="2"
+             right="-2"
+             user_resize="false"
+             follows="all"
+             layout="topleft">
+
+            <button
+             top="2"
+             left="2"
+             height="20"
+             halign="center"
+             label="Offer Teleport"
+             label_selected="Offer Teleport"
+             name="teleport"
+			 tool_tip="Offer a teleport to the Resident"
+             follows="left|top|right" />
+
+            <button
+             top_pad="2"
+             height="20"
+             halign="center"
+             label="Instant Message"
+             label_selected="Instant Message"
+             name="im"
+             tool_tip="Open instant message session"
+             follows="left|top|right" />
+
+            </layout_panel>
+            <layout_panel
+			 name="right_buttonstack"
+             left="2"
+             right="-2"
+             user_resize="false"
+             follows="all"
+             layout="topleft">
+
+            <button
+             top="2"
+             left="2"
+             height="20"
+             halign="center"
+             label="Add Friend"
+             label_selected="Add Friend"
+             name="add_friend"
+             tool_tip="Offer friendship to the Resident"
+             follows="left|top|right" />
+
+            <button
+             top_pad="2"
+             height="20"
+             right="-40"
+             label="Block"
+             layout="topleft"
+             name="block"
+             tool_tip="Block this Resident"
+             use_ellipses="true"
+             commit_callback.function="Profile.BlockUnblock"
+             enabled_callback.function="Profile.EnableBlock"
+             follows="left|top|right" />
+
+            <button
+             top_delta="0"
+             height="20"
+             right="-40"
+             label="Unblock"
+             layout="topleft"
+             name="unblock"
+             tool_tip="Unblock this Resident"
+             use_ellipses="true"
+             commit_callback.function="Profile.BlockUnblock"
+             enabled_callback.function="Profile.EnableUnblock"
+             follows="left|top|right" />
+
+            <menu_button
+             left_pad="4"
+             height="20"
+             image_overlay="OptionsMenu_Off"
+             layout="topleft"
+             name="overflow_btn"
+             width="36"
+             follows="top|right" />
+
+            </layout_panel>
+            </layout_stack>
+
+          </panel>
+</panel>
+

From 5de3a4074d520e1757d9cafacae555ed43cbd2d6 Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Sun, 12 Jun 2011 17:52:51 -0700
Subject: [PATCH 4/7] Added Jonathan Yap's mute getsure patch from LL code
 review for STORM-787 Modified only the option location in the sound
 preference floater

---
 indra/newview/app_settings/settings.xml       | 11 +++++++
 indra/newview/llfloaterpreference.cpp         |  9 ++++++
 indra/newview/llfloaterpreference.h           |  1 +
 indra/newview/llviewermessage.cpp             |  3 ++
 .../xui/en/panel_preferences_sound.xml        | 29 ++++++++++++++-----
 5 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0d73a6068c..2de8faf9fa 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3710,6 +3710,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>EnableGestureSounds</key>
+    <map>
+      <key>Comment</key>
+      <string>Play sounds from gestures</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>EnableMouselook</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index a897dd3a39..ad1699d774 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -322,6 +322,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mCommitCallbackRegistrar.add("Pref.VoiceSetKey",			boost::bind(&LLFloaterPreference::onClickSetKey, this));
 	mCommitCallbackRegistrar.add("Pref.EditMediaLists",			boost::bind(&LLFloaterPreference::onClickSetKey, this));
 	mCommitCallbackRegistrar.add("Pref.VoiceSetMiddleMouse",	boost::bind(&LLFloaterPreference::onClickSetMiddleMouse, this));
+	mCommitCallbackRegistrar.add("Pref.SetSounds",				boost::bind(&LLFloaterPreference::onClickSetSounds, this));
 //	mCommitCallbackRegistrar.add("Pref.ClickSkipDialogs",		boost::bind(&LLFloaterPreference::onClickSkipDialogs, this));
 //	mCommitCallbackRegistrar.add("Pref.ClickResetDialogs",		boost::bind(&LLFloaterPreference::onClickResetDialogs, this));
 	mCommitCallbackRegistrar.add("Pref.ClickEnablePopup",		boost::bind(&LLFloaterPreference::onClickEnablePopup, this));
@@ -1364,6 +1365,14 @@ void LLFloaterPreference::onClickSetMiddleMouse()
 		p2t_line_editor->setValue(advanced_preferences->getString("middle_mouse"));
 	}
 }
+
+void LLFloaterPreference::onClickSetSounds()
+{
+	// Disable Enable gesture sounds checkbox if the master sound is disabled 
+	// or if sound effects are disabled.
+	getChild<LLCheckBoxCtrl>("gesture_audio_play_btn")->setEnabled(!gSavedSettings.getBOOL("MuteSounds"));
+}
+
 /*
 void LLFloaterPreference::onClickSkipDialogs()
 {
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index a9dcde1941..770e1466d4 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -134,6 +134,7 @@ public:
 	void onClickSetKey();
 	void setKey(KEY key);
 	void onClickSetMiddleMouse();
+	void onClickSetSounds();
 //	void onClickSkipDialogs();
 //	void onClickResetDialogs();
 	void onClickEnablePopup();
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 0b3d715833..1fd65d1f2a 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4808,6 +4808,9 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 		if (pPeoplePanel)
 			pPeoplePanel->requestRadarChannelAlertSync();
 	}
+
+	// Don't play sounds from gestures if they are not enabled.
+	if (!gSavedSettings.getBOOL("EnableGestureSounds")) return;
 	
 	gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global);
 }
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index bb1de6f4fe..e11ee0a274 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -111,8 +111,8 @@
          function="Pref.setControlFalse"
          parameter="MuteAmbient" />
     </slider>
-        <button
-    control_name="MuteAmbient"
+    <button
+     control_name="MuteAmbient"
      disabled_control="MuteAudio"
      follows="top|left"
      height="16"
@@ -145,7 +145,7 @@
          function="Pref.setControlFalse"
          parameter="MuteSounds" />
     </slider>
-   <button
+    <button
      control_name="MuteSounds"
      disabled_control="MuteAudio"
      follows="top|left"
@@ -157,7 +157,10 @@
      left_pad="5"
      name="mute_audio"
      tab_stop="false"
-     width="16" />
+     width="16">
+      <button.commit_callback
+      function="Pref.SetSounds"/>
+    </button>
     <slider
      control_name="AudioLevelMusic"
      disabled_control="MuteAudio"
@@ -298,7 +301,18 @@
 		left_pad="5"
 		name="enable_voice_check"
 		width="110"/>
-	<!-- -->
+	<check_box
+		name="gesture_audio_play_btn"
+		control_name="EnableGestureSounds"
+    disabled_control="MuteAudio"
+		value="true"
+		follows="left|bottom|right"
+		height="15"
+		tool_tip="Check this to hear sounds from gestures"
+		label="Play sounds from gestures"
+		top_pad="1"
+    bottom_delta="10"
+		left="325"/>
 	<check_box
 		name="media_auto_play_btn"
 		control_name="ParcelMediaAutoPlayEnable"
@@ -309,6 +323,7 @@
 		tool_tip="Check this to automatically start media when you log in or change regions."
 		label="Allow Media to auto-play when entering a region"
 		top_pad="1"
+    bottom_delta="30"
 		left="25"/>
 	<check_box
 		name="media_allowscript_btn"
@@ -327,7 +342,7 @@
 		value="true"
 		follows="left|bottom|right"
 		height="15"
-		bottom_delta="-0"
+		bottom_delta="0"
 		left_delta="245"
 		tool_tip="Check this to enable the filter that allows you to choose whether to play media from a specific host"
 		label="Enable media filter (increased security)"
@@ -366,7 +381,7 @@
      left="25"
      name="voice_chat_settings"
      width="180"
-     top_pad="40">
+     top_pad="35">
 	  Voice Chat Settings
     </text>
     <text

From 0b3a8b4ac9fd9206cbcc802078111f8993dec2f0 Mon Sep 17 00:00:00 2001
From: Kadah <none@none>
Date: Sun, 12 Jun 2011 18:35:07 -0700
Subject: [PATCH 5/7] Moved german profile xui from FS to default

---
 .../xui/de/panel_profile_secondlife.xml       | 26 ++++-----
 .../xui/de/panel_profile_secondlife.xml       | 26 +++++----
 .../xui/de/panel_profile_secondlife.xml       | 53 +++++++++++++++++++
 3 files changed, 79 insertions(+), 26 deletions(-)
 rename indra/newview/skins/{firestorm => metaharper}/xui/de/panel_profile_secondlife.xml (73%)
 create mode 100644 indra/newview/skins/metaharpersidetabs/xui/de/panel_profile_secondlife.xml

diff --git a/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml
index f18a5ceb94..17739fd8e6 100644
--- a/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml
@@ -14,21 +14,23 @@
     <string
      name="no_group_text"
      value="Keine" />
-
+	 
           <panel name="second_life_panel">
-            <text name="Name:" value="Name:" />
-            <text_editor name="complete_name" value="(laden)" />
+
+            <text name="Key:" value="UUID:"/>
+            <text_editor name="user_key" value="(laden)"/>
+            <button name="copy_uri" label="URI kopieren"/>
+            <text name="Name:" value="Name:"/>
+            <text_editor name="complete_name" value="(laden)"/>
             <button name="copy_to_clipboard" tool_tip="In Zwischenablage kopieren"/>
             <text name="status" value="Online"/>
-            <text name="Key:" value="UUID:" />
-            <text_editor name="user_key" value="(laden)" />
-            <text name="label" value="Geboren am:" />
-            <text name="label2" value="Konto:" />
-            <text name="partner_label" value="Partner:" />
-            <text name="About:" value="Info:" left="9" />
-            <view_border left_pad="3" name="info_border" />
-            <text name="Groups:" value="Gruppen:" left="9"/>
-            <group_list left_pad="3" name="group_list" />
+            <text name="label" value="Geboren am:"/>
+            <text name="label2" value="Konto:"/>
+            <text name="partner_label" value="Partner:"/>
+            <text left="9" name="Groups:" value="Gruppen:"/>
+            <group_list left_pad="3" name="group_list"/>
+            <text left="9" name="About:" value="Info:"/>
+            <view_border left_pad="3" name="info_border"/>
 
             <layout_stack>
 				<layout_panel name="left_buttonstack">
diff --git a/indra/newview/skins/firestorm/xui/de/panel_profile_secondlife.xml b/indra/newview/skins/metaharper/xui/de/panel_profile_secondlife.xml
similarity index 73%
rename from indra/newview/skins/firestorm/xui/de/panel_profile_secondlife.xml
rename to indra/newview/skins/metaharper/xui/de/panel_profile_secondlife.xml
index 17739fd8e6..f18a5ceb94 100644
--- a/indra/newview/skins/firestorm/xui/de/panel_profile_secondlife.xml
+++ b/indra/newview/skins/metaharper/xui/de/panel_profile_secondlife.xml
@@ -14,23 +14,21 @@
     <string
      name="no_group_text"
      value="Keine" />
-	 
-          <panel name="second_life_panel">
 
-            <text name="Key:" value="UUID:"/>
-            <text_editor name="user_key" value="(laden)"/>
-            <button name="copy_uri" label="URI kopieren"/>
-            <text name="Name:" value="Name:"/>
-            <text_editor name="complete_name" value="(laden)"/>
+          <panel name="second_life_panel">
+            <text name="Name:" value="Name:" />
+            <text_editor name="complete_name" value="(laden)" />
             <button name="copy_to_clipboard" tool_tip="In Zwischenablage kopieren"/>
             <text name="status" value="Online"/>
-            <text name="label" value="Geboren am:"/>
-            <text name="label2" value="Konto:"/>
-            <text name="partner_label" value="Partner:"/>
-            <text left="9" name="Groups:" value="Gruppen:"/>
-            <group_list left_pad="3" name="group_list"/>
-            <text left="9" name="About:" value="Info:"/>
-            <view_border left_pad="3" name="info_border"/>
+            <text name="Key:" value="UUID:" />
+            <text_editor name="user_key" value="(laden)" />
+            <text name="label" value="Geboren am:" />
+            <text name="label2" value="Konto:" />
+            <text name="partner_label" value="Partner:" />
+            <text name="About:" value="Info:" left="9" />
+            <view_border left_pad="3" name="info_border" />
+            <text name="Groups:" value="Gruppen:" left="9"/>
+            <group_list left_pad="3" name="group_list" />
 
             <layout_stack>
 				<layout_panel name="left_buttonstack">
diff --git a/indra/newview/skins/metaharpersidetabs/xui/de/panel_profile_secondlife.xml b/indra/newview/skins/metaharpersidetabs/xui/de/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..f18a5ceb94
--- /dev/null
+++ b/indra/newview/skins/metaharpersidetabs/xui/de/panel_profile_secondlife.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_profile">
+    <string
+     name="payment_update_link_url">
+        http://www.secondlife.com/account/billing.php?lang=de
+    </string>
+    <string
+     name="partner_edit_link_url">
+        http://www.secondlife.com/account/partners.php?lang=de
+    </string>
+    <string
+     name="no_partner_text"
+     value="Kein Partner" />
+    <string
+     name="no_group_text"
+     value="Keine" />
+
+          <panel name="second_life_panel">
+            <text name="Name:" value="Name:" />
+            <text_editor name="complete_name" value="(laden)" />
+            <button name="copy_to_clipboard" tool_tip="In Zwischenablage kopieren"/>
+            <text name="status" value="Online"/>
+            <text name="Key:" value="UUID:" />
+            <text_editor name="user_key" value="(laden)" />
+            <text name="label" value="Geboren am:" />
+            <text name="label2" value="Konto:" />
+            <text name="partner_label" value="Partner:" />
+            <text name="About:" value="Info:" left="9" />
+            <view_border left_pad="3" name="info_border" />
+            <text name="Groups:" value="Gruppen:" left="9"/>
+            <group_list left_pad="3" name="group_list" />
+
+            <layout_stack>
+				<layout_panel name="left_buttonstack">
+					<button label="Zeige auf Karte" label_selected="Zeige auf Karte" name="show_on_map_btn" tool_tip="Zeige Position des Einwohners auf der Karte."/>
+					<button label="Zahlen" label_selected="Zahlen" name="pay" tool_tip="Zahle Geld an diesen Einwohner."/>
+				</layout_panel>
+
+				<layout_panel name="middle_buttonstack">
+					<button label="Teleport anbieten" label_selected="Teleport anbieten" name="teleport" tool_tip="Diesem Einwohner einen Teleport anbieten."/>
+					<button label="Instant Message" label_selected="Instant Message" name="im" tool_tip="Instant-Message-Session mit diesem Einwohner beginnen."/>
+				</layout_panel>
+				
+				<layout_panel name="right_buttonstack">
+					<button label="Freund hinzufügen" label_selected="Freund hinzufügen" name="add_friend" tool_tip="Diesem Einwohner deine Freundschaft anbieten."/>
+					<button label="Blockieren" name="block" tool_tip="Diesen Einwohner blockieren."/>
+					<button label="Freigeben" name="unblock" tool_tip="Diesen Einwohner nicht mehr blockieren."/>
+				</layout_panel>
+            </layout_stack>
+
+          </panel>
+</panel>
+

From 93d0ad359197ef729ccd0f69bf62988deb298f44 Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Sun, 12 Jun 2011 19:24:50 -0700
Subject: [PATCH 6/7] VWR-25654: fix memory leak in
 LLTranslate::getTranslateUrl (work submitted by Boroondas Gupte to LL code
 review)

---
 indra/newview/lltranslate.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 011aa47e31..e71f1d6657 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -28,6 +28,8 @@
 
 #include "lltranslate.h"
 
+#include <curl/curl.h>
+
 #include "llbufferstream.h"
 #include "llui.h"
 #include "llversioninfo.h"
@@ -76,7 +78,9 @@ void LLTranslate::translateMessage(LLHTTPClient::ResponderPtr &result, const std
 //static
 void LLTranslate::getTranslateUrl(std::string &translate_url, const std::string &from_lang, const std::string &to_lang, const std::string &mesg)
 {
-	std::string escaped_mesg = curl_escape(mesg.c_str(), mesg.size());
+	char * curl_str = curl_escape(mesg.c_str(), mesg.size());
+	std::string const escaped_mesg(curl_str);
+	curl_free(curl_str);
 
 	translate_url = m_GoogleURL
 		+ escaped_mesg + m_GoogleLangSpec

From 21f6518f8dec582f280c67321cda1d7c9a43b979 Mon Sep 17 00:00:00 2001
From: Tozh <none@none>
Date: Sun, 12 Jun 2011 22:39:06 -0400
Subject: [PATCH 7/7] Fix for the crash at bridge creation plus improved timing
 on script cleanup

---
 indra/newview/fslslbridge.cpp | 69 ++++++++++++++++++++++++-----------
 indra/newview/fslslbridge.h   | 24 ++++++++++--
 2 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp
index d2f76572dc..9b64a8b5f5 100644
--- a/indra/newview/fslslbridge.cpp
+++ b/indra/newview/fslslbridge.cpp
@@ -49,6 +49,7 @@
 #include "llassetuploadresponders.h"
 #include "llnearbychatbar.h"
 #include "llnotificationmanager.h"
+#include "llselectmgr.h"
 
 #define phoenix_bridge_name "#LSL<->Client Bridge v0.12"
 #define phoenix_folder_name "#Phoenix"
@@ -192,11 +193,12 @@ void FSLSLBridge :: initBridge()
 
 void FSLSLBridge :: startCreation()
 {
-	//are we already in conversation with a bridge?
-	if (mpBridge != NULL)
-	{
-		return;
-	}
+	////are we already in conversation with a bridge?
+	////must have already received a URL call from a bridge.
+	//if (mpBridge != NULL) 
+	//{
+	//	return;
+	//}
 
 	//if bridge object doesn't exist - create and attach it, update script.
 	LLUUID catID = findFSCategory();
@@ -326,7 +328,7 @@ FSLSLBridgeRezCallback :: ~FSLSLBridgeRezCallback()
 
 void FSLSLBridgeRezCallback :: fire(const LLUUID& inv_item)
 {
-	if ((FSLSLBridge::instance().getBridge() != NULL) || inv_item.isNull() || !FSLSLBridge::instance().bridgeCreating())
+	if ((FSLSLBridge::instance().getBridge() != NULL) || inv_item.isNull() || !FSLSLBridge::instance().getBridgeCreating())
 		return;
 
 	//detach from default and put on the right point
@@ -350,7 +352,7 @@ FSLSLBridgeScriptCallback :: ~FSLSLBridgeScriptCallback()
 
 void FSLSLBridgeScriptCallback::fire(const LLUUID& inv_item)
 {
-	if (inv_item.isNull() || !FSLSLBridge::instance().bridgeCreating())
+	if (inv_item.isNull() || !FSLSLBridge::instance().getBridgeCreating())
 		return;
 
 	LLViewerInventoryItem* item = gInventory.getItem(inv_item);
@@ -366,28 +368,25 @@ void FSLSLBridgeScriptCallback::fire(const LLUUID& inv_item)
 	//caps import 
 	std::string url = gAgent.getRegion()->getCapability("UpdateScriptAgent");
 	std::string isMono = "lsl2";  //could also be "mono"
-	if (!url.empty())
+	if (!url.empty() && obj != NULL)  
 	{
 		const std::string fName = prepUploadFile();
 		LLLiveLSLEditor::uploadAssetViaCapsStatic(url, fName, 
 			obj->getID(), inv_item, isMono, true);
+		llinfos << "updating script ID for bridge" << llendl;
+		FSLSLBridge::instance().mScriptItemID = inv_item;
 	}
 	else
 	{
 		//can't complete bridge creation - detach and remove object, remove script
+		//try to clean up and go away. Fail.
 		LLVOAvatarSelf::detachAttachmentIntoInventory(FSLSLBridge::instance().getBridge()->getUUID());
-
-		LLViewerInventoryItem* bridgeItem = FSLSLBridge::instance().getBridge();
-		gInventory.purgeObject(bridgeItem->getUUID());
-		bridgeItem->removeFromServer();
-
+		FSLSLBridge::instance().cleanUpBridge();
+		//also clean up script remains
 		gInventory.purgeObject(item->getUUID());
-		item->removeFromServer();
-
 		gInventory.notifyObservers();
+		return;
 	}
-	llinfos << "updating script ID for bridge" << llendl;
-	FSLSLBridge::instance().mScriptItemID = inv_item;
 }
 
 std::string FSLSLBridgeScriptCallback::prepUploadFile()
@@ -419,19 +418,45 @@ void FSLSLBridge :: checkBridgeScriptName(std::string fileName)
 	{
 		//this is our script upload
 		LLViewerObject* obj = gAgentAvatarp->getWornAttachment(mpBridge->getUUID());
-
-		registerVOInventoryListener(obj, NULL);
+		if (obj == NULL)
+		{
+			//something happened to our object. Try to fail gracefully.
+			cleanUpBridge();
+			return;
+		}
+		//registerVOInventoryListener(obj, NULL);
 		obj->saveScript(gInventory.getItem(mScriptItemID), TRUE, false);
-		requestVOInventory();
+		FSLSLBridgeCleanupTimer *objTimer = new FSLSLBridgeCleanupTimer((F32)1.0);
+		objTimer->startTimer();
+		//obj->doInventoryCallback();
+		//requestVOInventory();
 	}
 }
-void FSLSLBridge :: inventoryChanged(LLViewerObject* object, LLInventoryObject::object_list_t* inventory_objects, S32 serial_num, void* queue)
+
+BOOL FSLSLBridgeCleanupTimer::tick()
+{
+	FSLSLBridge::instance().finishBridge();
+	stopTimer();
+	return TRUE;
+}
+
+void FSLSLBridge :: cleanUpBridge()
+{
+	//something unexpected went wrong. Try to clean up and not crash.
+	reportToNearbyChat("Bridge object not found. Can't proceed with creation, exiting.");
+	gInventory.purgeObject(mpBridge->getUUID());
+	gInventory.notifyObservers();
+	mpBridge = NULL;
+	mBridgeCreating = false;
+}
+
+void FSLSLBridge :: finishBridge()
 {
 	//announce yourself
 	reportToNearbyChat("Bridge created.");
 
 	mBridgeCreating = false;
-	removeVOInventoryListener();
+	//removeVOInventoryListener();
 	cleanUpBridgeFolder();
 }
 //
diff --git a/indra/newview/fslslbridge.h b/indra/newview/fslslbridge.h
index 9093726551..51ddfaab9c 100644
--- a/indra/newview/fslslbridge.h
+++ b/indra/newview/fslslbridge.h
@@ -33,18 +33,20 @@
 #include "fslslbridgerequest.h"
 #include "llviewerinventory.h"
 #include "llinventoryobserver.h"
+#include "lleventtimer.h"
 
 //
 //-TT Client LSL Bridge File
 //
 
-class FSLSLBridge : public LLSingleton<FSLSLBridge>, public LLHTTPClient::Responder, public LLVOInventoryListener
+class FSLSLBridge : public LLSingleton<FSLSLBridge>, public LLHTTPClient::Responder //, public LLVOInventoryListener
 {
 	static const U8 BRIDGE_POINT = 127;
 
 	friend class FSLSLBridgeScriptCallback;
 	friend class FSLSLBridgeRezCallback;
 	friend class FSLSLBridgeInventoryObserver;
+	friend class FSLSLBridgeCleanupTimer;
 
 public:
 	FSLSLBridge();
@@ -56,12 +58,17 @@ public:
 	void initBridge();
 	void recreateBridge();
 	void processAttach(LLViewerObject *object, const LLViewerJointAttachment *attachment);
-	bool bridgeCreating() {return mBridgeCreating; };
+	void startCreation();
+
+	bool getBridgeCreating() {return mBridgeCreating; };
+	void setBridgeCreating(bool status) { mBridgeCreating = status; };
+
 	void setBridge(LLViewerInventoryItem* item) { mpBridge = item; };
 	LLViewerInventoryItem* getBridge() { return mpBridge; };
+
 	void checkBridgeScriptName(std::string fileName);
-	void startCreation();
 	std::string currentFullName() { return mCurrentFullName; }
+	void finishBridge();
 
 protected:
 
@@ -89,6 +96,7 @@ protected:
 	void cleanUpBridgeFolder();
 	void setupBridge(LLViewerObject *object);
 	void initCreationStep();
+	void cleanUpBridge();
 };
 
 
@@ -124,4 +132,14 @@ protected:
 
 };
 
+class FSLSLBridgeCleanupTimer : public LLEventTimer
+{
+public:
+	FSLSLBridgeCleanupTimer(F32 period) : LLEventTimer(period) {}
+	BOOL tick();
+	void startTimer() { mEventTimer.start(); }
+	void stopTimer() { mEventTimer.stop(); }
+
+};
+
 #endif // FS_LSLBRIDGE_H