From 352ae994480a960541050c82f83a25262f8b44e0 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 5 Oct 2011 16:39:00 -0700
Subject: adding floater_destinations.xml

---
 .../skins/default/xui/en/floater_destinations.xml  | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_destinations.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
new file mode 100644
index 0000000000..50a279c046
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="225"
+ can_minimize="true"
+ can_close="true"
+ user_resize="true"
+ can_resize="true"
+ min_height="230"
+ height="230"
+ layout="topleft"
+ name="Destinations"
+ single_instance="true"
+ help_topic="destinations"
+ save_rect="true"
+ title="Destinations"
+ width="445">
+    <web_browser
+      top="25"
+      height="200"
+      width="435"
+      follows="all"
+      name="destination_guide_contents"
+      start_url="http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/guide.html"
+      trusted_content="true"/>
+</floater>
-- 
cgit v1.2.3


From 23205bb535e446979471296c9fa26f2530a9abaf Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 6 Oct 2011 17:18:49 -0700
Subject: EXP-1274 Create floater for "Avatar Picker" content

---
 indra/newview/skins/default/xui/en/floater_destinations.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 50a279c046..9dd9338f37 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -6,6 +6,8 @@
  user_resize="true"
  can_resize="true"
  min_height="230"
+ min_width="525"
+ max_height="230"
  height="230"
  layout="topleft"
  name="Destinations"
-- 
cgit v1.2.3


From fd03ae299bfaf83789e511912d99d204c0833e7f Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 10 Oct 2011 17:08:51 -0700
Subject: EXP-1274 Create floater for "Avatar Picker" content EXP-1299 Nearby
 Voice floater can't be closed by clicking the sidebar button again. EXP-1306
 Prompt text to "Change your avatar" and "Destinations" floaters get pushed
 down one line when the floater dialog gets resized to minimum width

---
 indra/newview/skins/default/xui/en/floater_destinations.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 9dd9338f37..669b7eb15a 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -7,7 +7,6 @@
  can_resize="true"
  min_height="230"
  min_width="525"
- max_height="230"
  height="230"
  layout="topleft"
  name="Destinations"
@@ -15,11 +14,11 @@
  help_topic="destinations"
  save_rect="true"
  title="Destinations"
- width="445">
+ width="525">
     <web_browser
       top="25"
       height="200"
-      width="435"
+      width="525"
       follows="all"
       name="destination_guide_contents"
       start_url="http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/guide.html"
-- 
cgit v1.2.3


From f9e900f5ac9002f5ef3b44b02ac300971288e89b Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 11 Oct 2011 17:36:23 -0700
Subject: * New floater positioning code.  Better than what's checked in but
 not great. * Floater updates for positioning and to revert some earlier
 string changes.

---
 indra/newview/skins/default/xui/en/floater_destinations.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 669b7eb15a..2b48a9f6d6 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ open_positioning="cascading"
  legacy_header_height="225"
  can_minimize="true"
  can_close="true"
@@ -13,12 +14,12 @@
  single_instance="true"
  help_topic="destinations"
  save_rect="true"
- title="Destinations"
- width="525">
+ title="DESTINATIONS"
+ width="840">
     <web_browser
       top="25"
       height="200"
-      width="525"
+      width="840"
       follows="all"
       name="destination_guide_contents"
       start_url="http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/guide.html"
-- 
cgit v1.2.3


From fbd883ab36e49fea76b16a04aad0be5fc5196d49 Mon Sep 17 00:00:00 2001
From: leyla_linden <none@none>
Date: Wed, 12 Oct 2011 17:18:17 -0700
Subject: updating destination guide and avatar picker urls

---
 indra/newview/skins/default/xui/en/floater_destinations.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 2b48a9f6d6..e63dc02a57 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -7,7 +7,7 @@
  user_resize="true"
  can_resize="true"
  min_height="230"
- min_width="525"
+ min_width="350"
  height="230"
  layout="topleft"
  name="Destinations"
@@ -22,6 +22,5 @@
       width="840"
       follows="all"
       name="destination_guide_contents"
-      start_url="http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/guide.html"
       trusted_content="true"/>
 </floater>
-- 
cgit v1.2.3


From b65ad565c9f3a702408e1bd12e7df2ccaf3dd03e Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 20 Oct 2011 15:48:25 -0700
Subject: * Changed destination guide to open by default in the top left on
 first login * Made the avatar pickers and destinations guide properly stack
 and position   themselves.

Reviewed by Richard.
---
 indra/newview/skins/default/xui/en/floater_destinations.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index e63dc02a57..373114a1eb 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  open_positioning="cascading"
+ ignore_ui_scale="false"
  legacy_header_height="225"
  can_minimize="true"
  can_close="true"
@@ -14,6 +15,7 @@
  single_instance="true"
  help_topic="destinations"
  save_rect="true"
+ save_visibility="true"
  title="DESTINATIONS"
  width="840">
     <web_browser
-- 
cgit v1.2.3