Merge branch 'next' of git://github.com/jacek/imprudence into next

Conflicts (manually merged):
	linden/indra/llcommon/llversionviewer.h
	linden/indra/llvfs/lldir.cpp
	linden/indra/llvfs/lldir_mac.cpp
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/Info-meta-impy.plist
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/packaging/mac/Info.plist.in
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerversion.cpp
	linden/indra/newview/viewerversion.h
	linden/install.xml

Also some post merge tweaks.

2 files changed, 2 insertions, 2 deletions

diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index 8bd68f4..4f108b9 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -249,7 +249,7 @@ std::string LLDir::buildSLOSCacheDir() const
         }
         else
         {
-                res = getOSCacheDir() + mDirDelimiter + "meta-impyExperimental";
+                res = getOSCacheDir() + mDirDelimiter + "meta-impy";
         }
         return res;
 }
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index 7fb235b..cb5c748 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -173,7 +173,7 @@ LLDir_Mac::LLDir_Mac()
                 if (error == noErr)
                 {
                         FSRefToLLString(&cacheDirRef, mOSCacheDir);
-                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("meta-impyExperimental"),NULL);
+                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("meta-impy"),NULL);
                 }
                 
                 // mOSUserAppDir