aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/CMakeLists.txt5
-rw-r--r--linden/indra/newview/app_settings/settings.xml11
-rw-r--r--linden/indra/newview/llpanelgeneral.cpp9
-rw-r--r--linden/indra/newview/llviewermenu.cpp48
-rw-r--r--linden/indra/newview/llviewermenu.h2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml23
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml53
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_land.xml31
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml87
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_self.xml92
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml44
11 files changed, 370 insertions, 35 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index cafe004..3b229c0 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1179,6 +1179,11 @@ set(viewer_XUI_FILES
1179 skins/default/xui/en-us/floater_windlight_options.xml 1179 skins/default/xui/en-us/floater_windlight_options.xml
1180 skins/default/xui/en-us/floater_world_map.xml 1180 skins/default/xui/en-us/floater_world_map.xml
1181 skins/default/xui/en-us/fonts.xml 1181 skins/default/xui/en-us/fonts.xml
1182 skins/default/xui/en-us/legacy_menu_pie_attachment.xml
1183 skins/default/xui/en-us/legacy_menu_pie_avatar.xml
1184 skins/default/xui/en-us/legacy_menu_pie_land.xml
1185 skins/default/xui/en-us/legacy_menu_pie_object.xml
1186 skins/default/xui/en-us/legacy_menu_pie_self.xml
1182 skins/default/xui/en-us/menu_inventory.xml 1187 skins/default/xui/en-us/menu_inventory.xml
1183 skins/default/xui/en-us/menu_login.xml 1188 skins/default/xui/en-us/menu_login.xml
1184 skins/default/xui/en-us/menu_mini_map.xml 1189 skins/default/xui/en-us/menu_mini_map.xml
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 12d052c..f928e28 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5580,6 +5580,17 @@
5580 <key>Value</key> 5580 <key>Value</key>
5581 <integer>0</integer> 5581 <integer>0</integer>
5582 </map> 5582 </map>
5583 <key>LegacyPieEnabled</key>
5584 <map>
5585 <key>Comment</key>
5586 <string>Use legacy pie menu</string>
5587 <key>Persist</key>
5588 <integer>1</integer>
5589 <key>Type</key>
5590 <string>Boolean</string>
5591 <key>Value</key>
5592 <integer>0</integer>
5593 </map>
5583 <key>LimitDragDistance</key> 5594 <key>LimitDragDistance</key>
5584 <map> 5595 <map>
5585 <key>Comment</key> 5596 <key>Comment</key>
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index adb4cfc..5664f03 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -44,6 +44,7 @@
44 44
45#include "llagent.h" 45#include "llagent.h"
46#include "llviewerregion.h" 46#include "llviewerregion.h"
47#include "llviewermenu.h"
47 48
48LLPanelGeneral::LLPanelGeneral() 49LLPanelGeneral::LLPanelGeneral()
49{ 50{
@@ -105,6 +106,8 @@ BOOL LLPanelGeneral::postBuild()
105 106
106 childSetVisible("maturity_desired_combobox", can_choose); 107 childSetVisible("maturity_desired_combobox", can_choose);
107 childSetVisible("maturity_desired_textbox", !can_choose); 108 childSetVisible("maturity_desired_textbox", !can_choose);
109
110 childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
108 111
109 return TRUE; 112 return TRUE;
110} 113}
@@ -155,6 +158,12 @@ void LLPanelGeneral::apply()
155 gAgent.sendMaturityPreferenceToServer(preferred_maturity); 158 gAgent.sendMaturityPreferenceToServer(preferred_maturity);
156 } 159 }
157 } 160 }
161
162 if (gSavedSettings.getBOOL("LegacyPieEnabled") == !((BOOL)childGetValue("legacy_pie_menu_checkbox")))
163 {
164 gSavedSettings.setBOOL("LegacyPieEnabled", childGetValue("legacy_pie_menu_checkbox"));
165 build_pie_menus();
166 }
158} 167}
159 168
160void LLPanelGeneral::cancel() 169void LLPanelGeneral::cancel()
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 34e7c77..c403700 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -618,24 +618,7 @@ void init_menus()
618 /// 618 ///
619 /// Pie menus 619 /// Pie menus
620 /// 620 ///
621 gPieSelf = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_self.xml", gMenuHolder); 621 build_pie_menus();
622
623 // TomY TODO: what shall we do about these?
624 gDetachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Detach HUD", true);
625 gDetachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Detach", true);
626
627 gPieAvatar = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_avatar.xml", gMenuHolder);
628
629 gPieObject = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_object.xml", gMenuHolder);
630
631 gAttachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach HUD");
632 gAttachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach");
633
634 gPieAttachment = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_attachment.xml", gMenuHolder);
635
636 gPieHUD = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_hud.xml", gMenuHolder);
637
638 gPieLand = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_land.xml", gMenuHolder);
639 622
640 /// 623 ///
641 /// set up the colors 624 /// set up the colors
@@ -5164,6 +5147,35 @@ void toggle_debug_menus(void*)
5164} 5147}
5165 5148
5166 5149
5150void build_pie_menus()
5151{
5152 // build legacy pie menus (based on SL viewer 1.22)
5153 if (gSavedSettings.getBOOL("LegacyPieEnabled"))
5154 {
5155 gPieSelf = LLUICtrlFactory::getInstance()->buildPieMenu("legacy_menu_pie_self.xml", gMenuHolder);
5156 gPieAvatar = LLUICtrlFactory::getInstance()->buildPieMenu("legacy_menu_pie_avatar.xml", gMenuHolder);
5157 gPieAttachment = LLUICtrlFactory::getInstance()->buildPieMenu("legacy_menu_pie_attachment.xml", gMenuHolder);
5158 gPieLand = LLUICtrlFactory::getInstance()->buildPieMenu("legacy_menu_pie_land.xml", gMenuHolder);
5159 gPieObject = LLUICtrlFactory::getInstance()->buildPieMenu("legacy_menu_pie_object.xml", gMenuHolder);
5160 }
5161 else
5162 {
5163 gPieSelf = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_self.xml", gMenuHolder);
5164 gPieAvatar = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_avatar.xml", gMenuHolder);
5165 gPieAttachment = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_attachment.xml", gMenuHolder);
5166 gPieLand = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_land.xml", gMenuHolder);
5167 gPieObject = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_object.xml", gMenuHolder);
5168 }
5169
5170 // TomY TODO: what shall we do about these?
5171 gDetachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Detach HUD", true);
5172 gDetachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Detach", true);
5173 gAttachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach HUD");
5174 gAttachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach");
5175
5176 gPieHUD = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_hud.xml", gMenuHolder);
5177}
5178
5167// LLUUID gExporterRequestID; 5179// LLUUID gExporterRequestID;
5168// std::string gExportDirectory; 5180// std::string gExportDirectory;
5169 5181
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index 26c65fb..560edc8 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -49,6 +49,8 @@ void init_menus();
49void cleanup_menus(); 49void cleanup_menus();
50 50
51void show_debug_menus(); // checks for if menus should be shown first. 51void show_debug_menus(); // checks for if menus should be shown first.
52// builds either current or legacy pie menus depending upon LegacyPieEnabled
53void build_pie_menus();
52void show_context_menu( S32 x, S32 y, MASK mask ); 54void show_context_menu( S32 x, S32 y, MASK mask );
53void show_build_mode_context_menu(S32 x, S32 y, MASK mask); 55void show_build_mode_context_menu(S32 x, S32 y, MASK mask);
54BOOL enable_save_into_inventory(void*); 56BOOL enable_save_into_inventory(void*);
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
new file mode 100644
index 0000000..18bedd0
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
@@ -0,0 +1,23 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<pie_menu name="Attachment Pie">
3 <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
4 <on_click function="Attachment.Drop" />
5 <on_enable function="Attachment.EnableDrop" />
6 </menu_item_call>
7 <menu_item_separator />
8 <menu_item_separator />
9 <menu_item_separator />
10 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
11 <on_click function="Object.Inspect" />
12 <on_enable function="Object.EnableInspect" />
13 </menu_item_call>
14 <menu_item_separator />
15 <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
16 <on_click function="Attachment.Detach" />
17 <on_enable function="Attachment.EnableDetach" />
18 </menu_item_call>
19 <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit">
20 <on_click function="Object.Edit" />
21 <on_enable function="EnableEdit" />
22 </menu_item_call>
23</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml
new file mode 100644
index 0000000..7fba0be
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml
@@ -0,0 +1,53 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<pie_menu name="Avatar Pie">
3 <menu_item_call enabled="false" label="Profile..." mouse_opaque="true" name="Profile...">
4 <on_click function="ShowAgentProfile" userdata="hit object" />
5 </menu_item_call>
6 <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Avatar Mute">
7 <on_click function="Avatar.Mute" />
8 <on_enable function="Avatar.EnableMute" />
9 </menu_item_call>
10 <menu_item_call enabled="false" label="Go To" mouse_opaque="true" name="Go To">
11 <on_click function="GoToObject" />
12 </menu_item_call>
13 <menu_item_separator />
14 <menu_item_call enabled="false" label="Add Friend..." mouse_opaque="true" name="Add Friend">
15 <on_click function="Avatar.AddFriend" />
16 <on_enable function="Avatar.EnableAddFriend" />
17 </menu_item_call>
18 <menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay...">
19 <on_click function="PayObject" />
20 <on_enable function="EnablePayObject" />
21 </menu_item_call>
22 <pie_menu label="More &gt;" name="More &gt;">
23 <menu_item_call enabled="false" label="Freeze..." mouse_opaque="true" name="Freeze...">
24 <on_click function="Avatar.Freeze" />
25 <on_enable function="Avatar.EnableFreezeEject" />
26 </menu_item_call>
27 <menu_item_call enabled="false" label="Give Card" mouse_opaque="true" name="Give Card">
28 <on_click function="Avatar.GiveCard" />
29 </menu_item_call>
30 <menu_item_call enabled="true" label="Group Invite..." mouse_opaque="true" name="Invite...">
31 <on_click function="Avatar.InviteToGroup" />
32 </menu_item_call>
33 <menu_item_call enabled="true" label="Report..." mouse_opaque="true" name="abuse">
34 <on_click function="Avatar.ReportAbuse" />
35 </menu_item_call>
36 <menu_item_call enabled="false" label="Eject..." mouse_opaque="true" name="Eject...">
37 <on_click function="Avatar.Eject" />
38 <on_enable function="Avatar.EnableFreezeEject" />
39 </menu_item_call>
40 <menu_item_call enabled="false" label="Debug..." mouse_opaque="true" name="Debug...">
41 <on_click function="Avatar.Debug" />
42 <on_visible function="Avatar.VisibleDebug" />
43 <on_enable function="Avatar.EnableDebug" />
44 </menu_item_call>
45 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Avatar Inspect">
46 <on_click function="Object.Inspect" />
47 <on_enable function="Object.EnableInspect" />
48 </menu_item_call>
49 </pie_menu>
50 <menu_item_call enabled="false" label="Send IM..." mouse_opaque="true" name="Send IM...">
51 <on_click function="Avatar.SendIM" />
52 </menu_item_call>
53</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_land.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_land.xml
new file mode 100644
index 0000000..05827c5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_land.xml
@@ -0,0 +1,31 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<pie_menu name="Land Pie">
3 <menu_item_call enabled="false" label="About Land..." mouse_opaque="true" name="About Land...">
4 <on_click function="ShowFloater" userdata="about land" />
5 </menu_item_call>
6 <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
7 <on_click function="Land.Build" />
8 <on_enable function="EnableEdit" />
9 </menu_item_call>
10 <menu_item_call enabled="false" label="Go Here" mouse_opaque="true" name="Go Here">
11 <on_click function="GoToObject" />
12 </menu_item_call>
13 <menu_item_call enabled="false" label="Sit Here" mouse_opaque="true" name="Sit Here">
14 <on_click function="Land.Sit" />
15 </menu_item_call>
16 <menu_item_call enabled="false" label="Landmark..." mouse_opaque="true" name="Add Landmark">
17 <on_click function="Land.NewLandmark" />
18 </menu_item_call>
19 <menu_item_call enabled="false" label="Buy Pass..." mouse_opaque="true" name="Land Buy Pass">
20 <on_click function="Land.BuyPass" />
21 <on_enable function="Land.EnableBuyPass" />
22 </menu_item_call>
23 <menu_item_call enabled="false" label="Edit Terrain" mouse_opaque="true" name="Edit Terrain">
24 <on_click function="Land.Edit" />
25 <on_enable function="EnableEdit" />
26 </menu_item_call>
27 <menu_item_call enabled="false" label="Buy Land..." mouse_opaque="true" name="Land Buy">
28 <on_click function="ShowFloater" userdata="buy land" />
29 <on_enable function="World.EnableBuyLand" />
30 </menu_item_call>
31</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml
new file mode 100644
index 0000000..3703dbd
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml
@@ -0,0 +1,87 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<pie_menu name="Object Pie">
3 <menu_item_call enabled="false" label="Open" mouse_opaque="true" name="Open">
4 <on_click function="Object.Open" />
5 <on_enable function="Object.EnableOpen" />
6 </menu_item_call>
7 <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
8 <on_click function="Object.Build" />
9 <on_enable function="EnableEdit" />
10 </menu_item_call>
11 <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
12 <on_click function="Object.Touch" />
13 <on_enable function="Object.EnableTouch" userdata="Touch" name="EnableTouch"/>
14 </menu_item_call>
15 <menu_item_call enabled="false" label="Sit Here" mouse_opaque="true" name="Object Sit">
16 <on_click function="Object.SitOrStand" />
17 <on_enable function="Object.EnableSitOrStand" userdata="Sit Here,Stand Up" name="EnableSitOrStand"/>
18 </menu_item_call>
19 <menu_item_call enabled="false" label="Take" mouse_opaque="true" name="Pie Object Take">
20 <on_click function="Tools.Take" />
21 <on_enable function="Tools.EnableTake" name="EnableTake"/>
22 </menu_item_call>
23 <menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay...">
24 <on_click function="PayObject" />
25 <on_enable function="EnablePayObject" />
26 </menu_item_call>
27 <pie_menu label="More &gt;" name="More &gt;">
28 <menu_item_call enabled="false" label="Delete" mouse_opaque="true" name="Delete">
29 <on_click function="Object.Delete" />
30 <on_enable function="Object.EnableDelete" />
31 </menu_item_call>
32 <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear">
33 <on_click function="Object.AttachToAvatar" />
34 <on_enable function="Object.EnableWear" />
35 </menu_item_call>
36 <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy">
37 <on_click function="Tools.TakeCopy" />
38 <on_enable function="Tools.EnableTakeCopy" />
39 </menu_item_call>
40 <pie_menu label="Attach HUD &gt;" name="Object Attach HUD" />
41 <pie_menu label="Attach &gt;" name="Object Attach" />
42 <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return...">
43 <on_click function="Object.Return" />
44 <on_enable function="Object.EnableReturn" />
45 </menu_item_call>
46 <pie_menu label="More &gt;" name="Rate Menu">
47 <menu_item_call label="Export" enabled="false" hidden="false"
48 mouse_opaqu="true" name="Export">
49 <on_click function="Object.Export" />
50 <on_enable function="Object.EnableExport" />
51 </menu_item_call>
52 <menu_item_call name="Link" enabled="false" label="Link">
53 <on_click function="Tools.Link" userdata="" />
54 <on_enable function="Tools.EnableLink" />
55 </menu_item_call>
56 <menu_item_call enabled="false" label="Report Abuse..." mouse_opaque="true"
57 name="Report Abuse...">
58 <on_click function="Object.ReportAbuse" />
59 <on_enable function="Object.EnableReportAbuse" />
60 </menu_item_call>
61 <menu_item_call enabled="false" label="Go Here" mouse_opaque="true" name="Go Here">
62 <on_click function="GoToObject" />
63 </menu_item_call>
64 <menu_item_call name="Unlink" enabled="false" label="Unlink">
65 <on_click function="Tools.Unlink" userdata="" />
66 <on_enable function="Tools.EnableUnlink" />
67 </menu_item_call>
68 <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
69 <on_click function="Object.Mute" />
70 <on_enable function="Object.EnableMute" />
71 </menu_item_call>
72 <menu_item_separator />
73 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
74 <on_click function="Object.Inspect" />
75 <on_enable function="Object.EnableInspect" />
76 </menu_item_call>
77 </pie_menu>
78 <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
79 <on_click function="Object.Buy" />
80 <on_enable function="Object.EnableBuy" />
81 </menu_item_call>
82 </pie_menu>
83 <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
84 <on_click function="Object.Edit" />
85 <on_enable function="EnableEdit" />
86 </menu_item_call>
87</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_self.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_self.xml
new file mode 100644
index 0000000..1e7e08a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_self.xml
@@ -0,0 +1,92 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<pie_menu name="Self Pie">
3 <menu_item_call enabled="true" label="Profile..." name="Profile...">
4 <on_click function="ShowAgentProfile" userdata="agent" />
5 </menu_item_call>
6 <menu_item_call enabled="true" label="Groups..." name="Groups...">
7 <on_click function="ShowAgentGroups" userdata="agent" />
8 </menu_item_call>
9 <menu_item_call enabled="true" label="Inventory" name="Inventory">
10 <on_click function="ShowFloater" userdata="inventory" />
11 </menu_item_call>
12 <menu_item_call enabled="true" label="Stand Up" name="Stand Up">
13 <on_click function="Self.StandUp" userdata="" />
14 <on_enable function="Self.EnableStandUp" />
15 </menu_item_call>
16 <menu_item_call enabled="true" label="Friends..." name="Friends...">
17 <on_click function="ShowFloater" userdata="friends" />
18 </menu_item_call>
19 <menu_item_call enabled="true" label="Gestures..." name="Gestures...">
20 <on_click function="ShowFloater" userdata="gestures" />
21 </menu_item_call>
22 <pie_menu enabled="true" label="Take Off &gt;" name="Take Off &gt;">
23 <pie_menu enabled="true" label="Clothes &gt;" name="Clothes &gt;">
24 <menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"
25 mouse_opaque="true" name="Shirt" width="118">
26 <on_click function="Edit.TakeOff" userdata="shirt" />
27 <on_enable function="Edit.EnableTakeOff" userdata="shirt" />
28 </menu_item_call>
29 <menu_item_call bottom="-48" enabled="false" height="19" label="Pants" left="0"
30 mouse_opaque="true" name="Pants" width="118">
31 <on_click function="Edit.TakeOff" userdata="pants" />
32 <on_enable function="Edit.EnableTakeOff" userdata="pants" />
33 </menu_item_call>
34 <menu_item_call bottom="-67" enabled="false" height="19" label="Shoes" left="0"
35 mouse_opaque="true" name="Shoes" width="118">
36 <on_click function="Edit.TakeOff" userdata="shoes" />
37 <on_enable function="Edit.EnableTakeOff" userdata="shoes" />
38 </menu_item_call>
39 <menu_item_call bottom="-86" enabled="false" height="19" label="Socks" left="0"
40 mouse_opaque="true" name="Socks" width="118">
41 <on_click function="Edit.TakeOff" userdata="socks" />
42 <on_enable function="Edit.EnableTakeOff" userdata="socks" />
43 </menu_item_call>
44 <menu_item_call bottom="-105" enabled="false" height="19" label="Jacket" left="0"
45 mouse_opaque="true" name="Jacket" width="118">
46 <on_click function="Edit.TakeOff" userdata="jacket" />
47 <on_enable function="Edit.EnableTakeOff" userdata="jacket" />
48 </menu_item_call>
49 <menu_item_call bottom="-124" enabled="false" height="19" label="Gloves" left="0"
50 mouse_opaque="true" name="Gloves" width="118">
51 <on_click function="Edit.TakeOff" userdata="gloves" />
52 <on_enable function="Edit.EnableTakeOff" userdata="gloves" />
53 </menu_item_call>
54 <pie_menu enabled="true" label="More &gt;" name="More &gt;">
55 <menu_item_call bottom="-143" enabled="false" height="19" label="Undershirt" left="0"
56 mouse_opaque="true" name="Self Undershirt" width="118">
57 <on_click function="Edit.TakeOff" userdata="undershirt" />
58 <on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
59 </menu_item_call>
60 <menu_item_separator />
61 <menu_item_call bottom="-200" enabled="true" height="19" label="All Clothes" left="0"
62 mouse_opaque="true" name="All Clothes" width="118">
63 <on_click function="Edit.TakeOff" userdata="all" />
64 </menu_item_call>
65 <menu_item_separator />
66 <menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0"
67 mouse_opaque="true" name="Self Underpants" width="118">
68 <on_click function="Edit.TakeOff" userdata="underpants" />
69 <on_enable function="Edit.EnableTakeOff" userdata="underpants" />
70 </menu_item_call>
71 </pie_menu>
72 <menu_item_call bottom="-181" enabled="false" height="19" label="Skirt" left="0"
73 mouse_opaque="true" name="Skirt" width="118">
74 <on_click function="Edit.TakeOff" userdata="skirt" />
75 <on_enable function="Edit.EnableTakeOff" userdata="skirt" />
76 </menu_item_call>
77 </pie_menu>
78 <menu_item_separator />
79 <pie_menu enabled="true" label="HUD &gt;" name="Object Detach HUD" />
80 <menu_item_separator />
81 <pie_menu enabled="true" label="Detach &gt;" name="Object Detach" />
82 <menu_item_separator />
83 <menu_item_call enabled="true" label="Detach All" name="Detach All">
84 <on_click function="Self.RemoveAllAttachments" userdata="" />
85 <on_enable function="Self.EnableRemoveAllAttachments" />
86 </menu_item_call>
87 </pie_menu>
88 <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
89 <on_click function="ShowFloater" userdata="appearance" />
90 <on_enable function="Edit.EnableCustomizeAvatar" />
91 </menu_item_call>
92</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 6b17ab3..dba8007 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -29,11 +29,11 @@
29 Always 29 Always
30 </combo_item> 30 </combo_item>
31 </combo_box> 31 </combo_box>
32 <check_box bottom_delta="-25" follows="left|top" 32 <check_box bottom_delta="0" follows="left|top"
33 font="SansSerifSmall" height="16" initial_value="true" 33 font="SansSerifSmall" height="16" initial_value="true"
34 label="Small Avatar Names" left="151" name="small_avatar_names_checkbox" 34 label="Small Avatar Names" left="330" name="small_avatar_names_checkbox"
35 width="200" /> 35 width="200" />
36 <check_box bottom_delta="-18" follows="left|top" 36 <check_box bottom_delta="-20" follows="left|top"
37 font="SansSerifSmall" height="16" initial_value="false" 37 font="SansSerifSmall" height="16" initial_value="false"
38 label="Hide My Name On My Screen" left="151" name="show_my_name_checkbox" 38 label="Hide My Name On My Screen" left="151" name="show_my_name_checkbox"
39 width="200" /> 39 width="200" />
@@ -50,18 +50,28 @@
50 font="SansSerifSmall" height="16" initial_value="false" 50 font="SansSerifSmall" height="16" initial_value="false"
51 label="Hide My Group Title" left="151" name="show_my_title_checkbox" 51 label="Hide My Group Title" left="151" name="show_my_title_checkbox"
52 radio_style="false" width="256" /> 52 radio_style="false" width="256" />
53 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210" 53 <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
54 halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
55 width="394">
56 Pie Menus:
57 </text>
58 <check_box bottom_delta="0" enabled="true"
59 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
60 label="Use legacy pie menus" left="151"
61 mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
62 width="256" />
63 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
54 can_apply_immediately="false" color="1 1 1 1" 64 can_apply_immediately="false" color="1 1 1 1"
55 enabled="true" follows="left|top" height="48" label="" left="153" 65 enabled="true" follows="left|top" height="48" label="" left="153"
56 mouse_opaque="true" name="effect_color_swatch" 66 mouse_opaque="true" name="effect_color_swatch"
57 tool_tip="Click to open Color Picker" width="32" /> 67 tool_tip="Click to open Color Picker" width="32" />
58 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 68 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
59 bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top" 69 bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
60 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" 70 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
61 mouse_opaque="true" name="UI Size:" v_pad="0" width="128"> 71 mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
62 UI Size: 72 UI Size:
63 </text> 73 </text>
64 <slider bottom="-217" can_edit_text="true" 74 <slider bottom="-217" can_edit_text="true"
65 decimal_digits="3" enabled="true" height="16" increment="0.001" 75 decimal_digits="3" enabled="true" height="16" increment="0.001"
66 initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true" 76 initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
67 name="ui_scale_slider" show_text="true" value="1" width="220" /> 77 name="ui_scale_slider" show_text="true" value="1" width="220" />
@@ -69,18 +79,18 @@
69 font="SansSerif" halign="center" height="22" label="Reset" 79 font="SansSerif" halign="center" height="22" label="Reset"
70 label_selected="Reset" left_delta="226" mouse_opaque="true" 80 label_selected="Reset" left_delta="226" mouse_opaque="true"
71 name="reset_ui_size" scale_image="true" width="80" /> 81 name="reset_ui_size" scale_image="true" width="80" />
72 <check_box bottom="-236" enabled="true" follows="left|top" 82 <check_box bottom="-236" enabled="true" follows="left|top"
73 font="SansSerifSmall" height="16" initial_value="false" 83 font="SansSerifSmall" height="16" initial_value="false"
74 label="Use resolution independent scale" left="151" mouse_opaque="true" 84 label="Use resolution independent scale" left="151" mouse_opaque="true"
75 name="ui_auto_scale" radio_style="false" width="256" /> 85 name="ui_auto_scale" radio_style="false" width="256" />
76 <spinner bottom="-260" decimal_digits="0" enabled="true" 86 <spinner bottom="-260" decimal_digits="0" enabled="true"
77 follows="left|top" height="16" increment="1" initial_val="300" 87 follows="left|top" height="16" increment="1" initial_val="300"
78 label="Away Timeout:" label_width="141" left="10" max_val="600" 88 label="Away Timeout:" label_width="141" left="10" max_val="600"
79 min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" /> 89 min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
80 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 90 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
81 bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top" 91 bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
82 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" 92 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
83 mouse_opaque="true" name="UI Size:" v_pad="0" width="128"> 93 mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
84 Mini-map notify: 94 Mini-map notify:
85 </text> 95 </text>
86 <check_box bottom_delta="0" enabled="true" 96 <check_box bottom_delta="0" enabled="true"
@@ -89,10 +99,10 @@
89 mouse_opaque="true" name="mini_map_notify_chat" radio_style="false" 99 mouse_opaque="true" name="mini_map_notify_chat" radio_style="false"
90 width="256" /> 100 width="256" />
91 <check_box bottom_delta="0" enabled="true" 101 <check_box bottom_delta="0" enabled="true"
92 follows="left|top" font="SansSerifSmall" height="16" initial_value="false" 102 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
93 label="Entering sim" left="330" 103 label="Entering sim" left="330"
94 mouse_opaque="true" name="mini_map_notify_sim" radio_style="false" 104 mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
95 width="256" /> 105 width="256" />
96 <check_box bottom="-304" enabled="true" 106 <check_box bottom="-304" enabled="true"
97 follows="left|top" font="SansSerifSmall" height="16" initial_value="false" 107 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
98 label="Notify when Linden dollars (L$) spent or received" left="151" 108 label="Notify when Linden dollars (L$) spent or received" left="151"
generated by cgit v1.1 at 2024-11-15 17:31:12 +0000