Merge remote branch 'mccabe/next' into next

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()
         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();