Sync with viewer-beta

3 files changed, 34 insertions, 10 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 1c64a5eb44..456b2d4421 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -12,7 +12,7 @@
   auto_tile="true"

   title=""

   initial_mime_type="text/html"

-  width="735">

+  width="780">

   <layout_stack

     bottom="775"

     follows="left|right|top|bottom"

@@ -21,7 +21,7 @@
     name="stack1"

     orientation="vertical"

     top="20"

-    width="725">

+    width="770">

     <layout_panel

       auto_resize="false"

       default_tab_group="1"

@@ -32,7 +32,7 @@
       name="nav_controls"

       top="400"

       user_resize="false"

-      width="725">

+      width="770">

       <button

         image_overlay="Arrow_Left_Off"

 		    image_disabled="PushButton_Disabled"

@@ -115,7 +115,7 @@
         combo_editor.select_on_focus="true"

         tool_tip="Enter URL here"

         top_delta="0"

-        width="627">

+        width="672">

         <combo_box.commit_callback

           function="WebContent.EnterAddress" />

       </combo_box>

@@ -125,7 +125,7 @@
         follows="top|right"

         image_name="Lock2"

         layout="topleft"

-        left_delta="575"

+        left_delta="620"

         top_delta="2"

         visible="false" 

         tool_tip="Secured Browsing"

@@ -142,7 +142,7 @@
         height="22"

         layout="topleft"

         name="popexternal"

-        right="725"

+        right="770"

         top_delta="-2"

         width="22">

         <button.commit_callback

@@ -156,7 +156,7 @@
       name="external_controls"

       top_delta="0"

       user_resize="false"

-      width="540">

+      width="585">

       <web_browser

         bottom="-22"

         follows="all"

@@ -175,7 +175,7 @@
         parse_urls="false"

         text_color="0.4 0.4 0.4 1"

         top_pad="5"

-        width="520"/>

+        width="495"/>

       <progress_bar

         color_bar="0.3 1.0 0.3 1"

         follows="bottom|right"

diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 58d58a6ca9..76b188220d 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -78,7 +78,7 @@
     <menu_item_call.on_click
      function="InspectAvatar.Freeze"/>
     <menu_item_call.on_visible
-     function="InspectAvatar.VisibleFreezeEject"/>
+     function="InspectAvatar.VisibleFreeze"/>
   </menu_item_call>
   <menu_item_call
    label="Eject"
@@ -86,7 +86,23 @@
     <menu_item_call.on_click
      function="InspectAvatar.Eject"/>
     <menu_item_call.on_visible
-     function="InspectAvatar.VisibleFreezeEject"/>
+     function="InspectAvatar.VisibleEject"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Kick"
+   name="kick">
+    <menu_item_call.on_click
+     function="InspectAvatar.Kick"/>
+    <menu_item_call.on_visible
+     function="InspectAvatar.EnableGod"/>
+  </menu_item_call>
+  <menu_item_call
+  label="CSR"
+  name="csr">
+    <menu_item_call.on_click
+     function="InspectAvatar.CSR" />
+    <menu_item_call.on_visible
+     function="InspectAvatar.EnableGod" />
   </menu_item_call>
   <menu_item_call
    label="Debug Textures"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 61e3bb354f..d36220385d 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -34,6 +34,14 @@
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
 	</string>
+  <string
+  name="name_text_args">
+    [NAME]
+  </string>
+  <string
+    name="display_name_text_args">
+    [DISPLAY_NAME]
+  </string>
     <layout_stack
      name="layout"
      orientation="vertical"