aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-10-01 01:49:53 -0700
committerMcCabe Maxsted2009-10-01 01:49:53 -0700
commit092020cba8d9796b44b4e838e432c366330b1432 (patch)
tree0aaf3bd5acc9c18b276e10eaa8a3d8cefb9e3f65 /linden
parentFixed 1.2 thinking it was on the Teen Grid (diff)
downloadmeta-impy-092020cba8d9796b44b4e838e432c366330b1432.zip
meta-impy-092020cba8d9796b44b4e838e432c366330b1432.tar.gz
meta-impy-092020cba8d9796b44b4e838e432c366330b1432.tar.bz2
meta-impy-092020cba8d9796b44b4e838e432c366330b1432.tar.xz
Suspected partial crash fix for Logout
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llappviewer.cpp17
1 files changed, 0 insertions, 17 deletions
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()
3915 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR; 3915 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
3916 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH; 3916 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
3917 gDebugInfo["ClientInfo"]["BuildVersion"] = LL_VERSION_BUILD; 3917 gDebugInfo["ClientInfo"]["BuildVersion"] = LL_VERSION_BUILD;
3918
3919 LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
3920 if ( parcel && parcel->getMusicURL()[0])
3921 {
3922 gDebugInfo["ParcelMusicURL"] = parcel->getMusicURL();
3923 }
3924 if ( parcel && parcel->getMediaURL()[0])
3925 {
3926 gDebugInfo["ParcelMediaURL"] = parcel->getMediaURL();
3927 }
3928
3929 gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile"); 3918 gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");
3930 gDebugInfo["CAFilename"] = gDirUtilp->getCAFile(); 3919 gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
3931 gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName(); 3920 gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
3932 gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath(); 3921 gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
3933 3922
3934 if(gAgent.getRegion())
3935 {
3936 gDebugInfo["CurrentSimHost"] = gAgent.getRegionHost().getHostName();
3937 gDebugInfo["CurrentRegion"] = gAgent.getRegion()->getName();
3938 }
3939
3940 if(LLAppViewer::instance()->mMainloopTimeout) 3923 if(LLAppViewer::instance()->mMainloopTimeout)
3941 { 3924 {
3942 gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState(); 3925 gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();