From 092020cba8d9796b44b4e838e432c366330b1432 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 1 Oct 2009 01:49:53 -0700 Subject: Suspected partial crash fix for Logout --- ChangeLog.txt | 7 ++++++- linden/indra/newview/llappviewer.cpp | 17 ----------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 34dbd34..ec95f81 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,9 +1,14 @@ 2009-10-01 McCabe Maxsted + * Suspected partial crash fix for Logout. + + modified: linden/indra/newview/llappviewer.cpp + + * Fixed 1.2 thinking it was on the Teen Grid. (And also accidentally made us adult compliant! Hah!) - modified: indra/newview/llstartup.cpp + modified: linden/indra/newview/llstartup.cpp * Updated gpu_table.txt to latest version in Snowglobe. diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 52aa1eb..448e26b 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -3915,28 +3915,11 @@ void LLAppViewer::handleLoginComplete() gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR; gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH; gDebugInfo["ClientInfo"]["BuildVersion"] = LL_VERSION_BUILD; - - LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); - if ( parcel && parcel->getMusicURL()[0]) - { - gDebugInfo["ParcelMusicURL"] = parcel->getMusicURL(); - } - if ( parcel && parcel->getMediaURL()[0]) - { - gDebugInfo["ParcelMediaURL"] = parcel->getMediaURL(); - } - gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile"); gDebugInfo["CAFilename"] = gDirUtilp->getCAFile(); gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName(); gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath(); - if(gAgent.getRegion()) - { - gDebugInfo["CurrentSimHost"] = gAgent.getRegionHost().getHostName(); - gDebugInfo["CurrentRegion"] = gAgent.getRegion()->getName(); - } - if(LLAppViewer::instance()->mMainloopTimeout) { gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState(); -- cgit v1.1