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.

1 files changed, 4 insertions, 4 deletions

diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 08ae537..d4eaf33 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -138,16 +138,16 @@ if [ -n "$LL_RUN_ERR" ]; then
         fi
 fi
 
-LOGS_PATH="${HOME}/.imprudence/logs"
+LOGS_PATH="${HOME}/.meta-impy/logs"
 if [ -f "${LOGS_PATH}/stack_trace.log" ]; then
         LOG_PACKAGE_NAME="MAIL-THIS-CRASHLOG-PLEASE.$(date +%y%m%d%H%M).tar.bz2"
         cp "${LOGS_PATH}/stack_trace.log" stack_trace.log
-        cp "${LOGS_PATH}/Imprudence.log" Imprudence.log
+        cp "${LOGS_PATH}/meta-impy.log" meta-impy.log
         tar --numeric-owner -cjf  ${LOG_PACKAGE_NAME} \
                                 stack_trace.log \
-                                Imprudence.log
+                                meta-impy.log
         rm stack_trace.log
-        rm Imprudence.log
+        rm meta-impy.log
         echo "You find a crash log package to mail to Imprudence here:"
         echo "${RUN_PATH}/${LOG_PACKAGE_NAME}"
         echo "See where to send: http://wiki.kokuaviewer.org/wiki/Imprudence:Debug_Logs#Where_to_Send_Them"