From 4f38a63b076044e9578a91b769a4e1856241f2ba Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 13 Apr 2022 23:38:02 +0300
Subject: SL-15312 Legacy profiles remake #6

---
 .../skins/default/xui/en/floater_display_name.xml  | 11 +---
 .../default/xui/en/floater_profile_permissions.xml | 73 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_profile_notes.xml   | 43 -------------
 .../default/xui/en/panel_profile_secondlife.xml    | 26 +++++---
 4 files changed, 93 insertions(+), 60 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_profile_permissions.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
index 9a9fd32a77..d14b4a1699 100644
--- a/indra/newview/skins/default/xui/en/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
@@ -83,21 +83,12 @@
      tool_tip="Save your new Display Name" 
      top_pad="40"
      width="120" />
-    <button
-     height="23"
-     label="Reset"
-     layout="topleft"
-     font="SansSerif"
-     left_pad="5"
-     name="reset_btn"
-     tool_tip="Make Display Name the same as Username"
-     width="120" />
     <button
      height="23"
      label="Cancel"
      font="SansSerif"
      layout="topleft"
-     left_pad="5"
+     left_pad="125"
      name="cancel_btn"
      width="120" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_profile_permissions.xml b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
new file mode 100644
index 0000000000..d186146770
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="false"
+ show_title="false"
+ can_minimize="false"
+ can_close="false"
+ header_height="10"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Background"
+ height="200"
+ layout="topleft"
+ name="profile_permissiona"
+ width="300">
+  <text
+   name="perm_description"
+   value="Allow [AGENT_NAME] to:"
+   top="5"
+   left="6"
+   right="-6"
+   height="16"
+   follows="top|left"
+   layout="topleft"
+   font.style="BOLD"
+    />
+  <check_box
+   name="online_check"
+   label="See when I am online"
+   top_pad="5"
+   left="10"
+   height="16"
+   width="293"
+   follows="top|left"
+   layout="topleft"
+    />
+  <check_box
+   name="map_check"
+   label="Find me on the world map"
+   top_pad="5"
+   left="10"
+   height="16"
+   width="293"
+   follows="top|left"
+   layout="topleft"
+    />
+  <check_box
+   name="objects_check"
+   label="Edit, delete or take my objects"
+   top_pad="5"
+   left="10"
+   height="16"
+   width="293"
+   follows="top|left"
+   layout="topleft"
+    />
+  <button
+   name="perms_btn_ok"
+   label="OK"
+   top_pad="5"
+   left="10"
+   height="20"
+   width="90"
+   follows="top|left"
+   layout="topleft"/>
+  <button
+   name="perms_btn_cancel"
+   label="Cancel"
+   top_delta="0"
+   left_pad="10"
+   height="20"
+   width="90"
+   follows="top|left"
+   layout="topleft"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_notes.xml b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
index 2d9d513ce0..78d5fb5915 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
@@ -42,49 +42,6 @@
      max_length="65530"
      word_wrap="true"
     />
-  <!--Placeholder, will be moved into BIO's clickable icons-->
-    <text
-     name="status_message2"
-     value="Allow this avatar to:"
-     top_pad="11"
-     left="6"
-     right="-6"
-     height="16"
-     follows="left|bottom|right"
-     layout="topleft"
-     font.style="BOLD"
-    />
-    <check_box
-     name="status_check"
-     label="See when I am online"
-     enabled="false"
-     top_pad="0"
-     left="10"
-     height="16"
-     width="293"
-     follows="left|bottom|right"
-     layout="topleft"
-    />
-    <check_box
-     name="map_check"
-     label="Find me on the world map"
-     enabled="false"
-     left="10"
-     height="16"
-     width="293"
-     follows="left|bottom|right"
-     layout="topleft"
-    />
-    <check_box
-     name="objects_check"
-     label="Edit, delete or take my objects"
-     enabled="false"
-     left="10"
-     height="16"
-     width="293"
-     follows="left|bottom|right"
-     layout="topleft"
-    />
     <button
      name="notes_save_changes"
      label="Save"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 3aa4b47612..5dd4a9116a 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -159,28 +159,40 @@ Account: [ACCTTYPE]
          auto_resize="false"
          user_resize="false">
           <!--Todo: progress indicator-->
-          <!--Probably should be borderless buttons-->
-          <icon
+          <!--Todo: Waits for icons. Current behavior is suboptimal and is a placeholder-->
+
+          <button
            name="allow_to_see_online"
-           image_name="Generic_Person_Large"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="Command_Speak_Icon"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Generic_Person_Large"
            layout="topleft"
            follows="left|top"
            top="0"
            left="0"
            width="24"
            height="24"/>
-          <icon
+
+          <button
            name="allow_to_see_on_map"
-           image_name="Generic_Person_Large"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="Command_Speak_Icon"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Generic_Person_Large"
            layout="topleft"
            follows="left|top"
            top_pad="7"
            left="0"
            width="24"
            height="24"/>
-          <icon
+
+          <button
            name="allow_edit_my_objects"
-           image_name="Generic_Person_Large"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="Command_Speak_Icon"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Generic_Person_Large"
            layout="topleft"
            follows="left|top"
            top_pad="7"
-- 
cgit v1.2.3