Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev

1 files changed, 4 insertions, 3 deletions

diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp
index 030d24bed8..bc61fac00b 100644
--- a/indra/newview/llcommandlineparser.cpp
+++ b/indra/newview/llcommandlineparser.cpp
@@ -657,11 +657,12 @@ void LLControlGroupCLP::configure(const std::string& config_filename, LLControlG
     // This method reads the llsd based config file, and uses it to set 
     // members of a control group.
     LLSD clpConfigLLSD;
+    
+    llifstream input_stream;
+    input_stream.open(config_filename.c_str(), std::ios::in | std::ios::binary);
 
-    std::string xml = gDirUtilp->getFileContents(config_filename);
-    if (!xml.empty())
+    if(input_stream.is_open())
     {
-        std::stringstream input_stream(xml);
         LLSDSerialize::fromXML(clpConfigLLSD, input_stream);
         for(LLSD::map_iterator option_itr = clpConfigLLSD.beginMap(); 
             option_itr != clpConfigLLSD.endMap();