Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a bit of debug output for viewer tool states.

Browse Source
This commit is contained in:
Shyotl
2011-10-31 20:36:47 -05:00
parent 6964cec6f1
commit 0ef5931212
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/lltoolcomp.cpp
View File

@@ -77,6 +77,8 @@ void LLToolComposite::setCurrentTool( LLTool* new_tool )
{ {
if( mCur != new_tool ) if( mCur != new_tool )
{ {
if(new_tool)
lldebugs << "Current Tool: " << new_tool->getName() << llendl;
if( mSelected ) if( mSelected )
{ {
mCur->handleDeselect(); mCur->handleDeselect();

13
indra/newview/lltoolmgr.cpp
View File

@@ -80,11 +80,11 @@ LLToolMgr::LLToolMgr()
gToolNull = new LLTool(LLStringUtil::null); // Does nothing gToolNull = new LLTool(LLStringUtil::null); // Does nothing
setCurrentTool(gToolNull); setCurrentTool(gToolNull);
gBasicToolset = new LLToolset(); gBasicToolset = new LLToolset("Basic");
gCameraToolset = new LLToolset(); gCameraToolset = new LLToolset("Camera");
// gLandToolset = new LLToolset(); // gLandToolset = new LLToolset("Land");
gMouselookToolset = new LLToolset(); gMouselookToolset = new LLToolset("MouseLook");
gFaceEditToolset = new LLToolset(); gFaceEditToolset = new LLToolset("FaceEdit");
} }
void LLToolMgr::initTools() void LLToolMgr::initTools()
@@ -149,6 +149,7 @@ void LLToolMgr::setCurrentToolset(LLToolset* current)
{ {
mSelectedTool->handleDeselect(); mSelectedTool->handleDeselect();
} }
lldebugs << "Current tool set: " << current->getName() << llendl;
mCurrentToolset = current; mCurrentToolset = current;
// select first tool of new toolset only if toolset changed // select first tool of new toolset only if toolset changed
mCurrentToolset->selectFirstTool(); mCurrentToolset->selectFirstTool();
@@ -164,6 +165,8 @@ LLToolset* LLToolMgr::getCurrentToolset()
void LLToolMgr::setCurrentTool( LLTool* tool ) void LLToolMgr::setCurrentTool( LLTool* tool )
{ {
if(tool && mBaseTool!=tool)
lldebugs << "Current Tool: " << tool->getName() << llendl;
if (mTransientTool) if (mTransientTool)
{ {
mTransientTool = NULL; mTransientTool = NULL;

4
indra/newview/lltoolmgr.h
View File

@@ -93,7 +93,7 @@ protected:
class LLToolset class LLToolset
{ {
public: public:
LLToolset() : mSelectedTool(NULL) {} LLToolset(const char *name) : mSelectedTool(NULL), mName(name) {}
LLTool* getSelectedTool() { return mSelectedTool; } LLTool* getSelectedTool() { return mSelectedTool; }
@@ -109,7 +109,9 @@ public:
BOOL isToolSelected( S32 index ); BOOL isToolSelected( S32 index );
const char* getName() const {return mName;}
protected: protected:
const char* mName;
LLTool* mSelectedTool; LLTool* mSelectedTool;
typedef std::vector<LLTool*> tool_list_t; typedef std::vector<LLTool*> tool_list_t;
tool_list_t mToolList; tool_list_t mToolList;