merge with release

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index 78a555d67d..efad4e6aef 100755
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -197,7 +197,7 @@ bool LLToolBarView::addCommandInternal(const LLCommandId& command, LLToolBar* to
 	}
 	else 
 	{
-		llwarns	<< "Toolbars creation : the command with id " << command.uuid().asString() << " cannot be found in the command manager" << llendl;
+		LL_WARNS()	<< "Toolbars creation : the command with id " << command.uuid().asString() << " cannot be found in the command manager" << LL_ENDL;
 		return false;
 	}
 	return true;
@@ -216,20 +216,20 @@ bool LLToolBarView::loadToolbars(bool force_default)
 	}
 	else if (!gDirUtilp->fileExists(toolbar_file)) 
 	{
-		llwarns << "User toolbars def not found -> use default" << llendl;
+		LL_WARNS() << "User toolbars def not found -> use default" << LL_ENDL;
 		toolbar_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "toolbars.xml");
 	}
 	
 	LLXMLNodePtr root;
 	if(!LLXMLNode::parseFile(toolbar_file, root, NULL))
 	{
-		llwarns << "Unable to load toolbars from file: " << toolbar_file << llendl;
+		LL_WARNS() << "Unable to load toolbars from file: " << toolbar_file << LL_ENDL;
 		err = true;
 	}
 	
 	if (!err && !root->hasName("toolbars"))
 	{
-		llwarns << toolbar_file << " is not a valid toolbars definition file" << llendl;
+		LL_WARNS() << toolbar_file << " is not a valid toolbars definition file" << LL_ENDL;
 		err = true;
 	}
 	
@@ -242,7 +242,7 @@ bool LLToolBarView::loadToolbars(bool force_default)
 
 	if (!err && !toolbar_set.validateBlock())
 	{
-		llwarns << "Unable to validate toolbars from file: " << toolbar_file << llendl;
+		LL_WARNS() << "Unable to validate toolbars from file: " << toolbar_file << LL_ENDL;
 		err = true;
 	}
 	
@@ -250,7 +250,7 @@ bool LLToolBarView::loadToolbars(bool force_default)
 	{
 		if (force_default)
 		{
-			llerrs << "Unable to load toolbars from default file : " << toolbar_file << llendl;
+			LL_ERRS() << "Unable to load toolbars from default file : " << toolbar_file << LL_ENDL;
 		    return false;
 	    }
 
@@ -279,7 +279,7 @@ bool LLToolBarView::loadToolbars(bool force_default)
 		{
 			if (addCommandInternal(LLCommandId(command_params), mToolbars[TOOLBAR_LEFT]))
 			{
-				llwarns << "Error adding command '" << command_params.name() << "' to left toolbar." << llendl;
+				LL_WARNS() << "Error adding command '" << command_params.name() << "' to left toolbar." << LL_ENDL;
 			}
 		}
 	}
@@ -294,7 +294,7 @@ bool LLToolBarView::loadToolbars(bool force_default)
 		{
 			if (addCommandInternal(LLCommandId(command_params), mToolbars[TOOLBAR_RIGHT]))
 			{
-				llwarns << "Error adding command '" << command_params.name() << "' to right toolbar." << llendl;
+				LL_WARNS() << "Error adding command '" << command_params.name() << "' to right toolbar." << LL_ENDL;
 			}
 		}
 	}
@@ -309,7 +309,7 @@ bool LLToolBarView::loadToolbars(bool force_default)
 		{
 			if (addCommandInternal(LLCommandId(command_params), mToolbars[TOOLBAR_BOTTOM]))
 			{
-				llwarns << "Error adding command '" << command_params.name() << "' to bottom toolbar." << llendl;
+				LL_WARNS() << "Error adding command '" << command_params.name() << "' to bottom toolbar." << LL_ENDL;
 			}
 		}
 	}
@@ -517,7 +517,7 @@ void LLToolBarView::draw()
 	{
 		if (mToolbars[i])
 		{
-			LLLayoutStack::ELayoutOrientation orientation = LLToolBarEnums::getOrientation(mToolbars[i]->getSideType());
+			LLView::EOrientation orientation = LLToolBarEnums::getOrientation(mToolbars[i]->getSideType());
 
 			if (orientation == LLLayoutStack::HORIZONTAL)
 			{
@@ -647,7 +647,7 @@ BOOL LLToolBarView::handleDropTool( void* cargo_data, S32 x, S32 y, LLToolBar* t
 		}
 		else
 		{
-			llwarns << "Command couldn't be found in command manager" << llendl;
+			LL_WARNS() << "Command couldn't be found in command manager" << LL_ENDL;
 		}
 	}