From 3bf5d36981752bffe12da81d72a60ccfc9b92db2 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 26 Jul 2010 16:17:52 +0300
Subject: EXT-8257 FIXED Made "Expand" and "Collapse" menu items visible in
 Places gear menu mutually exclusive. Root cause: ========== The same menu is
 used to be shown as context and gear menus. But visibility of context Folder
 View's menu is processed in a separate way. So, once visibility of menu items
 is changed in context menu - it is unchanged in gear menu.

Also it was possible situation when both "Expand" and "Collapse" menu items were visible in gear menu (If it was opened before any context menu)

FIX:
===
Added "on_visible" callbacks for "Expand" and "Collapse" menu items to set proper visibility in "gear" menu.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/801/

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
index 3e38503e43..77cc3910fd 100644
--- a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
@@ -94,6 +94,9 @@
         <on_enable
          function="Places.LandmarksGear.Enable"
          parameter="expand" />
+        <on_visible
+         function="Places.LandmarksGear.Enable"
+         parameter="expand" />
     </menu_item_call>
     <menu_item_call
      label="Collapse"
@@ -105,6 +108,9 @@
         <on_enable
          function="Places.LandmarksGear.Enable"
          parameter="collapse" />
+        <on_visible
+         function="Places.LandmarksGear.Enable"
+         parameter="collapse" />
     </menu_item_call>
     <menu_item_call
      label="Expand all folders"
-- 
cgit v1.2.3


From 8f64727254355a7734e6b3443b2b6ed6f94b2a57 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 26 Jul 2010 16:20:14 +0300
Subject: EXT-8069 FIXED "Show Advanced Menu" item is moved to
 "Advanced/Shortcuts" submenu and made invisible. (invisible - because it is
 still located in menu it toggles)

Note: We can not completely remove this menu item to keep hot key workable.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/803/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 67b8c81a01..bf1707c13e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -951,17 +951,6 @@
      name="Advanced"
      tear_off="true"
      visible="false">
-        <menu_item_check
-         label="Show Advanced Menu"
-         name="Show Advanced Menu"
-         shortcut="control|alt|D">
-          <on_check
-           function="CheckControl"
-           parameter="UseDebugMenus" />
-          <on_click
-           function="ToggleControl"
-           parameter="UseDebugMenus" />
-        </menu_item_check>
         <menu_item_call
          label="Stop Animating Me"
          name="Stop Animating My Avatar">
@@ -1681,7 +1670,24 @@
                 <menu_item_call.on_click
                  function="View.ZoomOut" />
             </menu_item_call>
-        </menu>
+            <menu_item_separator
+             visible="false"/>
+            <!-- Made invisible to avoid a dissonance: menu item toggle menu where it is located. EXT-8069.
+              Can't be removed to keep sortcut workable.
+            -->
+            <menu_item_check
+             label="Show Advanced Menu"
+             name="Show Advanced Menu"
+             shortcut="control|alt|D"
+             visible="false">
+                <on_check
+                 function="CheckControl"
+                 parameter="UseDebugMenus" />
+                <on_click
+                 function="ToggleControl"
+                 parameter="UseDebugMenus" />
+        </menu_item_check>
+        </menu> <!--Shortcuts-->
 
         <menu_item_separator/>
 
-- 
cgit v1.2.3


From 4919f0b341804680a90818386b8f8ccf0a5f5f81 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Mon, 26 Jul 2010 18:10:29 +0300
Subject: EXT-8010 FIXED Implemented special behaviour of avatar links.

Avatar links are now underlined only on hover. Also they have the same color as other links.

- Underlining text and getting it back to normal are done in handleHover() and draw() of new LLOnHoverChangeableTextSegment
class derived from LLNormalTextSegment. This class has two pointers to styles- one for style which will be used for text
on hover, and another otherwise. This special type of text segment is used if link's boolean member mUnderlineOnHoverOnly
is true. So it is URL's flag depending on which textbase adds new text segment(like it currently happens with mDisabledLink).

- Changed avatar link color in colors.xml to emphasis (because it was white before and was inconsistent with other links).

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/749/

--HG--
branch : product-engine
---
 indra/newview/skins/default/colors.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 2188c71ff9..5ba1fc9b21 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -113,7 +113,7 @@
      reference="LtYellow" />
     <color
      name="AgentLinkColor"
-     reference="White" />
+     reference="EmphasisColor" />
     <color
      name="AlertTextColor"
      value="0.58 0.66 0.84 1" />
-- 
cgit v1.2.3