Merge from default branch

--HG--
branch : product-engine

5 files changed, 41 insertions, 43 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index d202bf1b9f..8f67f564a2 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -304,7 +304,7 @@ Re-enter amount to see the latest exchange rate.
     </text>
      <text
       type="string"
-      width="175"
+      width="176"
       height="125"
       top="60"
       left="165"
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index d97ca554b7..1d51d19a4a 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<multi_floater

- can_minimize="false"

- can_resize="true"

- height="390"

- layout="topleft"

- name="floater_im_box"

- help_topic="floater_im_box"

- save_rect="true"

- save_visibility="true"

- single_instance="true"

- title="CONVERSATIONS"

- width="392">

-    <tab_container

-     follows="left|right|top|bottom"

-     height="390"

-     layout="topleft"

-     left="1"

-     name="im_box_tab_container"

-     tab_position="bottom"

-     tab_width="80"

-     tab_height="16"

-     top="0"

-     width="390" />

-    <icon

-     color="DefaultShadowLight"

-     enabled="false"

-     follows="left|right|bottom"

-     height="17"

-     image_name="tabarea.tga"

-     layout="bottomleft"

-     left="1"

-     name="im_box_tab_container_icon"

-     bottom="10"

-     width="390" />

-</multi_floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater
+ can_minimize="false"
+ can_resize="true"
+ height="390"
+ layout="topleft"
+ name="floater_im_box"
+ help_topic="floater_im_box"
+ save_rect="true"
+ save_visibility="true"
+ single_instance="true"
+ title="CONVERSATIONS"
+ width="392">
+    <tab_container
+     follows="left|right|top|bottom"
+     height="390"
+     layout="topleft"
+     left="1"
+     name="im_box_tab_container"
+     tab_position="bottom"
+     tab_width="80"
+     tab_height="16"
+     top="0"
+     width="390" />
+    <icon
+     color="DefaultShadowLight"
+     enabled="false"
+     follows="left|right|bottom"
+     height="17"
+     image_name="tabarea.tga"
+     layout="bottomleft"
+     left="1"
+     name="im_box_tab_container_icon"
+     bottom="10"
+     width="390" />
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index 4b280ac59f..70dac7e41c 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -80,7 +80,7 @@
              height="20"
              layout="topleft"
              left_pad="5"
-             max_chars="255"
+             max_chars="1024"
              name="address"
              top_delta="0"
              width="540">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e5933816ef..dddd178aea 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -773,9 +773,9 @@ Save changes to classified [NAME]?
   
   <notification
    icon="alertmodal.tga"
-   name="ClassifiedInsuffisientFunds"
+   name="ClassifiedInsufficientFunds"
    type="alertmodal">
-Insuffisient funds to create classified.
+Insufficient funds to create classified.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 5b0a7107e4..673052c3b5 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -151,7 +151,6 @@ background_visible="true"
              filename="panel_group_roles.xml"
              layout="topleft"
              left="0"
-             help_topic="group_roles_tab"
              name="group_roles_tab_panel"
              top="0" />
          </accordion_tab>
@@ -181,7 +180,6 @@ background_visible="true"
          filename="panel_group_land_money.xml"
          layout="topleft"
          left="0"
-         help_topic="group_land_money_tab"
          name="group_land_tab_panel"
          top="0" />
          </accordion_tab>
@@ -241,4 +239,4 @@ background_visible="true"
      right="-10"
      width="85" />
      </panel>
-</panel>
\ No newline at end of file
+</panel>