From ad169d3f540c475cdabf34e5cd8219ba6caa8eb6 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 4 Sep 2009 23:55:15 +0000 Subject: DEV-39508 = Show Tools ("Build") menu by default * Also eliminated some unused settings --- indra/newview/app_settings/settings.xml | 99 ---- indra/newview/llagent.cpp | 22 - indra/newview/llappviewer.cpp | 6 - indra/newview/llfloatertools.cpp | 4 +- indra/newview/lltoolbar.cpp | 35 -- indra/newview/lltoolmgr.cpp | 1 - indra/newview/llviewerwindow.cpp | 2 +- indra/newview/skins/default/xui/en/menu_viewer.xml | 581 +++++++++++---------- 8 files changed, 320 insertions(+), 430 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2a08f62bb4..e88bc5a91f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -804,28 +804,6 @@ Value 1.0 - BuildBtnState - - Comment - - Persist - 0 - Type - Boolean - Value - 0 - - BuildBtnEnabled - - Comment - - Persist - 0 - Type - Boolean - Value - 0 - BuildFeathering Comment @@ -2784,17 +2762,6 @@ Value 0 - FirstPersonBtnState - - Comment - - Persist - 0 - Type - Boolean - Value - 0 - FirstRunThisInstall Comment @@ -2966,28 +2933,6 @@ 0 - FlyBtnEnabled - - Comment - - Persist - 0 - Type - Boolean - Value - 1 - - FlyBtnState - - Comment - - Persist - 0 - Type - Boolean - Value - 0 - FlycamAbsolute Comment @@ -4600,17 +4545,6 @@ Value 0 - MouselookBtnState - - Comment - - Persist - 0 - Type - Boolean - Value - 0 - MuteAmbient Comment @@ -6552,17 +6486,6 @@ Value 1.0 - RunBtnState - - Comment - - Persist - 0 - Type - Boolean - Value - 0 - RunMultipleThreads Comment @@ -7386,17 +7309,6 @@ Value 0 - SitBtnState - - Comment - - Persist - 0 - Type - Boolean - Value - 0 - SkinCurrent Comment @@ -7757,17 +7669,6 @@ Value 2 - ThirdPersonBtnState - - Comment - - Persist - 0 - Type - Boolean - Value - 1 - ThrottleBandwidthKBPS Comment diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 214065f080..e1747930b0 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -795,12 +795,10 @@ void LLAgent::setFlying(BOOL fly) LLViewerStats::getInstance()->incStat(LLViewerStats::ST_FLY_COUNT); } setControlFlags(AGENT_CONTROL_FLY); - gSavedSettings.setBOOL("FlyBtnState", TRUE); } else { clearControlFlags(AGENT_CONTROL_FLY); - gSavedSettings.setBOOL("FlyBtnState", FALSE); } @@ -3998,11 +3996,6 @@ void LLAgent::changeCameraToMouselook(BOOL animate) LLToolMgr::getInstance()->setCurrentToolset(gMouselookToolset); - gSavedSettings.setBOOL("FirstPersonBtnState", FALSE); - gSavedSettings.setBOOL("MouselookBtnState", TRUE); - gSavedSettings.setBOOL("ThirdPersonBtnState", FALSE); - gSavedSettings.setBOOL("BuildBtnState", FALSE); - if (mAvatarObject.notNull()) { mAvatarObject->stopMotion( ANIM_AGENT_BODY_NOISE ); @@ -4098,11 +4091,6 @@ void LLAgent::changeCameraToFollow(BOOL animate) mAvatarObject->startMotion( ANIM_AGENT_BREATHE_ROT ); } - gSavedSettings.setBOOL("FirstPersonBtnState", FALSE); - gSavedSettings.setBOOL("MouselookBtnState", FALSE); - gSavedSettings.setBOOL("ThirdPersonBtnState", TRUE); - gSavedSettings.setBOOL("BuildBtnState", FALSE); - // unpause avatar animation mPauseRequest = NULL; @@ -4149,11 +4137,6 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate) mAvatarObject->startMotion( ANIM_AGENT_BREATHE_ROT ); } - gSavedSettings.setBOOL("FirstPersonBtnState", FALSE); - gSavedSettings.setBOOL("MouselookBtnState", FALSE); - gSavedSettings.setBOOL("ThirdPersonBtnState", TRUE); - gSavedSettings.setBOOL("BuildBtnState", FALSE); - LLVector3 at_axis; // unpause avatar animation @@ -4231,11 +4214,6 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani LLToolMgr::getInstance()->setCurrentToolset(gFaceEditToolset); } - gSavedSettings.setBOOL("FirstPersonBtnState", FALSE); - gSavedSettings.setBOOL("MouselookBtnState", FALSE); - gSavedSettings.setBOOL("ThirdPersonBtnState", FALSE); - gSavedSettings.setBOOL("BuildBtnState", FALSE); - if (camera_animate) { startCameraAnimation(); diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 3d7465f2cb..800c555113 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2322,12 +2322,6 @@ void LLAppViewer::cleanupSavedSettings() { gSavedSettings.setBOOL("MouseSun", FALSE); - gSavedSettings.setBOOL("FlyBtnState", FALSE); - - gSavedSettings.setBOOL("FirstPersonBtnState", FALSE); - gSavedSettings.setBOOL("ThirdPersonBtnState", TRUE); - gSavedSettings.setBOOL("BuildBtnState", FALSE); - gSavedSettings.setBOOL("UseEnergy", TRUE); // force toggle to turn off, since sends message to simulator gSavedSettings.setBOOL("DebugWindowProc", gDebugWindowProc); diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index d05c9cb9a7..f334344279 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -725,7 +725,7 @@ void LLFloaterTools::onOpen(const LLSD& key) mTab->selectTabByName(panel); } - gMenuBarView->setItemVisible("BuildTools", TRUE); + //gMenuBarView->setItemVisible("BuildTools", TRUE); } void LLFloaterTools::onClose() @@ -755,7 +755,7 @@ void LLFloaterTools::onClose() // so manually reset tool to default (pie menu tool) LLToolMgr::getInstance()->getCurrentToolset()->selectFirstTool(); - gMenuBarView->setItemVisible("BuildTools", FALSE); + //gMenuBarView->setItemVisible("BuildTools", FALSE); } void click_popup_info(void*) diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp index 5478e0005a..acd6856061 100644 --- a/indra/newview/lltoolbar.cpp +++ b/indra/newview/lltoolbar.cpp @@ -250,41 +250,6 @@ void LLToolBar::refresh() BOOL mouselook = gAgent.cameraMouselook(); setVisible(show && !mouselook); - BOOL sitting = FALSE; - if (gAgent.getAvatarObject()) - { - sitting = gAgent.getAvatarObject()->isSitting(); - } - - if (!gAgent.canFly()) - { - gSavedSettings.setBOOL("FlyBtnEnabled", gAgent.getFlying() ? true : false); - gSavedSettings.setBOOL("FlyBtnState", false); - } - else - { - gSavedSettings.setBOOL("FlyBtnEnabled", sitting ? false : true); - } - - // Check to see if we're in build mode - bool build_enabled = LLToolMgr::getInstance()->canEdit(); - if (build_enabled) - { - gSavedSettings.setBOOL("BuildBtnEnabled", true); - bool build_mode = LLToolMgr::getInstance()->inEdit(); - // HACK: Not in mouselook and not just clicking on a scripted object - if (gAgent.cameraMouselook() || LLToolGrab::getInstance()->getHideBuildHighlight()) - { - build_mode = FALSE; - } - gSavedSettings.setBOOL("BuildBtnState", build_mode); - } - else - { - gSavedSettings.setBOOL("BuildBtnEnabled", false); - gSavedSettings.setBOOL("BuildBtnState", false); - } - if (isInVisibleChain()) { updateCommunicateList(); diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp index d52e0b4b80..ded83debad 100644 --- a/indra/newview/lltoolmgr.cpp +++ b/indra/newview/lltoolmgr.cpp @@ -317,7 +317,6 @@ bool LLToolMgr::inBuildMode() // cameraMouselook() actually starts returning true. Also, appearance edit // sets build mode to true, so let's exclude that. bool b=(inEdit() - && gSavedSettings.getBOOL("BuildBtnState") && !gAgent.cameraMouselook() && mCurrentToolset != gFaceEditToolset); diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 461f7fc1c7..607c5d9ae8 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2870,7 +2870,7 @@ void LLViewerWindow::updateLayout() { gFloaterTools->setVisible(FALSE); } - gMenuBarView->setItemVisible("BuildTools", gFloaterTools->getVisible()); + //gMenuBarView->setItemVisible("BuildTools", gFloaterTools->getVisible()); } // Always update console diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 3570ef147c..6bc12368b7 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -229,7 +229,7 @@ function="Floater.Toggle" parameter="communicate" /> - + + + + + + + + + + + + + + + parameter="mini_map" /> @@ -369,7 +407,7 @@ - - + + + name="Show Build Tools" + shortcut="control|B"> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + name="Report Abuse"> - + function="ShowFloater" + parameter="complaint reporter" /> - - - - - - - - - - - - - - - - - - - - - - - - + + + - + parameter="html_simple.http://www.secondlife.com" /> + parameter="font_test" /> + parameter="god_tools" /> -- cgit v1.2.3