From d51a8d5c53262f2f3b8384fd463fa238753cd1d4 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 16 Jan 2011 16:43:11 -0600 Subject: Better format for channel/version string. Before, it was "Imprudence #.#.# / Second Life #.#.#.#". Now, it's just "Imprudence #.#.#". --- linden/indra/newview/llappviewer.cpp | 47 ++++++++++++++---------------------- 1 file changed, 18 insertions(+), 29 deletions(-) (limited to 'linden/indra/newview/llappviewer.cpp') diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 6b98c8e..10f61a4 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -618,18 +618,16 @@ bool LLAppViewer::init() writeSystemInfo(); + // Build a string representing the current version number. - gCurrentVersion = llformat("%s %d.%d.%d %s / %s %d.%d.%d.%d", - gSavedSettings.getString("VersionChannelName").c_str(), + gCurrentVersion = llformat( + "%s %d.%d.%d.%d", + gSavedSettings.getString("VersionChannelName").c_str(), ViewerVersion::getImpMajorVersion(), ViewerVersion::getImpMinorVersion(), ViewerVersion::getImpPatchVersion(), - ViewerVersion::getImpTestVersion().c_str(), - ViewerVersion::getLLViewerName().c_str(), - ViewerVersion::getLLMajorVersion(), - ViewerVersion::getLLMinorVersion(), - ViewerVersion::getLLPatchVersion(), - ViewerVersion::getLLBuildVersion() ); + 0 // our 'build number' + ); ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// @@ -2461,14 +2459,10 @@ void LLAppViewer::writeSystemInfo() gDebugInfo["SLLog"] = LLError::logFileName(); gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName"); - gDebugInfo["ClientInfo"]["ImpMajorVersion"] = ViewerVersion::getImpMajorVersion(); - gDebugInfo["ClientInfo"]["ImpMinorVersion"] = ViewerVersion::getImpMinorVersion(); - gDebugInfo["ClientInfo"]["ImpPatchVersion"] = ViewerVersion::getImpPatchVersion(); - gDebugInfo["ClientInfo"]["ImpTestVersion"] = ViewerVersion::getImpTestVersion(); - gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getLLMajorVersion(); - gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getLLMinorVersion(); - gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getLLPatchVersion(); - gDebugInfo["ClientInfo"]["BuildVersion"] = ViewerVersion::getLLBuildVersion(); + gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion(); + gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion(); + gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion(); + gDebugInfo["ClientInfo"]["BuildVersion"] = 0; gDebugInfo["CAFilename"] = gDirUtilp->getCAFile(); @@ -2554,15 +2548,10 @@ 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"]["ImpMajorVersion"] = ViewerVersion::getImpMajorVersion(); - gDebugInfo["ClientInfo"]["ImpMinorVersion"] = ViewerVersion::getImpMinorVersion(); - gDebugInfo["ClientInfo"]["ImpPatchVersion"] = ViewerVersion::getImpPatchVersion(); - gDebugInfo["ClientInfo"]["ImpTestVersion"] = ViewerVersion::getImpTestVersion(); - gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getLLMajorVersion(); - gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getLLMinorVersion(); - gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getLLPatchVersion(); - gDebugInfo["ClientInfo"]["BuildVersion"] = ViewerVersion::getLLBuildVersion(); + gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion(); + gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion(); + gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion(); + gDebugInfo["ClientInfo"]["BuildVersion"] = 0; LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); if ( parcel && parcel->getMusicURL()[0]) @@ -4334,11 +4323,11 @@ void LLAppViewer::handleLoginComplete() // 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"]["MajorVersion"] = ViewerVersion::getLLMajorVersion(); - gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getLLMinorVersion(); - gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getLLPatchVersion(); - gDebugInfo["ClientInfo"]["BuildVersion"] = ViewerVersion::getLLBuildVersion(); gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile"); gDebugInfo["CAFilename"] = gDirUtilp->getCAFile(); gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName(); -- cgit v1.1 From 8312c0a9b0714ac18943e9e1949903438134079a Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Tue, 22 Feb 2011 16:30:33 -0600 Subject: Changed imprudenceviewer.org URLs to the new kokuaviewer.org URLs. --- linden/indra/newview/llappviewer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden/indra/newview/llappviewer.cpp') diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 10f61a4..268c4c0 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -3277,7 +3277,7 @@ void LLAppViewer::badNetworkHandler() "the issue. \n" " \n" "If the problem continues, please report the issue at: \n" - "http://imprudenceviewer.org" << grid_support_msg; + "http://redmine.kokuaviewer.org/projects/imprudence" << grid_support_msg; forceDisconnect(message.str()); } -- cgit v1.1