Merge post fixes so that Linux compiles.

Windows is being a pig, will take a while.

7 files changed, 43 insertions, 41 deletions

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index f4fa1cc..100f719 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -632,9 +632,9 @@ class WindowsSetup(PlatformSetup):
         if self.generator == 'nmake':
            # Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds.
            self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make')
-           self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make')
+           self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/newview/CMakeFiles/meta-impy-bin.dir/flags.make')
            self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make')
-           self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make')
+           self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/newview/CMakeFiles/meta-impy-bin.dir/flags.make')
            # Evil hack.
            self.run(r'touch newview/touched.bat')
            return 'nmake'
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index 95aa7b5..fe0ab2a 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -596,6 +596,40 @@ std::string utf8str_removeCRLF(const std::string& utf8str)
         return out;
 }
 
+bool is_hex_string(U8* str, S32 len)
+{
+        bool rv = true;
+        U8* c = str;
+        while(rv && len--)
+        {
+                switch(*c)
+                {
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                case 'a':
+                case 'b':
+                case 'c':
+                case 'd':
+                case 'e':
+                case 'f':
+                        ++c;
+                        break;
+                default:
+                        rv = false;
+                        break;
+                }
+        }
+        return rv;
+}
+
 bool LLStringOps::isHexString(const std::string& str)
 {
         const char* buf = str.c_str();
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index ced9713..e1b5cbd 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -458,6 +458,8 @@ LL_COMMON_API std::string mbcsstring_makeASCII(const std::string& str);
 
 LL_COMMON_API std::string utf8str_removeCRLF(const std::string& utf8str);
 
+LL_COMMON_API bool is_hex_string(U8* str, S32 len);
+
 
 #if LL_WINDOWS
 /* @name Windows string helpers
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 12fde5c..d232ea8 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -268,7 +268,6 @@ bool LLStartUp::sLoginFailed = false;
 
 void login_show();
 void login_callback(S32 option, void* userdata);
-bool is_hex_string(U8* str, S32 len);
 void show_first_run_dialog();
 bool first_run_dialog_callback(const LLSD& notification, const LLSD& response);
 void set_startup_status(const F32 frac, const std::string& string, const std::string& msg);
@@ -3270,39 +3269,6 @@ void LLStartUp::deletePasswordFromDisk()
         LLFile::remove(filepath);
 }
 
-bool is_hex_string(U8* str, S32 len)
-{
-        bool rv = true;
-        U8* c = str;
-        while(rv && len--)
-        {
-                switch(*c)
-                {
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                case 'a':
-                case 'b':
-                case 'c':
-                case 'd':
-                case 'e':
-                case 'f':
-                        ++c;
-                        break;
-                default:
-                        rv = false;
-                        break;
-                }
-        }
-        return rv;
-}
 
 void show_first_run_dialog()
 {
diff --git a/linden/indra/newview/llviewergenericmessage.cpp b/linden/indra/newview/llviewergenericmessage.cpp
index 36c61ab..e4b325d 100644
--- a/linden/indra/newview/llviewergenericmessage.cpp
+++ b/linden/indra/newview/llviewergenericmessage.cpp
@@ -93,7 +93,7 @@ void process_generic_message(LLMessageSystem* msg, void**)
         }
         else if(method == "WindlightReset")
         {       
-                WindlightMessage::resetRegion();
+                LightShare::resetRegion();
                 return;
         }
 
diff --git a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
index e0014d3..5b4a12e 100644
--- a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleName = "Imprudence";
-CFBundleShortVersionString = "Imprudence 1.4.0.3 exp 1";
-CFBundleGetInfoString = "Imprudence 1.4.0.3 exp 1";
+CFBundleName = "meta-impy";
+CFBundleShortVersionString = "meta-impy 1.4.0.3 exp 1";
+CFBundleGetInfoString = "meta-impy 1.4.0.3 exp 1";
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
index 7974d85..c00a86d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
@@ -7,7 +7,7 @@
      font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
      mouse_opaque="true" name="cache_label" v_pad="0" width="185">
 Cache Will Be Cleared After
-You Restart Imprudence
+You Restart meta-impy
   </text>
   <check_box bottom_delta="-37" follows="left|top" font="SansSerifSmall" height="20"
      initial_value="false" label="Clear texture cache" left="10"