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

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
new file mode 100644
index 0000000000..a0c1f4c021
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -0,0 +1,26 @@
+<?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"
+ min_width="455"
+ max_height="230"
+ height="230"
+ layout="topleft"
+ name="Avatar"
+ single_instance="true"
+ help_topic="avatar"
+ save_rect="true"
+ title="Avatar Picker"
+ width="445">
+    <web_browser
+      top="25"
+      height="200"
+      width="435"
+      follows="all"
+      name="avatar_picker_contents"
+      trusted_content="true"/>
+</floater>
-- 
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_avatar.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index a0c1f4c021..666aa2d164 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -3,11 +3,9 @@
  legacy_header_height="225"
  can_minimize="true"
  can_close="true"
- user_resize="true"
  can_resize="true"
  min_height="230"
- min_width="455"
- max_height="230"
+ min_width="445"
  height="230"
  layout="topleft"
  name="Avatar"
@@ -19,7 +17,7 @@
     <web_browser
       top="25"
       height="200"
-      width="435"
+      width="445"
       follows="all"
       name="avatar_picker_contents"
       trusted_content="true"/>
-- 
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_avatar.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index 666aa2d164..6e5c4ada48 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -12,12 +12,12 @@
  single_instance="true"
  help_topic="avatar"
  save_rect="true"
- title="Avatar Picker"
- width="445">
+ title="AVATAR PICKER"
+ width="635">
     <web_browser
       top="25"
       height="200"
-      width="445"
+      width="635"
       follows="all"
       name="avatar_picker_contents"
       trusted_content="true"/>
-- 
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_avatar.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index 6e5c4ada48..3c7de6f334 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -5,7 +5,7 @@
  can_close="true"
  can_resize="true"
  min_height="230"
- min_width="445"
+ min_width="450"
  height="230"
  layout="topleft"
  name="Avatar"
-- 
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_avatar.xml | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index 3c7de6f334..2d973e7d90 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -1,5 +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"
@@ -12,6 +14,7 @@
  single_instance="true"
  help_topic="avatar"
  save_rect="true"
+ save_visibility="true"
  title="AVATAR PICKER"
  width="635">
     <web_browser
-- 
cgit v1.2.3