1 files changed, 7 insertions, 6 deletions

diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index a83b7cf..0485a1e 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -30,6 +30,7 @@
 
 #include "stdtypes.h"
 #include "llerror.h"
+#include "llfile.h"
 #include <algorithm>
 #include <map>
 #include <stdio.h>
@@ -101,7 +102,7 @@ struct char_traits<U16>
         
         static char_type* 
                 copy(char_type* __s1, const char_type* __s2, size_t __n)
-        {  return static_cast<char_type*>(memcpy(__s1, __s2, __n * sizeof(char_type))); }
+        {  return static_cast<char_type*>(memcpy(__s1, __s2, __n * sizeof(char_type))); }       /* Flawfinder: ignore */
         
         static char_type* 
                 assign(char_type* __s, size_t __n, char_type __a)
@@ -922,7 +923,7 @@ void LLStringBase<T>::replaceNonstandardASCII( std::basic_string<T>& string, T r
 
 //static
 template<class T> 
-void LLStringBase<T>::replaceTabsWithSpaces( std::basic_string<T>& string, size_type spaces_per_tab )
+void LLStringBase<T>::replaceTabsWithSpaces( std::basic_string<T>& str, size_type spaces_per_tab )
 {
         llassert( spaces_per_tab >= 0 );
 
@@ -931,19 +932,19 @@ void LLStringBase<T>::replaceTabsWithSpaces( std::basic_string<T>& string, size_
 
         LLStringBase<T> out_str;
         // Replace tabs with spaces
-        for (size_type i = 0; i < string.length(); i++)
+        for (size_type i = 0; i < str.length(); i++)
         {
-                if (string[i] == TAB)
+                if (str[i] == TAB)
                 {
                         for (size_type j = 0; j < spaces_per_tab; j++)
                                 out_str += SPACE;
                 }
                 else
                 {
-                        out_str += string[i];
+                        out_str += str[i];
                 }
         }
-        string = out_str;
+        str = out_str;
 }
 
 //static