diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-02-06 19:45:56 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-02-06 19:45:56 +0000 |
| commit | 54995e0828de31201710c99e8d51944e39cca582 (patch) | |
| tree | e8f6dff4eeca5a7892f0535607436c8e52aa89a2 /indra/newview/llappviewer.cpp | |
| parent | ea8e83274ae76598ff7a97eb50991e9f4826091b (diff) | |
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
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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 // |