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

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lltoolmgr.cpp
View File

@@ -157,7 +157,7 @@ void LLToolMgr::setCurrentToolset(LLToolset* current)
{
mSelectedTool->handleDeselect();
}
lldebugs << "Current tool set: " << current->getName() << llendl;
LL_DEBUGS() << "Current tool set: " << current->getName() << LL_ENDL;
mCurrentToolset = current;
// select first tool of new toolset only if toolset changed
mCurrentToolset->selectFirstTool();
@@ -174,7 +174,7 @@ LLToolset* LLToolMgr::getCurrentToolset()
void LLToolMgr::setCurrentTool( LLTool* tool )
{
if(tool && mBaseTool!=tool)
lldebugs << "Current Tool: " << tool->getName() << llendl;
LL_DEBUGS() << "Current Tool: " << tool->getName() << LL_ENDL;
if (mTransientTool)
{
mTransientTool = NULL;
@@ -383,7 +383,7 @@ void LLToolMgr::clearTransientTool()
mTransientTool = NULL;
if (!mBaseTool)
{
llwarns << "mBaseTool is NULL" << llendl;
LL_WARNS() << "mBaseTool is NULL" << LL_ENDL;
}
}
updateToolStatus();