secondlife-standalone-maint-svn/llxml_use_locale_c2.patch

   1 diff -Naur o/indra/llxml/llxmlnode.cpp p/indra/llxml/llxmlnode.cpp
   2 --- o/indra/llxml/llxmlnode.cpp 2009-08-17 23:34:39.000000000 +0200
   3 +++ p/indra/llxml/llxmlnode.cpp 2009-08-19 19:39:03.000000000 +0200
   4 @@ -667,6 +667,7 @@
   5  {
   6         // Read file
   7         LL_DEBUGS("XMLNode") << "parsing XML file: " << filename << LL_ENDL;
   8 +        std::string saved_locale = setlocale(LC_ALL,"C");
   9         LLFILE* fp = LLFile::fopen(filename, "rb");             /* Flawfinder: ignore */
  10         if (fp == NULL)
  11         {
  12 @@ -684,6 +685,7 @@
  13
  14         bool rv = parseBuffer(buffer, nread, node, defaults_tree);
  15         delete [] buffer;
  16 +        setlocale(LC_ALL, saved_locale.c_str() );
  17         return rv;
  18  }
  19
  20 diff -Naur o/indra/llxml/llxmlparser.cpp p/indra/llxml/llxmlparser.cpp
  21 --- o/indra/llxml/llxmlparser.cpp       2009-08-17 23:34:39.000000000 +0200
  22 +++ p/indra/llxml/llxmlparser.cpp       2009-08-19 19:40:01.000000000 +0200
  23 @@ -78,6 +78,7 @@
  24
  25         BOOL success = TRUE;
  26
  27 +        std::string saved_locale = setlocale(LC_ALL,"C");
  28         LLFILE* file = LLFile::fopen(path, "rb");               /* Flawfinder: ignore */
  29         if( !file )
  30         {
  31 @@ -129,7 +130,7 @@
  32         {
  33                 llwarns << mAuxErrorString << llendl;
  34         }
  35 -
  36 +        setlocale(LC_ALL, saved_locale.c_str() );
  37         return success;
  38  }
  39