LLPanelDebug isn't doing anything, it goes poof.
This commit is contained in:
Lirusaito
@@ -334,7 +334,6 @@ set(viewer_SOURCE_FILES
|
|||||||
llpanelavatar.cpp
|
llpanelavatar.cpp
|
||||||
llpanelclassified.cpp
|
llpanelclassified.cpp
|
||||||
llpanelcontents.cpp
|
llpanelcontents.cpp
|
||||||
llpaneldebug.cpp
|
|
||||||
llpaneldirbrowser.cpp
|
llpaneldirbrowser.cpp
|
||||||
llpaneldirclassified.cpp
|
llpaneldirclassified.cpp
|
||||||
llpaneldirevents.cpp
|
llpaneldirevents.cpp
|
||||||
@@ -832,7 +831,6 @@ set(viewer_HEADER_FILES
|
|||||||
llpanelavatar.h
|
llpanelavatar.h
|
||||||
llpanelclassified.h
|
llpanelclassified.h
|
||||||
llpanelcontents.h
|
llpanelcontents.h
|
||||||
llpaneldebug.h
|
|
||||||
llpaneldirbrowser.h
|
llpaneldirbrowser.h
|
||||||
llpaneldirclassified.h
|
llpaneldirclassified.h
|
||||||
llpaneldirevents.h
|
llpaneldirevents.h
|
||||||
|
|||||||
@@ -54,7 +54,6 @@
|
|||||||
#include "llpanelnetwork.h"
|
#include "llpanelnetwork.h"
|
||||||
#include "llpanelaudioprefs.h"
|
#include "llpanelaudioprefs.h"
|
||||||
#include "llpaneldisplay.h"
|
#include "llpaneldisplay.h"
|
||||||
#include "llpaneldebug.h"
|
|
||||||
#include "llpanelgeneral.h"
|
#include "llpanelgeneral.h"
|
||||||
#include "llpanelinput.h"
|
#include "llpanelinput.h"
|
||||||
#include "llpanellogin.h"
|
#include "llpanellogin.h"
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ class LLPanelGeneral;
|
|||||||
class LLPanelInput;
|
class LLPanelInput;
|
||||||
class LLPanelDisplay;
|
class LLPanelDisplay;
|
||||||
class LLPanelAudioPrefs;
|
class LLPanelAudioPrefs;
|
||||||
class LLPanelDebug;
|
|
||||||
class LLPanelNetwork;
|
class LLPanelNetwork;
|
||||||
class LLPanelWeb;
|
class LLPanelWeb;
|
||||||
class LLMessageSystem;
|
class LLMessageSystem;
|
||||||
@@ -90,7 +89,6 @@ private:
|
|||||||
LLPanelNetwork *mNetworkPanel;
|
LLPanelNetwork *mNetworkPanel;
|
||||||
LLPanelDisplay *mDisplayPanel;
|
LLPanelDisplay *mDisplayPanel;
|
||||||
LLPanelAudioPrefs *mAudioPanel;
|
LLPanelAudioPrefs *mAudioPanel;
|
||||||
// LLPanelDebug *mDebugPanel;
|
|
||||||
LLPrefsChat *mPrefsChat;
|
LLPrefsChat *mPrefsChat;
|
||||||
LLPrefsVoice *mPrefsVoice;
|
LLPrefsVoice *mPrefsVoice;
|
||||||
LLPrefsIM *mPrefsIM;
|
LLPrefsIM *mPrefsIM;
|
||||||
|
|||||||
@@ -1,160 +0,0 @@
|
|||||||
/**
|
|
||||||
* @file llpaneldebug.cpp
|
|
||||||
* @brief Debug preferences panel for preferences floater
|
|
||||||
*
|
|
||||||
* $LicenseInfo:firstyear=2001&license=viewergpl$
|
|
||||||
*
|
|
||||||
* Copyright (c) 2001-2009, Linden Research, Inc.
|
|
||||||
*
|
|
||||||
* Second Life Viewer Source Code
|
|
||||||
* The source code in this file ("Source Code") is provided by Linden Lab
|
|
||||||
* to you under the terms of the GNU General Public License, version 2.0
|
|
||||||
* ("GPL"), unless you have obtained a separate licensing agreement
|
|
||||||
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
|
||||||
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
|
||||||
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
|
|
||||||
*
|
|
||||||
* There are special exceptions to the terms and conditions of the GPL as
|
|
||||||
* it is applied to this Source Code. View the full text of the exception
|
|
||||||
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
|
||||||
* online at
|
|
||||||
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
|
|
||||||
*
|
|
||||||
* By copying, modifying or distributing this software, you acknowledge
|
|
||||||
* that you have read and understood your obligations described above,
|
|
||||||
* and agree to abide by those obligations.
|
|
||||||
*
|
|
||||||
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
|
||||||
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
|
||||||
* COMPLETENESS OR PERFORMANCE.
|
|
||||||
* $/LicenseInfo$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "llviewerprecompiledheaders.h"
|
|
||||||
|
|
||||||
// file include
|
|
||||||
#include "llpaneldebug.h"
|
|
||||||
|
|
||||||
// linden library includes
|
|
||||||
#include "llerror.h"
|
|
||||||
#include "llrect.h"
|
|
||||||
#include "llstring.h"
|
|
||||||
#include "llfontgl.h"
|
|
||||||
|
|
||||||
// project includes
|
|
||||||
#include "llaudioengine.h"
|
|
||||||
#include "llbutton.h"
|
|
||||||
#include "llcheckboxctrl.h"
|
|
||||||
#include "llcolorswatch.h"
|
|
||||||
#include "llcombobox.h"
|
|
||||||
#include "llresmgr.h"
|
|
||||||
#include "llsky.h"
|
|
||||||
#include "llslider.h"
|
|
||||||
#include "llsliderctrl.h"
|
|
||||||
#include "llspinctrl.h"
|
|
||||||
#include "lltextbox.h"
|
|
||||||
#include "llui.h"
|
|
||||||
#include "llvosky.h"
|
|
||||||
#include "message.h"
|
|
||||||
#include "llagent.h"
|
|
||||||
#include "llviewercontrol.h"
|
|
||||||
|
|
||||||
//
|
|
||||||
// Imported globals
|
|
||||||
//
|
|
||||||
|
|
||||||
|
|
||||||
//
|
|
||||||
// Globals
|
|
||||||
//
|
|
||||||
|
|
||||||
//
|
|
||||||
// Static functions
|
|
||||||
//
|
|
||||||
|
|
||||||
LLPanelDebug::LLPanelDebug(const std::string& name, const LLRect& rect)
|
|
||||||
: LLPanel(name, rect)
|
|
||||||
{
|
|
||||||
LLCheckboxCtrl* check = NULL;
|
|
||||||
LLSliderCtrl *sliderctrl = NULL;
|
|
||||||
|
|
||||||
const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
|
|
||||||
|
|
||||||
const S32 HPAD = 10;
|
|
||||||
const S32 VPAD = 4;
|
|
||||||
|
|
||||||
const S32 TOP_PAD = 10;
|
|
||||||
|
|
||||||
// alignment "rulers" for buttons
|
|
||||||
const S32 SEGMENT_WIDTH = 128;
|
|
||||||
const S32 LEFT = HPAD;
|
|
||||||
const S32 RULER1 = LEFT + SEGMENT_WIDTH + 30;
|
|
||||||
const S32 RULER2 = RULER1 + HPAD;
|
|
||||||
const S32 RIGHT = RULER2 + SEGMENT_WIDTH;
|
|
||||||
const S32 LABEL_OFFSET = 60;
|
|
||||||
|
|
||||||
S32 cur_y = rect.getHeight() - TOP_PAD;
|
|
||||||
|
|
||||||
sliderctrl = new LLSliderCtrl(std::string("Drop Shadow Floater"),
|
|
||||||
LLRect( LEFT, cur_y, RIGHT, cur_y - SLIDERCTRL_HEIGHT ),
|
|
||||||
std::string("Drop Shadow Floater"),
|
|
||||||
font,
|
|
||||||
LABEL_OFFSET,
|
|
||||||
RULER2 + SPINCTRL_DEFAULT_LABEL_WIDTH + SPINCTRL_BTN_WIDTH,
|
|
||||||
TRUE,
|
|
||||||
TRUE,
|
|
||||||
FALSE,
|
|
||||||
NULL,
|
|
||||||
(F32)gSavedSettings.getS32("DropShadowFloater"),
|
|
||||||
0.f, 10.f, 1.0f,
|
|
||||||
std::string("DropShadowFloater"));
|
|
||||||
sliderctrl->setFollowsTop();
|
|
||||||
sliderctrl->setFollowsLeft();
|
|
||||||
addChild(sliderctrl);
|
|
||||||
cur_y -= VPAD + SLIDERCTRL_HEIGHT;
|
|
||||||
|
|
||||||
sliderctrl = new LLSliderCtrl(std::string("Drop Shadow Button"),
|
|
||||||
LLRect( LEFT, cur_y, RIGHT, cur_y - SLIDERCTRL_HEIGHT ),
|
|
||||||
std::string("Drop Shadow Button"),
|
|
||||||
font,
|
|
||||||
LABEL_OFFSET,
|
|
||||||
RULER2 + SPINCTRL_DEFAULT_LABEL_WIDTH + SPINCTRL_BTN_WIDTH,
|
|
||||||
TRUE,
|
|
||||||
TRUE,
|
|
||||||
FALSE,
|
|
||||||
NULL,
|
|
||||||
(F32)gSavedSettings.getS32("DropShadowButton"),
|
|
||||||
0.f, 10.f, 1.0f,
|
|
||||||
std::string("DropShadowButton"));
|
|
||||||
sliderctrl->setFollowsTop();
|
|
||||||
sliderctrl->setFollowsLeft();
|
|
||||||
addChild(sliderctrl);
|
|
||||||
cur_y -= VPAD + SLIDERCTRL_HEIGHT;
|
|
||||||
|
|
||||||
check = new LLCheckboxCtrl(std::string("left click"),
|
|
||||||
LLRect(LEFT, cur_y, RIGHT, cur_y - 20),
|
|
||||||
std::string("Left Click Shows Menu Unless Interactive"),
|
|
||||||
font,
|
|
||||||
NULL,
|
|
||||||
gSavedSettings.getBOOL("LeftClickShowMenu"));
|
|
||||||
check->setFollows(FOLLOWS_LEFT|FOLLOWS_TOP);
|
|
||||||
addChild(check);
|
|
||||||
mLeftClickCheck = check;
|
|
||||||
cur_y -= VPAD+20;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
LLPanelDebug::~LLPanelDebug()
|
|
||||||
{
|
|
||||||
// Children all cleaned up by default view destructor.
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void LLPanelDebug::apply()
|
|
||||||
{
|
|
||||||
gSavedSettings.setBOOL("LeftClickShowMenu", mLeftClickCheck->get() );
|
|
||||||
}
|
|
||||||
|
|
||||||
void LLPanelDebug::cancel()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
/**
|
|
||||||
* @file llpaneldebug.h
|
|
||||||
* @brief Debug preferences panel for preferences floater
|
|
||||||
*
|
|
||||||
* $LicenseInfo:firstyear=2001&license=viewergpl$
|
|
||||||
*
|
|
||||||
* Copyright (c) 2001-2009, Linden Research, Inc.
|
|
||||||
*
|
|
||||||
* Second Life Viewer Source Code
|
|
||||||
* The source code in this file ("Source Code") is provided by Linden Lab
|
|
||||||
* to you under the terms of the GNU General Public License, version 2.0
|
|
||||||
* ("GPL"), unless you have obtained a separate licensing agreement
|
|
||||||
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
|
||||||
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
|
||||||
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
|
|
||||||
*
|
|
||||||
* There are special exceptions to the terms and conditions of the GPL as
|
|
||||||
* it is applied to this Source Code. View the full text of the exception
|
|
||||||
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
|
||||||
* online at
|
|
||||||
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
|
|
||||||
*
|
|
||||||
* By copying, modifying or distributing this software, you acknowledge
|
|
||||||
* that you have read and understood your obligations described above,
|
|
||||||
* and agree to abide by those obligations.
|
|
||||||
*
|
|
||||||
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
|
||||||
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
|
||||||
* COMPLETENESS OR PERFORMANCE.
|
|
||||||
* $/LicenseInfo$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef LL_LLPANELDEBUG_H
|
|
||||||
#define LL_LLPANELDEBUG_H
|
|
||||||
|
|
||||||
#include "llpanel.h"
|
|
||||||
|
|
||||||
class LLCheckBoxCtrl;
|
|
||||||
|
|
||||||
class LLPanelDebug : public LLPanel
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
LLPanelDebug(const std::string& name, const LLRect& rect);
|
|
||||||
virtual ~LLPanelDebug();
|
|
||||||
|
|
||||||
void apply(); // Apply the changed values.
|
|
||||||
void cancel(); // Cancel the changed values.
|
|
||||||
|
|
||||||
protected:
|
|
||||||
LLCheckBoxCtrl* mLeftClickCheck;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // LL_LLPANELDEBUG_H
|
|
||||||
Reference in New Issue
Block a user