aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/llviewermenu.cpp22
-rw-r--r--linden/indra/newview/llviewerwindow.cpp8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml27
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml130
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml53
6 files changed, 180 insertions, 68 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 7c556df..838f230 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -4550,6 +4550,25 @@ void print_agent_nvpairs(void*)
4550 llinfos << "Camera at " << gAgent.getCameraPositionGlobal() << llendl; 4550 llinfos << "Camera at " << gAgent.getCameraPositionGlobal() << llendl;
4551} 4551}
4552 4552
4553class LLViewToggleAdvanced : public view_listener_t
4554{
4555 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
4556 {
4557 toggle_debug_menus(NULL);
4558 return true;
4559 }
4560};
4561
4562class LLViewCheckAdvanced : public view_listener_t
4563{
4564 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
4565 {
4566 BOOL new_value = gSavedSettings.getBOOL("UseDebugMenus");
4567 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
4568 return true;
4569 }
4570};
4571
4553void show_debug_menus() 4572void show_debug_menus()
4554{ 4573{
4555 // this can get called at login screen where there is no menu so only toggle it if one exists 4574 // this can get called at login screen where there is no menu so only toggle it if one exists
@@ -9509,6 +9528,8 @@ void initialize_menus()
9509 addMenu(new LLViewZoomIn(), "View.ZoomIn"); 9528 addMenu(new LLViewZoomIn(), "View.ZoomIn");
9510 addMenu(new LLViewZoomDefault(), "View.ZoomDefault"); 9529 addMenu(new LLViewZoomDefault(), "View.ZoomDefault");
9511 addMenu(new LLViewFullscreen(), "View.Fullscreen"); 9530 addMenu(new LLViewFullscreen(), "View.Fullscreen");
9531 addMenu(new LLViewToggleAdvanced(), "View.ToggleAdvanced");
9532
9512 9533
9513 addMenu(new LLViewEnableMouselook(), "View.EnableMouselook"); 9534 addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
9514 addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter"); 9535 addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
@@ -9519,6 +9540,7 @@ void initialize_menus()
9519 addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent"); 9540 addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
9520 addMenu(new LLViewCheckRenderType(), "View.CheckRenderType"); 9541 addMenu(new LLViewCheckRenderType(), "View.CheckRenderType");
9521 addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments"); 9542 addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
9543 addMenu(new LLViewCheckAdvanced(), "View.CheckAdvanced");
9522 9544
9523 // World menu 9545 // World menu
9524 addMenu(new LLWorldChat(), "World.Chat"); 9546 addMenu(new LLWorldChat(), "World.Chat");
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 9b2c566..7e6c24f 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -2357,14 +2357,6 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
2357 } 2357 }
2358 2358
2359 // Explicit hack for debug menu. 2359 // Explicit hack for debug menu.
2360 if ((MASK_ALT & mask) &&
2361 (MASK_CONTROL & mask) &&
2362 ('D' == key || 'd' == key))
2363 {
2364 toggle_debug_menus(NULL);
2365 }
2366
2367 // Explicit hack for debug menu.
2368 if ((mask == (MASK_SHIFT | MASK_CONTROL)) && 2360 if ((mask == (MASK_SHIFT | MASK_CONTROL)) &&
2369 ('G' == key || 'g' == key)) 2361 ('G' == key || 'g' == key))
2370 { 2362 {
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
new file mode 100644
index 0000000..1b31afa
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -0,0 +1,8 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true"
3 can_tear_off="false" follows="top|right" height="220" min_height="64" min_width="64"
4 name="minimap" rect_control="FloaterMiniMapRect" width="200">
5 <panel bottom="2" follows="left|top|right|bottom" height="216" label="Mini Map"
6 left="2" mouse_opaque="false" name="mini_mapview"
7 width="196" />
8</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
new file mode 100644
index 0000000..1fee7d1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
@@ -0,0 +1,27 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100"
3 mouse_opaque="false" name="popup" opaque="true" width="128">
4 <menu_item_call bottom_delta="-18" height="18" label="Zoom Close" left="0"
5 mouse_opaque="true" name="Zoom Close" width="128">
6 <on_click function="MiniMap.ZoomLevel" userdata="2" />
7 </menu_item_call>
8 <menu_item_call bottom_delta="-18" height="18" label="Zoom Medium" left="0"
9 mouse_opaque="true" name="Zoom Medium" width="128">
10 <on_click function="MiniMap.ZoomLevel" userdata="1" />
11 </menu_item_call>
12 <menu_item_call bottom_delta="-18" height="18" label="Zoom Far" left="0"
13 mouse_opaque="true" name="Zoom Far" width="128">
14 <on_click function="MiniMap.ZoomLevel" userdata="0" />
15 </menu_item_call>
16 <menu_item_separator />
17 <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Stop Tracking"
18 left="0" mouse_opaque="true" name="Stop Tracking" width="128">
19 <on_click function="MiniMap.StopTracking" />
20 <on_enable function="MiniMap.EnableTracking" />
21 </menu_item_call>
22 <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Profile..."
23 left="0" mouse_opaque="true" name="Profile" width="128">
24 <on_click function="MiniMap.ShowProfile" />
25 <on_enable function="MiniMap.EnableProfile" />
26 </menu_item_call>
27</menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 72b828d..e085b21 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -126,12 +126,6 @@
126 <on_enable function="Edit.EnableDeselect" /> 126 <on_enable function="Edit.EnableDeselect" />
127 </menu_item_call> 127 </menu_item_call>
128 <menu_item_separator /> 128 <menu_item_separator />
129 <menu_item_call name="Duplicate" enabled="false"
130 label="Duplicate" shortcut="control|D">
131 <on_click function="Edit.Duplicate" userdata="" />
132 <on_enable function="Edit.EnableDuplicate" />
133 </menu_item_call>
134 <menu_item_separator />
135 129
136 <menu name="Attach Object" create_jump_keys="true" 130 <menu name="Attach Object" create_jump_keys="true"
137 label="Attach Object" opaque="true" tear_off="true" /> 131 label="Attach Object" opaque="true" tear_off="true" />
@@ -397,11 +391,17 @@
397 <on_click function="View.ZoomOut" userdata="" /> 391 <on_click function="View.ZoomOut" userdata="" />
398 </menu_item_call> 392 </menu_item_call>
399 </menu> 393 </menu>
400 <menu_item_separator />
401 <menu_item_call name="Toggle Fullscreen" label="Toggle Fullscreen" 394 <menu_item_call name="Toggle Fullscreen" label="Toggle Fullscreen"
402 shortcut="alt|Enter"> 395 shortcut="alt|Enter">
403 <on_click function="View.Fullscreen" userdata="" /> 396 <on_click function="View.Fullscreen" userdata="" />
404 </menu_item_call> 397 </menu_item_call>
398 <menu_item_separator />
399 <menu_item_check name="Toggle Advanced Menu"
400 label="Advanced Menu"
401 shortcut="control|alt|D">
402 <on_click function="View.ToggleAdvanced" userdata="" />
403 <on_check function="View.CheckAdvanced" />
404 </menu_item_check>
405 </menu> 405 </menu>
406 406
407 407
@@ -516,7 +516,7 @@
516 516
517 <menu name="Tools" create_jump_keys="true" label="Tools" 517 <menu name="Tools" create_jump_keys="true" label="Tools"
518 opaque="true" tear_off="true" visible="false"> 518 opaque="true" tear_off="true" visible="false">
519 <menu name="Select Tool" create_jump_keys="true" label="Select Tool" 519 <menu name="Select Tool" create_jump_keys="true" label="Choose Tool"
520 opaque="true" tear_off="true"> 520 opaque="true" tear_off="true">
521 <menu_item_call name="Focus" label="Focus" shortcut="control|1"> 521 <menu_item_call name="Focus" label="Focus" shortcut="control|1">
522 <on_click function="Tools.SelectTool" userdata="focus" /> 522 <on_click function="Tools.SelectTool" userdata="focus" />
@@ -535,48 +535,61 @@
535 </menu_item_call> 535 </menu_item_call>
536 </menu> 536 </menu>
537 <menu_item_separator /> 537 <menu_item_separator />
538 <menu_item_check name="Select Only My Objects" 538 <menu_item_call name="Focus on Selection" enabled="false"
539 label="Select Only My Objects"> 539 label="Focus on Selection" shortcut="H">
540 <on_click function="Tools.SelectOnlyMyObjects" 540 <on_click function="Tools.LookAtSelection" userdata="focus" />
541 userdata="agents" /> 541 <on_enable function="Tools.SomethingSelectedNoHUD" />
542 <on_check control="SelectOwnedOnly" /> 542 </menu_item_call>
543 </menu_item_check> 543 <menu_item_call name="Zoom to Selection" enabled="false"
544 <menu_item_check name="Select Only Movable Objects" 544 label="Zoom to Selection" shortcut="shift|H">
545 label="Select Only Movable Objects"> 545 <on_click function="Tools.LookAtSelection" userdata="zoom" />
546 <on_click function="Tools.SelectOnlyMovableObjects" 546 <on_enable function="Tools.SomethingSelectedNoHUD" />
547 userdata="movable" /> 547 </menu_item_call>
548 <on_check control="SelectMovableOnly" /> 548 <menu name="Selection Options" label="Selection Options"
549 </menu_item_check> 549 create_jump_keys="true" opaque="true" tear_off="true">
550 <menu_item_check name="Select Only Copyable Objects" 550 <menu_item_check name="Select Only My Objects"
551 label="Select Only Copyable Objects"> 551 label="Select Only My Objects">
552 <on_click function="Tools.SelectOnlyCopyableObjects" 552 <on_click function="Tools.SelectOnlyMyObjects"
553 userdata="copyable" /> 553 userdata="agents" />
554 <on_check control="SelectCopyableOnly" /> 554 <on_check control="SelectOwnedOnly" />
555 </menu_item_check> 555 </menu_item_check>
556 <menu_item_check name="Select By Surrounding" 556 <menu_item_check name="Select Only Movable Objects"
557 label="Select By Surrounding"> 557 label="Select Only Movable Objects">
558 <on_click function="Tools.SelectBySurrounding" 558 <on_click function="Tools.SelectOnlyMovableObjects"
559 userdata="" /> 559 userdata="movable" />
560 <on_check control="RectangleSelectInclusive" /> 560 <on_check control="SelectMovableOnly" />
561 </menu_item_check> 561 </menu_item_check>
562 <menu_item_check name="Show Hidden Selection" 562 <menu_item_check name="Select Only Copyable Objects"
563 label="Show Hidden Selection"> 563 label="Select Only Copyable Objects">
564 <on_click function="Tools.ShowHiddenSelection" 564 <on_click function="Tools.SelectOnlyCopyableObjects"
565 userdata="" /> 565 userdata="copyable" />
566 <on_check control="RenderHiddenSelections" /> 566 <on_check control="SelectCopyableOnly" />
567 </menu_item_check> 567 </menu_item_check>
568 <menu_item_check name="Show Light Radius for Selection" 568 <menu_item_check name="Select By Surrounding"
569 label="Show Light Radius for Selection"> 569 label="Select By Surrounding">
570 <on_click function="Tools.ShowSelectionLightRadius" 570 <on_click function="Tools.SelectBySurrounding"
571 userdata="" /> 571 userdata="" />
572 <on_check control="RenderLightRadius" /> 572 <on_check control="RectangleSelectInclusive" />
573 </menu_item_check> 573 </menu_item_check>
574 <menu_item_check name="Show Selection Beam" 574 <menu_item_check name="Show Hidden Selection"
575 label="Show Selection Beam"> 575 label="Show Hidden Selection">
576 <on_click function="ToggleControl" 576 <on_click function="Tools.ShowHiddenSelection"
577 userdata="ShowSelectionBeam" /> 577 userdata="" />
578 <on_check control="ShowSelectionBeam" /> 578 <on_check control="RenderHiddenSelections" />
579 </menu_item_check> 579 </menu_item_check>
580 <menu_item_check name="Show Light Radius for Selection"
581 label="Show Light Radius for Selection">
582 <on_click function="Tools.ShowSelectionLightRadius"
583 userdata="" />
584 <on_check control="RenderLightRadius" />
585 </menu_item_check>
586 <menu_item_check name="Show Selection Beam"
587 label="Show Selection Beam">
588 <on_click function="ToggleControl"
589 userdata="ShowSelectionBeam" />
590 <on_check control="ShowSelectionBeam" />
591 </menu_item_check>
592 </menu>
580 <menu_item_separator /> 593 <menu_item_separator />
581 <menu_item_check name="Snap to Grid" enabled="false" 594 <menu_item_check name="Snap to Grid" enabled="false"
582 label="Snap to Grid" shortcut="G"> 595 label="Snap to Grid" shortcut="G">
@@ -619,15 +632,10 @@
619 <on_enable function="Tools.EnableUnlink" /> 632 <on_enable function="Tools.EnableUnlink" />
620 </menu_item_call> 633 </menu_item_call>
621 <menu_item_separator /> 634 <menu_item_separator />
622 <menu_item_call name="Focus on Selection" enabled="false" 635 <menu_item_call name="Duplicate" enabled="false"
623 label="Focus on Selection" shortcut="H"> 636 label="Duplicate" shortcut="control|D">
624 <on_click function="Tools.LookAtSelection" userdata="focus" /> 637 <on_click function="Edit.Duplicate" userdata="" />
625 <on_enable function="Tools.SomethingSelectedNoHUD" /> 638 <on_enable function="Edit.EnableDuplicate" />
626 </menu_item_call>
627 <menu_item_call name="Zoom to Selection" enabled="false"
628 label="Zoom to Selection" shortcut="shift|H">
629 <on_click function="Tools.LookAtSelection" userdata="zoom" />
630 <on_enable function="Tools.SomethingSelectedNoHUD" />
631 </menu_item_call> 639 </menu_item_call>
632 <menu_item_call name="Menu Object Take" enabled="false" 640 <menu_item_call name="Menu Object Take" enabled="false"
633 label="Take" visible="false"> 641 label="Take" visible="false">
@@ -639,6 +647,7 @@
639 <on_click function="Tools.TakeCopy" userdata="" /> 647 <on_click function="Tools.TakeCopy" userdata="" />
640 <on_enable function="Tools.EnableTakeCopy" /> 648 <on_enable function="Tools.EnableTakeCopy" />
641 </menu_item_call> 649 </menu_item_call>
650 <menu_item_separator />
642 <menu_item_call name="Return..." enabled="false" 651 <menu_item_call name="Return..." enabled="false"
643 label="Return Object"> 652 label="Return Object">
644 <on_click function="Object.Return" /> 653 <on_click function="Object.Return" />
@@ -695,9 +704,10 @@
695 userdata="stop" /> 704 userdata="stop" />
696 <on_enable function="EditableSelected" /> 705 <on_enable function="EditableSelected" />
697 </menu_item_call> 706 </menu_item_call>
707 <menu_item_separator />
698 <menu_item_call name="Set permissions on selected task inventory" 708 <menu_item_call name="Set permissions on selected task inventory"
699 enabled="false" 709 enabled="false"
700 label="Set permissions on selected task inventory"> 710 label="Bulk Set Permissions">
701 <on_click function="Tools.SetBulkPerms" userdata="" /> 711 <on_click function="Tools.SetBulkPerms" userdata="" />
702 <on_enable function="EditableSelected" /> 712 <on_enable function="EditableSelected" />
703 </menu_item_call> 713 </menu_item_call>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
new file mode 100644
index 0000000..a74782c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
@@ -0,0 +1,53 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel background_opaque="false" background_visible="true" bg_alpha_color="NetMapBackgroundColor"
3 border="false" follows="left|top|right|bottom" height="216" label="Mini Map"
4 mouse_opaque="false" name="mini_mapview" width="196">
5 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
6 bottom="-40" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
7 halign="left" height="10" left="80" mouse_opaque="false" name="n_label"
8 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="10">
9 N
10 </text>
11 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
12 bottom="-80" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
13 halign="left" height="10" left="120" mouse_opaque="false" name="e_label"
14 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="10">
15 E
16 </text>
17 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
18 bottom="-120" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
19 halign="left" height="10" left="80" mouse_opaque="false" name="s_label"
20 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="10">
21 S
22 </text>
23 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
24 bottom="-80" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
25 halign="left" height="10" left="40" mouse_opaque="false" name="w_label"
26 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="11">
27 W
28 </text>
29 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
30 bottom="-60" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
31 halign="left" height="10" left="100" mouse_opaque="false" name="ne_label"
32 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="20">
33 NE
34 </text>
35 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
36 bottom="-100" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
37 halign="left" height="10" left="100" mouse_opaque="false" name="se_label"
38 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="20">
39 SE
40 </text>
41 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
42 bottom="-100" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
43 halign="left" height="10" left="60" mouse_opaque="false" name="sw_label"
44 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="21">
45 SW
46 </text>
47 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
48 bottom="-60" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
49 halign="left" height="1-" left="60" mouse_opaque="false" name="nw_label"
50 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="21">
51 NW
52 </text>
53</panel>
generated by cgit v1.1 at 2024-11-15 20:26:30 +0000