From 1631ca7173d77576ed18fb35b1843c5a28cbb5e4 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Thu, 28 Jan 2010 10:34:12 +0200
Subject: fix for normal EXT-4512 [BSI] Can't minimize Mini-Map also this fix
 EXT-2119 even if its marked as fixed...

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index 3a5ceed5fb..3ddb7bc349 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- can_minimize="false" 
+ can_minimize="true" 
  can_resize="true"
+ center_horiz="true"
+ center_vert="true"
  follows="top|right"
  height="225"
  layout="topleft"
  min_height="60"
  min_width="174"
  name="Map"
+ title="Mini Map"
  help_topic="map"
  save_rect="true"
  save_visibility="true"
-- 
cgit v1.2.3


From b1fa6bb3421f5a281b36156a04fcbe0ab6b4bcfb Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Thu, 28 Jan 2010 11:42:20 +0200
Subject: fix for  EXT-4186 List items are displayed as links in the FlatList
 if match URL regexp allow_html attribute was updated for  titles of group
 list items, group info panel, landmark info panel and for a title of
 floaters.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml | 1 +
 indra/newview/skins/default/xui/en/panel_group_list_item.xml     | 1 +
 indra/newview/skins/default/xui/en/panel_landmark_info.xml       | 1 +
 indra/newview/skins/default/xui/en/panel_place_profile.xml       | 2 ++
 4 files changed, 5 insertions(+)

(limited to 'indra/newview/skins')

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 0893c204e7..1968d96205 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
@@ -37,6 +37,7 @@ background_visible="true"
      top="2"
      width="23" />
     <text
+     allow_html="false"
      follows="top|left|right"
      font="SansSerifHugeBold"
      height="26"
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index c243d08b97..b674b39d9b 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -36,6 +36,7 @@
      top="2"
      width="20" />
    <text
+     allow_html="false"
      follows="left|right"
      font="SansSerifSmall"
      height="15"
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index 67a4edbf32..396699ad6c 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -229,6 +229,7 @@
                  value="Title:"
                  width="290" />
                 <text
+                 allow_html="false"
                  follows="left|top"
                  height="22"
                  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 8fc2ae39f0..7ac771de27 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -246,6 +246,7 @@
                 </layout_panel>
             </layout_stack>
             <text
+             allow_html="false"
              follows="left|top|right"
              font="SansSerifLarge"
              height="14"
@@ -258,6 +259,7 @@
              value="SampleRegion"
              width="290" />
             <text
+             allow_html="false"
              follows="left|top|right"
              height="14"
              layout="topleft"
-- 
cgit v1.2.3