diff options
| author | Richard Linden <none@none> | 2014-02-19 12:32:08 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-02-19 12:32:08 -0800 |
| commit | ef591d280eb3c5bae7da20540ad4cbb30858d0aa (patch) | |
| tree | ff387e884e25eaa8a47adff4110ce02edfe67387 /indra/newview/llfloatertools.cpp | |
| parent | ce7e19d33a74e89059c2196da9c439d0eb9b21c1 (diff) | |
| parent | 6661628d5c68855ddffc54a3f2578f93ada84de1 (diff) | |
Merge with release
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rwxr-xr-x | indra/newview/llfloatertools.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 7b25291da7..afbd7ba5e2 100755 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -266,7 +266,7 @@ BOOL LLFloaterTools::postBuild() found->setClickedCallback(boost::bind(&LLFloaterTools::setObjectType, toolData[t])); mButtons.push_back( found ); }else{ - llwarns << "Tool button not found! DOA Pending." << llendl; + LL_WARNS() << "Tool button not found! DOA Pending." << LL_ENDL; } } mCheckCopySelection = getChild<LLCheckBoxCtrl>("checkbox copy selection"); @@ -500,7 +500,7 @@ void LLFloaterTools::refresh() } else { - llwarns << "Failed to get selected object" << llendl; + LL_WARNS() << "Failed to get selected object" << LL_ENDL; } } @@ -1095,7 +1095,7 @@ void LLFloaterTools::setTool(const LLSD& user_data) else if (control_name == "Land" ) LLToolMgr::getInstance()->getCurrentToolset()->selectTool( (LLTool *) LLToolSelectLand::getInstance()); else - llwarns<<" no parameter name "<<control_name<<" found!! No Tool selected!!"<< llendl; + LL_WARNS()<<" no parameter name "<<control_name<<" found!! No Tool selected!!"<< LL_ENDL; } void LLFloaterTools::onFocusReceived() |