merge

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp
index 17d403bbe1..559a02bbd9 100755
--- a/indra/newview/llcommandlineparser.cpp
+++ b/indra/newview/llcommandlineparser.cpp
@@ -283,13 +283,13 @@ bool LLCommandLineParser::parseAndStoreResults(po::command_line_parser& clp)
     }
     catch(po::error& e)
     {
-        llwarns << "Caught Error:" << e.what() << llendl;
+        LL_WARNS() << "Caught Error:" << e.what() << LL_ENDL;
 		mErrorMsg = e.what();
         return false;
     }
     catch(LLCLPError& e)
     {
-        llwarns << "Caught Error:" << e.what() << llendl;
+        LL_WARNS() << "Caught Error:" << e.what() << LL_ENDL;
 		mErrorMsg = e.what();
         return false;
     }
@@ -329,7 +329,7 @@ bool LLCommandLineParser::parseAndStoreResults(po::command_line_parser& clp)
 			<< last_option << " "
 			<< last_value;
 
-        llwarns << msg.str() << llendl;
+        LL_WARNS() << msg.str() << LL_ENDL;
 		mErrorMsg = msg.str();
         return false;
     } 
@@ -401,7 +401,7 @@ void LLCommandLineParser::printOptions() const
         {
             oss << t_itr->c_str() << " ";
         }
-        llinfos << oss.str() << llendl;
+        LL_INFOS() << oss.str() << LL_ENDL;
     }
 }
 
@@ -446,7 +446,7 @@ void setControlValueCB(const LLCommandLineParser::token_vector_t& value,
         case TYPE_BOOLEAN:
             if(value.size() > 1)
             {
-                llwarns << "Ignoring extra tokens." << llendl; 
+                LL_WARNS() << "Ignoring extra tokens." << LL_ENDL; 
             }
               
             if(value.size() > 0)
@@ -485,7 +485,7 @@ void setControlValueCB(const LLCommandLineParser::token_vector_t& value,
                 {
 					if(value.size() > 1)
 					{
-						llwarns << "Ignoring extra tokens mapped to the setting: " << opt_name << "." << llendl; 
+						LL_WARNS() << "Ignoring extra tokens mapped to the setting: " << opt_name << "." << LL_ENDL; 
 					}
 
                     LLSD llsdValue;
@@ -498,10 +498,10 @@ void setControlValueCB(const LLCommandLineParser::token_vector_t& value,
     }
     else
     {
-        llwarns << "Command Line option mapping '" 
+        LL_WARNS() << "Command Line option mapping '" 
             << opt_name 
             << "' not found! Ignoring." 
-            << llendl;
+            << LL_ENDL;
     }
 }