From 2128a929c36dd51590349c9196e38dfc6006b24d Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Mon, 25 Jan 2010 20:53:43 +0200
Subject: Fixed reopened normal bug EXT-4450([BSI] call buttons enabled when
 voice is disabled).

- Added check for call availability in miniinspector's context menu
- Removed ability to call yourself in group chat context menu
- Added check for call availability for context menu which appears on right mouse click on avatar in game area

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_attachment_other.xml    | 2 ++
 indra/newview/skins/default/xui/en/menu_avatar_other.xml        | 2 ++
 indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 5b94645b60..c5b31c7f63 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -30,6 +30,8 @@
      name="Call">
         <menu_item_call.on_click
          function="Avatar.Call" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableCall" />
     </menu_item_call>
       <menu_item_call
          label="Invite to Group"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 0ad41546d2..ac9101cfd9 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -30,6 +30,8 @@
      name="Call">
         <menu_item_call.on_click
          function="Avatar.Call" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableCall" />
     </menu_item_call>
       <menu_item_call
          label="Invite to Group"
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 dde92f23b6..85ec174829 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
@@ -32,6 +32,8 @@
    name="call">
     <menu_item_call.on_click
      function="InspectAvatar.Call"/>
+    <menu_item_call.on_enable
+     function="InspectAvatar.Gear.EnableCall"/>
   </menu_item_call>
   <menu_item_call
    label="Teleport"
-- 
cgit v1.2.3


From 865617da42d1ec723362f83d6ab2edbae5bb9a65 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Tue, 26 Jan 2010 10:16:19 +0200
Subject: sidefix for EXT-4484 [BSI] default find window size covers up lower
 tray

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_search.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index b0bb282abd..775e7d66f7 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -2,9 +2,9 @@
 <floater
  legacy_header_height="13"
  can_resize="true"
- height="646"
+ height="546"
  layout="topleft"
- min_height="646"
+ min_height="546"
  min_width="670"
  name="floater_search"
  help_topic="floater_search"
@@ -21,7 +21,7 @@
         Done
     </floater.string>
     <layout_stack
-     bottom="641"
+     bottom="541"
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
@@ -42,7 +42,7 @@
              left="0"
              name="browser"
              top="0"
-             height="600"
+             height="500"
              width="650" />
             <text
              follows="bottom|left"
-- 
cgit v1.2.3


From 1ac01f34b201154ec75d7e0143857b8229af776a Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Tue, 26 Jan 2010 15:21:41 +0200
Subject: fixed minor bug EXT-4186 List items are displayed as links in the
 FlatList if match URL regexp Solution: disabling html parsing in teleport
 history  item.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_teleport_history_item.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
index 4f40e00815..c5f3fcc27d 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
@@ -41,6 +41,7 @@
      height="20"
      layout="topleft"
      left_pad="5"
+     allow_html="false"
      use_ellipses="true"
      name="region"
      text_color="white"
-- 
cgit v1.2.3


From 88a6cbdaecc06c0ff174d29ca9ff600775edff49 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Tue, 26 Jan 2010 22:29:17 +0200
Subject: Workaround for EXT-4725(Viewer crashes if try to call from 'Nearby
 voice' floater).

- Enabling/disabling 'Call'menu item is moved to createMenu(). Some way to properly enable/disable it in
 enableContextMenuItem() should be found.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_participant_list.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 805ffbae66..04e02d0f6c 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -57,9 +57,6 @@
      name="Call">
          <menu_item_call.on_click
          function="Avatar.Call" />
-        <menu_item_call.on_enable
-         function="ParticipantList.EnableItem"
-         parameter="can_call" />
     </menu_item_call>
     <menu_item_call
      enabled="true"
-- 
cgit v1.2.3