From 54995e0828de31201710c99e8d51944e39cca582 Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Fri, 6 Feb 2009 19:45:56 +0000
Subject: svn merge -r109009:109164
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22 Merge-back
 of non-voice related viewer 1.22 RC8 changes to trunk. QAR-1242

---
 indra/newview/llappviewer.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llappviewer.cpp')

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index fd473b66d5..9a8d211cf6 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2308,6 +2308,7 @@ void LLAppViewer::handleViewerCrash()
 	gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
 	gDebugInfo["SessionLength"] = F32(LLFrameTimer::getElapsedSeconds());
 	gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
+	gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer) getCurrentRSS() >> 10;
 
 	if(gLogoutInProgress)
 	{
@@ -3259,6 +3260,8 @@ void LLAppViewer::idle()
 		return;
     }
 
+	gViewerWindow->handlePerFrameHover();
+
 	///////////////////////////////////////
 	// Agent and camera movement
 	//
-- 
cgit v1.2.3