aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewermenu.cpp381
1 files changed, 196 insertions, 185 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 1ff995e..4119573 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1428,6 +1428,8 @@ void init_server_menu(LLMenuGL* menu)
1428 menu->createJumpKeys(); 1428 menu->createJumpKeys();
1429} 1429}
1430 1430
1431static std::vector<LLPointer<view_listener_t> > sMenus;
1432
1431//----------------------------------------------------------------------------- 1433//-----------------------------------------------------------------------------
1432// cleanup_menus() 1434// cleanup_menus()
1433//----------------------------------------------------------------------------- 1435//-----------------------------------------------------------------------------
@@ -1435,6 +1437,32 @@ void cleanup_menus()
1435{ 1437{
1436 delete gMenuParcelObserver; 1438 delete gMenuParcelObserver;
1437 gMenuParcelObserver = NULL; 1439 gMenuParcelObserver = NULL;
1440
1441 delete gPieSelf;
1442 gPieSelf = NULL;
1443
1444 delete gPieAvatar;
1445 gPieAvatar = NULL;
1446
1447 delete gPieObject;
1448 gPieObject = NULL;
1449
1450 delete gPieAttachment;
1451 gPieAttachment = NULL;
1452
1453 delete gPieLand;
1454 gPieLand = NULL;
1455
1456 delete gMenuBarView;
1457 gMenuBarView = NULL;
1458
1459 delete gPopupMenuView;
1460 gPopupMenuView = NULL;
1461
1462 delete gMenuHolder;
1463 gMenuHolder = NULL;
1464
1465 sMenus.clear();
1438} 1466}
1439 1467
1440//----------------------------------------------------------------------------- 1468//-----------------------------------------------------------------------------
@@ -3002,24 +3030,6 @@ class LLHelpMOTD : public view_listener_t
3002 } 3030 }
3003}; 3031};
3004 3032
3005class LLHelpLiveHelp : public view_listener_t
3006{
3007 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
3008 {
3009 // the session_id of a 911 session will always be this agent's session id
3010 static LLUUID session_id(LLUUID::null);
3011 if (session_id.isNull())
3012 {
3013 session_id.generate();
3014 }
3015 gIMView->setFloaterOpen(TRUE);
3016 LLDynamicArray<LLUUID> members;
3017 members.put(gAgent.getID());
3018 gIMView->addSession("Help Request", IM_SESSION_911_START, session_id, members); //xui: translate
3019 return true;
3020 }
3021};
3022
3023// 3033//
3024// Major mode switching 3034// Major mode switching
3025// 3035//
@@ -4530,11 +4540,7 @@ class LLToolsStopAllAnimations : public view_listener_t
4530 4540
4531 if (!avatarp) return true; 4541 if (!avatarp) return true;
4532 4542
4533 LLVOAvatar::AnimSourceIterator anim_it = avatarp->mAnimationSources.begin(); 4543 avatarp->deactivateAllMotions();
4534 for (;anim_it != avatarp->mAnimationSources.end(); ++anim_it)
4535 {
4536 avatarp->stopMotion( anim_it->second, TRUE );
4537 }
4538 4544
4539 avatarp->processAnimationStateChanges(); 4545 avatarp->processAnimationStateChanges();
4540 return true; 4546 return true;
@@ -7525,199 +7531,204 @@ class LLToolsSelectTool : public view_listener_t
7525 } 7531 }
7526}; 7532};
7527 7533
7534static void addMenu(view_listener_t *menu, const char *name)
7535{
7536 sMenus.push_back(menu);
7537 menu->registerListener(gMenuHolder, name);
7538}
7539
7528void initialize_menus() 7540void initialize_menus()
7529{ 7541{
7530 // File menu 7542 // File menu
7531 init_menu_file(); 7543 init_menu_file();
7532 7544
7533 // Edit menu 7545 // Edit menu
7534 (new LLEditUndo())->registerListener(gMenuHolder, "Edit.Undo"); 7546 addMenu(new LLEditUndo(), "Edit.Undo");
7535 (new LLEditRedo())->registerListener(gMenuHolder, "Edit.Redo"); 7547 addMenu(new LLEditRedo(), "Edit.Redo");
7536 (new LLEditCut())->registerListener(gMenuHolder, "Edit.Cut"); 7548 addMenu(new LLEditCut(), "Edit.Cut");
7537 (new LLEditCopy())->registerListener(gMenuHolder, "Edit.Copy"); 7549 addMenu(new LLEditCopy(), "Edit.Copy");
7538 (new LLEditPaste())->registerListener(gMenuHolder, "Edit.Paste"); 7550 addMenu(new LLEditPaste(), "Edit.Paste");
7539 (new LLEditDelete())->registerListener(gMenuHolder, "Edit.Delete"); 7551 addMenu(new LLEditDelete(), "Edit.Delete");
7540 (new LLEditSearch())->registerListener(gMenuHolder, "Edit.Search"); 7552 addMenu(new LLEditSearch(), "Edit.Search");
7541 (new LLEditSelectAll())->registerListener(gMenuHolder, "Edit.SelectAll"); 7553 addMenu(new LLEditSelectAll(), "Edit.SelectAll");
7542 (new LLEditDeselect())->registerListener(gMenuHolder, "Edit.Deselect"); 7554 addMenu(new LLEditDeselect(), "Edit.Deselect");
7543 (new LLEditDuplicate())->registerListener(gMenuHolder, "Edit.Duplicate"); 7555 addMenu(new LLEditDuplicate(), "Edit.Duplicate");
7544 (new LLEditTakeOff())->registerListener(gMenuHolder, "Edit.TakeOff"); 7556 addMenu(new LLEditTakeOff(), "Edit.TakeOff");
7545 7557
7546 (new LLEditEnableUndo())->registerListener(gMenuHolder, "Edit.EnableUndo"); 7558 addMenu(new LLEditEnableUndo(), "Edit.EnableUndo");
7547 (new LLEditEnableRedo())->registerListener(gMenuHolder, "Edit.EnableRedo"); 7559 addMenu(new LLEditEnableRedo(), "Edit.EnableRedo");
7548 (new LLEditEnableCut())->registerListener(gMenuHolder, "Edit.EnableCut"); 7560 addMenu(new LLEditEnableCut(), "Edit.EnableCut");
7549 (new LLEditEnableCopy())->registerListener(gMenuHolder, "Edit.EnableCopy"); 7561 addMenu(new LLEditEnableCopy(), "Edit.EnableCopy");
7550 (new LLEditEnablePaste())->registerListener(gMenuHolder, "Edit.EnablePaste"); 7562 addMenu(new LLEditEnablePaste(), "Edit.EnablePaste");
7551 (new LLEditEnableDelete())->registerListener(gMenuHolder, "Edit.EnableDelete"); 7563 addMenu(new LLEditEnableDelete(), "Edit.EnableDelete");
7552 (new LLEditEnableSelectAll())->registerListener(gMenuHolder, "Edit.EnableSelectAll"); 7564 addMenu(new LLEditEnableSelectAll(), "Edit.EnableSelectAll");
7553 (new LLEditEnableDeselect())->registerListener(gMenuHolder, "Edit.EnableDeselect"); 7565 addMenu(new LLEditEnableDeselect(), "Edit.EnableDeselect");
7554 (new LLEditEnableDuplicate())->registerListener(gMenuHolder, "Edit.EnableDuplicate"); 7566 addMenu(new LLEditEnableDuplicate(), "Edit.EnableDuplicate");
7555 (new LLEditEnableTakeOff())->registerListener(gMenuHolder, "Edit.EnableTakeOff"); 7567 addMenu(new LLEditEnableTakeOff(), "Edit.EnableTakeOff");
7556 (new LLEditEnableCustomizeAvatar())->registerListener(gMenuHolder, "Edit.EnableCustomizeAvatar"); 7568 addMenu(new LLEditEnableCustomizeAvatar(), "Edit.EnableCustomizeAvatar");
7557 7569
7558 // View menu 7570 // View menu
7559 (new LLViewMouselook())->registerListener(gMenuHolder, "View.Mouselook"); 7571 addMenu(new LLViewMouselook(), "View.Mouselook");
7560 (new LLViewBuildMode())->registerListener(gMenuHolder, "View.BuildMode"); 7572 addMenu(new LLViewBuildMode(), "View.BuildMode");
7561 (new LLViewResetView())->registerListener(gMenuHolder, "View.ResetView"); 7573 addMenu(new LLViewResetView(), "View.ResetView");
7562 (new LLViewLookAtLastChatter())->registerListener(gMenuHolder, "View.LookAtLastChatter"); 7574 addMenu(new LLViewLookAtLastChatter(), "View.LookAtLastChatter");
7563 (new LLViewShowHoverTips())->registerListener(gMenuHolder, "View.ShowHoverTips"); 7575 addMenu(new LLViewShowHoverTips(), "View.ShowHoverTips");
7564 (new LLViewHighlightTransparent())->registerListener(gMenuHolder, "View.HighlightTransparent"); 7576 addMenu(new LLViewHighlightTransparent(), "View.HighlightTransparent");
7565 (new LLViewToggleBeacon())->registerListener(gMenuHolder, "View.ToggleBeacon"); 7577 addMenu(new LLViewToggleBeacon(), "View.ToggleBeacon");
7566 (new LLViewToggleRenderType())->registerListener(gMenuHolder, "View.ToggleRenderType"); 7578 addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType");
7567 (new LLViewShowHUDAttachments())->registerListener(gMenuHolder, "View.ShowHUDAttachments"); 7579 addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments");
7568 (new LLViewZoomOut())->registerListener(gMenuHolder, "View.ZoomOut"); 7580 addMenu(new LLViewZoomOut(), "View.ZoomOut");
7569 (new LLViewZoomIn())->registerListener(gMenuHolder, "View.ZoomIn"); 7581 addMenu(new LLViewZoomIn(), "View.ZoomIn");
7570 (new LLViewZoomDefault())->registerListener(gMenuHolder, "View.ZoomDefault"); 7582 addMenu(new LLViewZoomDefault(), "View.ZoomDefault");
7571 (new LLViewFullscreen())->registerListener(gMenuHolder, "View.Fullscreen"); 7583 addMenu(new LLViewFullscreen(), "View.Fullscreen");
7572 (new LLViewDefaultUISize())->registerListener(gMenuHolder, "View.DefaultUISize"); 7584 addMenu(new LLViewDefaultUISize(), "View.DefaultUISize");
7573 7585
7574 (new LLViewEnableMouselook())->registerListener(gMenuHolder, "View.EnableMouselook"); 7586 addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
7575 (new LLViewEnableLastChatter())->registerListener(gMenuHolder, "View.EnableLastChatter"); 7587 addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
7576 7588
7577 (new LLViewCheckBuildMode())->registerListener(gMenuHolder, "View.CheckBuildMode"); 7589 addMenu(new LLViewCheckBuildMode(), "View.CheckBuildMode");
7578 (new LLViewCheckShowHoverTips())->registerListener(gMenuHolder, "View.CheckShowHoverTips"); 7590 addMenu(new LLViewCheckShowHoverTips(), "View.CheckShowHoverTips");
7579 (new LLViewCheckHighlightTransparent())->registerListener(gMenuHolder, "View.CheckHighlightTransparent"); 7591 addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
7580 (new LLViewCheckBeaconEnabled())->registerListener(gMenuHolder, "View.CheckBeaconEnabled"); 7592 addMenu(new LLViewCheckBeaconEnabled(), "View.CheckBeaconEnabled");
7581 (new LLViewCheckRenderType())->registerListener(gMenuHolder, "View.CheckRenderType"); 7593 addMenu(new LLViewCheckRenderType(), "View.CheckRenderType");
7582 (new LLViewCheckHUDAttachments())->registerListener(gMenuHolder, "View.CheckHUDAttachments"); 7594 addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
7583 7595
7584 // World menu 7596 // World menu
7585 (new LLWorldChat())->registerListener(gMenuHolder, "World.Chat"); 7597 addMenu(new LLWorldChat(), "World.Chat");
7586 (new LLWorldStartGesture())->registerListener(gMenuHolder, "World.StartGesture"); 7598 addMenu(new LLWorldStartGesture(), "World.StartGesture");
7587 (new LLWorldAlwaysRun())->registerListener(gMenuHolder, "World.AlwaysRun"); 7599 addMenu(new LLWorldAlwaysRun(), "World.AlwaysRun");
7588 (new LLWorldFly())->registerListener(gMenuHolder, "World.Fly"); 7600 addMenu(new LLWorldFly(), "World.Fly");
7589 (new LLWorldCreateLandmark())->registerListener(gMenuHolder, "World.CreateLandmark"); 7601 addMenu(new LLWorldCreateLandmark(), "World.CreateLandmark");
7590 (new LLWorldSetHomeLocation())->registerListener(gMenuHolder, "World.SetHomeLocation"); 7602 addMenu(new LLWorldSetHomeLocation(), "World.SetHomeLocation");
7591 (new LLWorldTeleportHome())->registerListener(gMenuHolder, "World.TeleportHome"); 7603 addMenu(new LLWorldTeleportHome(), "World.TeleportHome");
7592 (new LLWorldSetAway())->registerListener(gMenuHolder, "World.SetAway"); 7604 addMenu(new LLWorldSetAway(), "World.SetAway");
7593 (new LLWorldSetBusy())->registerListener(gMenuHolder, "World.SetBusy"); 7605 addMenu(new LLWorldSetBusy(), "World.SetBusy");
7594 7606
7595 (new LLWorldEnableCreateLandmark())->registerListener(gMenuHolder, "World.EnableCreateLandmark"); 7607 addMenu(new LLWorldEnableCreateLandmark(), "World.EnableCreateLandmark");
7596 (new LLWorldEnableSetHomeLocation())->registerListener(gMenuHolder, "World.EnableSetHomeLocation"); 7608 addMenu(new LLWorldEnableSetHomeLocation(), "World.EnableSetHomeLocation");
7597 (new LLWorldEnableTeleportHome())->registerListener(gMenuHolder, "World.EnableTeleportHome"); 7609 addMenu(new LLWorldEnableTeleportHome(), "World.EnableTeleportHome");
7598 (new LLWorldEnableBuyLand())->registerListener(gMenuHolder, "World.EnableBuyLand"); 7610 addMenu(new LLWorldEnableBuyLand(), "World.EnableBuyLand");
7599 7611
7600 (new LLWorldCheckAlwaysRun())->registerListener(gMenuHolder, "World.CheckAlwaysRun"); 7612 addMenu(new LLWorldCheckAlwaysRun(), "World.CheckAlwaysRun");
7601 7613
7602 (new LLWorldForceSun())->registerListener(gMenuHolder, "World.ForceSun"); 7614 addMenu(new LLWorldForceSun(), "World.ForceSun");
7603 7615
7604 // Tools menu 7616 // Tools menu
7605 (new LLToolsSelectTool())->registerListener(gMenuHolder, "Tools.SelectTool"); 7617 addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
7606 (new LLToolsSelectOnlyMyObjects())->registerListener(gMenuHolder, "Tools.SelectOnlyMyObjects"); 7618 addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects");
7607 (new LLToolsSelectOnlyMovableObjects())->registerListener(gMenuHolder, "Tools.SelectOnlyMovableObjects"); 7619 addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects");
7608 (new LLToolsSelectBySurrounding())->registerListener(gMenuHolder, "Tools.SelectBySurrounding"); 7620 addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding");
7609 (new LLToolsShowHiddenSelection())->registerListener(gMenuHolder, "Tools.ShowHiddenSelection"); 7621 addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection");
7610 (new LLToolsShowSelectionLightRadius())->registerListener(gMenuHolder, "Tools.ShowSelectionLightRadius"); 7622 addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius");
7611 (new LLToolsSnapObjectXY())->registerListener(gMenuHolder, "Tools.SnapObjectXY"); 7623 addMenu(new LLToolsSnapObjectXY(), "Tools.SnapObjectXY");
7612 (new LLToolsUseSelectionForGrid())->registerListener(gMenuHolder, "Tools.UseSelectionForGrid"); 7624 addMenu(new LLToolsUseSelectionForGrid(), "Tools.UseSelectionForGrid");
7613 (new LLToolsLink())->registerListener(gMenuHolder, "Tools.Link"); 7625 addMenu(new LLToolsLink(), "Tools.Link");
7614 (new LLToolsUnlink())->registerListener(gMenuHolder, "Tools.Unlink"); 7626 addMenu(new LLToolsUnlink(), "Tools.Unlink");
7615 (new LLToolsStopAllAnimations())->registerListener(gMenuHolder, "Tools.StopAllAnimations"); 7627 addMenu(new LLToolsStopAllAnimations(), "Tools.StopAllAnimations");
7616 (new LLToolsLookAtSelection())->registerListener(gMenuHolder, "Tools.LookAtSelection"); 7628 addMenu(new LLToolsLookAtSelection(), "Tools.LookAtSelection");
7617 (new LLToolsBuyOrTake())->registerListener(gMenuHolder, "Tools.BuyOrTake"); 7629 addMenu(new LLToolsBuyOrTake(), "Tools.BuyOrTake");
7618 (new LLToolsTakeCopy())->registerListener(gMenuHolder, "Tools.TakeCopy"); 7630 addMenu(new LLToolsTakeCopy(), "Tools.TakeCopy");
7619 (new LLToolsSaveToInventory())->registerListener(gMenuHolder, "Tools.SaveToInventory"); 7631 addMenu(new LLToolsSaveToInventory(), "Tools.SaveToInventory");
7620 (new LLToolsSaveToObjectInventory())->registerListener(gMenuHolder, "Tools.SaveToObjectInventory"); 7632 addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory");
7621 (new LLToolsSelectedScriptAction())->registerListener(gMenuHolder, "Tools.SelectedScriptAction"); 7633 addMenu(new LLToolsSelectedScriptAction(), "Tools.SelectedScriptAction");
7622 7634
7623 (new LLToolsEnableToolNotPie())->registerListener(gMenuHolder, "Tools.EnableToolNotPie"); 7635 addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie");
7624 (new LLToolsEnableLink())->registerListener(gMenuHolder, "Tools.EnableLink"); 7636 addMenu(new LLToolsEnableLink(), "Tools.EnableLink");
7625 (new LLToolsEnableUnlink())->registerListener(gMenuHolder, "Tools.EnableUnlink"); 7637 addMenu(new LLToolsEnableUnlink(), "Tools.EnableUnlink");
7626 (new LLToolsEnableBuyOrTake())->registerListener(gMenuHolder, "Tools.EnableBuyOrTake"); 7638 addMenu(new LLToolsEnableBuyOrTake(), "Tools.EnableBuyOrTake");
7627 (new LLToolsEnableTakeCopy())->registerListener(gMenuHolder, "Tools.EnableTakeCopy"); 7639 addMenu(new LLToolsEnableTakeCopy(), "Tools.EnableTakeCopy");
7628 (new LLToolsEnableSaveToInventory())->registerListener(gMenuHolder, "Tools.SaveToInventory"); 7640 addMenu(new LLToolsEnableSaveToInventory(), "Tools.SaveToInventory");
7629 (new LLToolsEnableSaveToObjectInventory())->registerListener(gMenuHolder, "Tools.SaveToObjectInventory"); 7641 addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.SaveToObjectInventory");
7630 7642
7631 /*(new LLToolsVisibleBuyObject())->registerListener(gMenuHolder, "Tools.VisibleBuyObject"); 7643 /*addMenu(new LLToolsVisibleBuyObject(), "Tools.VisibleBuyObject");
7632 (new LLToolsVisibleTakeObject())->registerListener(gMenuHolder, "Tools.VisibleTakeObject");*/ 7644 addMenu(new LLToolsVisibleTakeObject(), "Tools.VisibleTakeObject");*/
7633 7645
7634 // Help menu 7646 // Help menu
7635 (new LLHelpLiveHelp())->registerListener(gMenuHolder, "Help.LiveHelp"); 7647 addMenu(new LLHelpMOTD(), "Help.MOTD");
7636 (new LLHelpMOTD())->registerListener(gMenuHolder, "Help.MOTD");
7637 7648
7638 // Self pie menu 7649 // Self pie menu
7639 (new LLSelfStandUp())->registerListener(gMenuHolder, "Self.StandUp"); 7650 addMenu(new LLSelfStandUp(), "Self.StandUp");
7640 (new LLSelfRemoveAllAttachments())->registerListener(gMenuHolder, "Self.RemoveAllAttachments"); 7651 addMenu(new LLSelfRemoveAllAttachments(), "Self.RemoveAllAttachments");
7641 7652
7642 (new LLSelfEnableStandUp())->registerListener(gMenuHolder, "Self.EnableStandUp"); 7653 addMenu(new LLSelfEnableStandUp(), "Self.EnableStandUp");
7643 (new LLSelfEnableRemoveAllAttachments())->registerListener(gMenuHolder, "Self.EnableRemoveAllAttachments"); 7654 addMenu(new LLSelfEnableRemoveAllAttachments(), "Self.EnableRemoveAllAttachments");
7644 7655
7645 // Avatar pie menu 7656 // Avatar pie menu
7646 (new LLObjectMute())->registerListener(gMenuHolder, "Avatar.Mute"); 7657 addMenu(new LLObjectMute(), "Avatar.Mute");
7647 (new LLAvatarAddFriend())->registerListener(gMenuHolder, "Avatar.AddFriend"); 7658 addMenu(new LLAvatarAddFriend(), "Avatar.AddFriend");
7648 (new LLAvatarFreeze())->registerListener(gMenuHolder, "Avatar.Freeze"); 7659 addMenu(new LLAvatarFreeze(), "Avatar.Freeze");
7649 (new LLAvatarDebug())->registerListener(gMenuHolder, "Avatar.Debug"); 7660 addMenu(new LLAvatarDebug(), "Avatar.Debug");
7650 (new LLAvatarVisibleDebug())->registerListener(gMenuHolder, "Avatar.VisibleDebug"); 7661 addMenu(new LLAvatarVisibleDebug(), "Avatar.VisibleDebug");
7651 (new LLAvatarEnableDebug())->registerListener(gMenuHolder, "Avatar.EnableDebug"); 7662 addMenu(new LLAvatarEnableDebug(), "Avatar.EnableDebug");
7652 (new LLAvatarGiveCard())->registerListener(gMenuHolder, "Avatar.GiveCard"); 7663 addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard");
7653 (new LLAvatarEject())->registerListener(gMenuHolder, "Avatar.Eject"); 7664 addMenu(new LLAvatarEject(), "Avatar.Eject");
7654 (new LLAvatarSendIM())->registerListener(gMenuHolder, "Avatar.SendIM"); 7665 addMenu(new LLAvatarSendIM(), "Avatar.SendIM");
7655 7666
7656 (new LLObjectEnableMute())->registerListener(gMenuHolder, "Avatar.EnableMute"); 7667 addMenu(new LLObjectEnableMute(), "Avatar.EnableMute");
7657 (new LLAvatarEnableAddFriend())->registerListener(gMenuHolder, "Avatar.EnableAddFriend"); 7668 addMenu(new LLAvatarEnableAddFriend(), "Avatar.EnableAddFriend");
7658 (new LLAvatarEnableFreezeEject())->registerListener(gMenuHolder, "Avatar.EnableFreezeEject"); 7669 addMenu(new LLAvatarEnableFreezeEject(), "Avatar.EnableFreezeEject");
7659 7670
7660 // Object pie menu 7671 // Object pie menu
7661 (new LLObjectOpen())->registerListener(gMenuHolder, "Object.Open"); 7672 addMenu(new LLObjectOpen(), "Object.Open");
7662 (new LLObjectBuild())->registerListener(gMenuHolder, "Object.Build"); 7673 addMenu(new LLObjectBuild(), "Object.Build");
7663 (new LLObjectTouch())->registerListener(gMenuHolder, "Object.Touch"); 7674 addMenu(new LLObjectTouch(), "Object.Touch");
7664 (new LLObjectSitOrStand())->registerListener(gMenuHolder, "Object.SitOrStand"); 7675 addMenu(new LLObjectSitOrStand(), "Object.SitOrStand");
7665 (new LLObjectDelete())->registerListener(gMenuHolder, "Object.Delete"); 7676 addMenu(new LLObjectDelete(), "Object.Delete");
7666 (new LLObjectAttachToAvatar())->registerListener(gMenuHolder, "Object.AttachToAvatar"); 7677 addMenu(new LLObjectAttachToAvatar(), "Object.AttachToAvatar");
7667 (new LLObjectReturn())->registerListener(gMenuHolder, "Object.Return"); 7678 addMenu(new LLObjectReturn(), "Object.Return");
7668 (new LLObjectReportAbuse())->registerListener(gMenuHolder, "Object.ReportAbuse"); 7679 addMenu(new LLObjectReportAbuse(), "Object.ReportAbuse");
7669 (new LLObjectMute())->registerListener(gMenuHolder, "Object.Mute"); 7680 addMenu(new LLObjectMute(), "Object.Mute");
7670 (new LLObjectBuy())->registerListener(gMenuHolder, "Object.Buy"); 7681 addMenu(new LLObjectBuy(), "Object.Buy");
7671 (new LLObjectEdit())->registerListener(gMenuHolder, "Object.Edit"); 7682 addMenu(new LLObjectEdit(), "Object.Edit");
7672 (new LLObjectInspect())->registerListener(gMenuHolder, "Object.Inspect"); 7683 addMenu(new LLObjectInspect(), "Object.Inspect");
7673 7684
7674 (new LLObjectEnableOpen())->registerListener(gMenuHolder, "Object.EnableOpen"); 7685 addMenu(new LLObjectEnableOpen(), "Object.EnableOpen");
7675 (new LLObjectEnableTouch())->registerListener(gMenuHolder, "Object.EnableTouch"); 7686 addMenu(new LLObjectEnableTouch(), "Object.EnableTouch");
7676 (new LLObjectEnableSitOrStand())->registerListener(gMenuHolder, "Object.EnableSitOrStand"); 7687 addMenu(new LLObjectEnableSitOrStand(), "Object.EnableSitOrStand");
7677 (new LLObjectEnableDelete())->registerListener(gMenuHolder, "Object.EnableDelete"); 7688 addMenu(new LLObjectEnableDelete(), "Object.EnableDelete");
7678 (new LLObjectEnableWear())->registerListener(gMenuHolder, "Object.EnableWear"); 7689 addMenu(new LLObjectEnableWear(), "Object.EnableWear");
7679 (new LLObjectEnableReturn())->registerListener(gMenuHolder, "Object.EnableReturn"); 7690 addMenu(new LLObjectEnableReturn(), "Object.EnableReturn");
7680 (new LLObjectEnableReportAbuse())->registerListener(gMenuHolder, "Object.EnableReportAbuse"); 7691 addMenu(new LLObjectEnableReportAbuse(), "Object.EnableReportAbuse");
7681 (new LLObjectEnableMute())->registerListener(gMenuHolder, "Object.EnableMute"); 7692 addMenu(new LLObjectEnableMute(), "Object.EnableMute");
7682 (new LLObjectEnableBuy())->registerListener(gMenuHolder, "Object.EnableBuy"); 7693 addMenu(new LLObjectEnableBuy(), "Object.EnableBuy");
7683 7694
7684 /*(new LLObjectVisibleTouch())->registerListener(gMenuHolder, "Object.VisibleTouch"); 7695 /*addMenu(new LLObjectVisibleTouch(), "Object.VisibleTouch");
7685 (new LLObjectVisibleCustomTouch())->registerListener(gMenuHolder, "Object.VisibleCustomTouch"); 7696 addMenu(new LLObjectVisibleCustomTouch(), "Object.VisibleCustomTouch");
7686 (new LLObjectVisibleStandUp())->registerListener(gMenuHolder, "Object.VisibleStandUp"); 7697 addMenu(new LLObjectVisibleStandUp(), "Object.VisibleStandUp");
7687 (new LLObjectVisibleSitHere())->registerListener(gMenuHolder, "Object.VisibleSitHere"); 7698 addMenu(new LLObjectVisibleSitHere(), "Object.VisibleSitHere");
7688 (new LLObjectVisibleCustomSit())->registerListener(gMenuHolder, "Object.VisibleCustomSit");*/ 7699 addMenu(new LLObjectVisibleCustomSit(), "Object.VisibleCustomSit");*/
7689 7700
7690 // Attachment pie menu 7701 // Attachment pie menu
7691 (new LLAttachmentDrop())->registerListener(gMenuHolder, "Attachment.Drop"); 7702 addMenu(new LLAttachmentDrop(), "Attachment.Drop");
7692 (new LLAttachmentDetach())->registerListener(gMenuHolder, "Attachment.Detach"); 7703 addMenu(new LLAttachmentDetach(), "Attachment.Detach");
7693 7704
7694 (new LLAttachmentEnableDrop())->registerListener(gMenuHolder, "Attachment.EnableDrop"); 7705 addMenu(new LLAttachmentEnableDrop(), "Attachment.EnableDrop");
7695 (new LLAttachmentEnableDetach())->registerListener(gMenuHolder, "Attachment.EnableDetach"); 7706 addMenu(new LLAttachmentEnableDetach(), "Attachment.EnableDetach");
7696 7707
7697 // Land pie menu 7708 // Land pie menu
7698 (new LLLandBuild())->registerListener(gMenuHolder, "Land.Build"); 7709 addMenu(new LLLandBuild(), "Land.Build");
7699 (new LLLandSit())->registerListener(gMenuHolder, "Land.Sit"); 7710 addMenu(new LLLandSit(), "Land.Sit");
7700 (new LLLandBuyPass())->registerListener(gMenuHolder, "Land.BuyPass"); 7711 addMenu(new LLLandBuyPass(), "Land.BuyPass");
7701 (new LLLandEdit())->registerListener(gMenuHolder, "Land.Edit"); 7712 addMenu(new LLLandEdit(), "Land.Edit");
7702 7713
7703 (new LLLandEnableBuyPass())->registerListener(gMenuHolder, "Land.EnableBuyPass"); 7714 addMenu(new LLLandEnableBuyPass(), "Land.EnableBuyPass");
7704 7715
7705 // Generic actions 7716 // Generic actions
7706 (new LLShowFloater())->registerListener(gMenuHolder, "ShowFloater"); 7717 addMenu(new LLShowFloater(), "ShowFloater");
7707 (new LLPromptShowURL())->registerListener(gMenuHolder, "PromptShowURL"); 7718 addMenu(new LLPromptShowURL(), "PromptShowURL");
7708 (new LLPromptShowFile())->registerListener(gMenuHolder, "PromptShowFile"); 7719 addMenu(new LLPromptShowFile(), "PromptShowFile");
7709 (new LLShowAgentProfile())->registerListener(gMenuHolder, "ShowAgentProfile"); 7720 addMenu(new LLShowAgentProfile(), "ShowAgentProfile");
7710 (new LLShowAgentGroups())->registerListener(gMenuHolder, "ShowAgentGroups"); 7721 addMenu(new LLShowAgentGroups(), "ShowAgentGroups");
7711 (new LLToggleControl())->registerListener(gMenuHolder, "ToggleControl"); 7722 addMenu(new LLToggleControl(), "ToggleControl");
7712 7723
7713 (new LLGoToObject())->registerListener(gMenuHolder, "GoToObject"); 7724 addMenu(new LLGoToObject(), "GoToObject");
7714 (new LLPayObject())->registerListener(gMenuHolder, "PayObject"); 7725 addMenu(new LLPayObject(), "PayObject");
7715 7726
7716 (new LLEnablePayObject())->registerListener(gMenuHolder, "EnablePayObject"); 7727 addMenu(new LLEnablePayObject(), "EnablePayObject");
7717 (new LLEnableEdit())->registerListener(gMenuHolder, "EnableEdit"); 7728 addMenu(new LLEnableEdit(), "EnableEdit");
7718 7729
7719 (new LLFloaterVisible())->registerListener(gMenuHolder, "FloaterVisible"); 7730 addMenu(new LLFloaterVisible(), "FloaterVisible");
7720 (new LLSomethingSelected())->registerListener(gMenuHolder, "SomethingSelected"); 7731 addMenu(new LLSomethingSelected(), "SomethingSelected");
7721 (new LLSomethingSelectedNoHUD())->registerListener(gMenuHolder, "SomethingSelectedNoHUD"); 7732 addMenu(new LLSomethingSelectedNoHUD(), "SomethingSelectedNoHUD");
7722 (new LLEditableSelected())->registerListener(gMenuHolder, "EditableSelected"); 7733 addMenu(new LLEditableSelected(), "EditableSelected");
7723} 7734}