From bbb6a7efb01623eab72c4d06cc2965f31cceeeac Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Tue, 23 Feb 2010 18:48:30 +0200
Subject: Implemented major sub-task EXT-5556 (hard-coded: menu Build > Object
 > Take. The word "Take" is hard-coded)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_object.xml | 28 ++++++++++++++------
 indra/newview/skins/default/xui/en/menu_viewer.xml | 30 ++++++++++++++--------
 2 files changed, 40 insertions(+), 18 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index d66818e91a..9436b2cd73 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -124,16 +124,28 @@
     </menu_item_call>
     </context_menu>
    <menu_item_separator layout="topleft" />
-       <menu_item_call
-     enabled="false"
+   <menu_item_call
+    label="Buy"
+    layout="topleft"
+    name="Pie Object Bye">
+      <menu_item_call.on_click
+       function="Tools.BuyOrTake"/>
+      <menu_item_call.on_visible
+       function="Tools.VisibleBuyObject"/>
+      <menu_item_call.on_enable
+       function="Tools.EnableBuyOrTake"/>
+   </menu_item_call>
+   <menu_item_call
      label="Take"
+     layout="topleft"
      name="Pie Object Take">
-        <menu_item_call.on_click
-         function="Tools.BuyOrTake" />
-        <menu_item_call.on_enable
-         function="Tools.EnableBuyOrTake"
-         parameter="Buy,Take" />
-    </menu_item_call>
+      <menu_item_call.on_click
+       function="Tools.BuyOrTake"/>
+      <menu_item_call.on_visible
+       function="Tools.VisibleTakeObject"/>
+      <menu_item_call.on_enable
+       function="Tools.EnableBuyOrTake"/>
+   </menu_item_call>
    <menu_item_call
    enabled="false"
    label="Take Copy"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 4c4867b862..158e764eae 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -719,16 +719,26 @@
          name="Object"
          tear_off="true">
           <menu_item_call
-			 label="Buy"
-			 layout="topleft"
-			 name="Menu Object Take"
-			 visible="true">
-			<menu_item_call.on_click
-               function="Tools.BuyOrTake" />
-			<menu_item_call.on_enable
-               function="Tools.EnableBuyOrTake"
-               name="EnableBuyOrTake"
-               parameter="Buy,Take" />
+             label="Buy"
+             layout="topleft"
+             name="Menu Object Buy">
+            <menu_item_call.on_click
+               function="Tools.BuyOrTake"/>
+            <menu_item_call.on_visible
+               function="Tools.VisibleBuyObject"/>
+            <menu_item_call.on_enable
+               function="Tools.EnableBuyOrTake"/>
+          </menu_item_call>
+          <menu_item_call
+             label="Take"
+             layout="topleft"
+             name="Menu Object Take">
+            <menu_item_call.on_click
+               function="Tools.BuyOrTake"/>
+            <menu_item_call.on_visible
+               function="Tools.VisibleTakeObject"/>
+            <menu_item_call.on_enable
+               function="Tools.EnableBuyOrTake"/>
           </menu_item_call>
           <menu_item_call
 			 label="Take Copy"
-- 
cgit v1.2.3


From 1d45b1edcd3570b27622c0e99cf0bd5aee331cc1 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 24 Feb 2010 10:16:35 +0200
Subject: Fixed normal but EXT - 5108 (Preferences vertical tabs don't align to
 tab container)

- Added offset in TabContainer between Tab and TabPanel in case of VERTICAL Tabs orientation.

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 7aa8e23e76..d7a7daf30c 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -46,6 +46,7 @@
      tab_group="1"
      tab_position="left"
      tab_width="115"
+     tab_padding_right="5"
      top="21"
      width="620">
         <panel
-- 
cgit v1.2.3