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, 25 insertions, 32 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 09b4eda..a026391 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -154,7 +154,7 @@
 #include "llflexibleobject.h" 
 #include "llvosurfacepatch.h"
 #include "llslider.h"
-#include "viewerversion.h"
+#include "viewerinfo.h"
 
 // includes for idle() idleShutdown()
 #include "floaterao.h"
@@ -602,7 +602,7 @@ bool LLAppViewer::init()
         
         // Need to do this initialization before we do anything else, since anything
         // that touches files should really go through the lldir API
-        gDirUtilp->initAppDirs(ViewerVersion::getImpViewerName());
+        gDirUtilp->initAppDirs(ViewerInfo::viewerName());
         // set skin search path to default, will be overridden later
         // this allows simple skinned file lookups to work
         gDirUtilp->setSkinFolder("default");
@@ -624,15 +624,8 @@ bool LLAppViewer::init()
     writeSystemInfo();
 
 
-        // Build a string representing the current version number.
-        gCurrentVersion = llformat(
-                "%s %d.%d.%d.%d",
-                gSavedSettings.getString("VersionChannelName").c_str(),
-                ViewerVersion::getImpMajorVersion(), 
-                ViewerVersion::getImpMinorVersion(), 
-                ViewerVersion::getImpPatchVersion(),
-                0 // our 'build number'
-    );
+        // String representing the current version name/number.
+        gCurrentVersion = ViewerInfo::terseInfo();
 
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////
@@ -1800,9 +1793,6 @@ std::string LLAppViewer::getSettingsFilename(const std::string& location_key,
 
 bool LLAppViewer::initConfiguration()
 {       
-        // init Imprudence version - MC
-        ViewerVersion::initViewerVersion();
-
         //Set up internal pointers      
         gSettings[sGlobalSettingsName] = &gSavedSettings;
         gSettings[sPerAccountSettingsName] = &gSavedPerAccountSettings;
@@ -1848,9 +1838,9 @@ bool LLAppViewer::initConfiguration()
         // - set procedural settings 
         gSavedSettings.setString("ClientSettingsFile", 
         // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));
-        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_meta-impy_experimental.xml"));
+        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_meta-impy.xml"));
 
-        gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName());
+        gSavedSettings.setString("VersionChannelName", ViewerInfo::nameWithVariant());
 
         //*FIX:Mani - Set default to disabling watchdog mainloop 
         // timeout for mac and linux. There is no call stack info 
@@ -2096,7 +2086,7 @@ bool LLAppViewer::initConfiguration()
     mYieldTime = gSavedSettings.getS32("YieldTime");
              
         // XUI:translate
-        gSecondLife = ViewerVersion::getImpViewerName();
+        gSecondLife = ViewerInfo::viewerName();
 
         // Read skin/branding settings if specified.
         //if (! gDirUtilp->getSkinDir().empty() )
@@ -2468,11 +2458,12 @@ void LLAppViewer::writeSystemInfo()
 {
         gDebugInfo["SLLog"] = LLError::logFileName();
 
-        gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
-        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion();
-        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion();
-        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion();
-        gDebugInfo["ClientInfo"]["BuildVersion"] = 0;
+        gDebugInfo["ClientInfo"]["Name"] = ViewerInfo::viewerName();
+        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerInfo::versionMajor();
+        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerInfo::versionMinor();
+        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerInfo::versionPatch();
+        gDebugInfo["ClientInfo"]["ReleaseVersion"] = ViewerInfo::versionRelease();
+        gDebugInfo["ClientInfo"]["ExtraVersion"] = ViewerInfo::versionExtra();
 
         gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
 
@@ -2557,11 +2548,12 @@ void LLAppViewer::handleViewerCrash()
         
         //We already do this in writeSystemInfo(), but we do it again here to make /sure/ we have a version
         //to check against no matter what
-        gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
-        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion();
-        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion();
-        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion();
-        gDebugInfo["ClientInfo"]["BuildVersion"] = 0;
+        gDebugInfo["ClientInfo"]["Name"] = ViewerInfo::viewerName();
+        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerInfo::versionMajor();
+        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerInfo::versionMinor();
+        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerInfo::versionPatch();
+        gDebugInfo["ClientInfo"]["ReleaseVersion"] = ViewerInfo::versionRelease();
+        gDebugInfo["ClientInfo"]["ExtraVersion"] = ViewerInfo::versionExtra();
 
         LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
         if ( parcel && parcel->getMusicURL()[0])
@@ -4341,11 +4333,12 @@ void LLAppViewer::handleLoginComplete()
         initMainloopTimeout("Mainloop Init");
 
         // Store some data to DebugInfo in case of a freeze.
-        gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
-        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion();
-        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion();
-        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion();
-        gDebugInfo["ClientInfo"]["BuildVersion"] = 0;
+        gDebugInfo["ClientInfo"]["Name"] = ViewerInfo::viewerName();
+        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerInfo::versionMajor();
+        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerInfo::versionMinor();
+        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerInfo::versionPatch();
+        gDebugInfo["ClientInfo"]["ReleaseVersion"] = ViewerInfo::versionRelease();
+        gDebugInfo["ClientInfo"]["ExtraVersion"] = ViewerInfo::versionExtra();
 
         gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");
         gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();