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, 9 insertions, 16 deletions

diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 7f6386b..1911e4e 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -80,7 +80,7 @@
 #include "llselectmgr.h"
 #include "lluictrlfactory.h"
 #include "llviewernetwork.h"
-#include "viewerversion.h"
+#include "viewerinfo.h"
 
 #include "llassetuploadresponders.h"
 
@@ -742,13 +742,11 @@ LLSD LLFloaterReporter::gatherReport()
 
         if ( mReportType == BUG_REPORT)
         {
-                summary << short_platform << " V" << ViewerVersion::getLLMajorVersion() << "."
-                        << ViewerVersion::getLLMinorVersion() << "."
-                        << ViewerVersion::getLLPatchVersion() << "."
-                        << ViewerVersion::getLLBuildVersion()
-                        << " (" << regionp->getName() << ")"
-                        << "[" << category_name << "] "
-                        << "\"" << childGetValue("summary_edit").asString() << "\"";
+                summary << short_platform << " "
+                        << ViewerInfo::terseInfo()
+                        << " (" << regionp->getName() << ")"
+                        << "["  << category_name << "] "
+                        << "\"" << childGetValue("summary_edit").asString() << "\"";
         }
         else
         {
@@ -763,10 +761,7 @@ LLSD LLFloaterReporter::gatherReport()
         std::ostringstream details;
         if (mReportType != BUG_REPORT)
         {
-                details << "V" << ViewerVersion::getLLMajorVersion() << "."                                                             // client version moved to body of email for abuse reports
-                        << ViewerVersion::getLLMinorVersion() << "."
-                        << ViewerVersion::getLLPatchVersion() << "."
-                        << ViewerVersion::getLLBuildVersion() << std::endl << std::endl;
+                details << ViewerInfo::terseInfo() << std::endl << std::endl;
         }
         std::string object_name = childGetText("object_name");
         std::string owner_name = childGetText("owner_name");
@@ -786,10 +781,8 @@ LLSD LLFloaterReporter::gatherReport()
 
         std::string version_string;
         version_string = llformat(
-                        "%d.%d.%d %s %s %s %s",
-                        ViewerVersion::getLLMajorVersion(),
-                        ViewerVersion::getLLMinorVersion(),
-                        ViewerVersion::getLLPatchVersion(),
+                        "%s %s %s %s %s",
+                        ViewerInfo::terseInfo().c_str(),
                         platform,
                         gSysCPU.getFamily().c_str(),
                         gGLManager.mGLRenderer.c_str(),