diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-02-03 21:15:57 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-02-03 21:15:57 +0000 |
| commit | 46f8fb8781ccce338b4a88aaf8371ee3dec56d29 (patch) | |
| tree | b2dc09521a166d2181c48f4a4f1ca90b83b99477 /indra/newview/llappviewer.cpp | |
| parent | e188badaf29a1a02307f93864eed6737096bd9a1 (diff) | |
svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22
Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 44b9cb2198..359e5df4f8 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3278,8 +3278,6 @@ void LLAppViewer::idle() return; } - gViewerWindow->handlePerFrameHover(); - /////////////////////////////////////// // Agent and camera movement // @@ -3557,12 +3555,12 @@ void LLAppViewer::sendLogoutRequest() if (mLogoutMarkerFile) { llinfos << "Created logout marker file " << mLogoutMarkerFileName << llendl; + apr_file_close(mLogoutMarkerFile); } else { llwarns << "Cannot create logout marker file " << mLogoutMarkerFileName << llendl; } - apr_file_close(mLogoutMarkerFile); } } @@ -3786,6 +3784,11 @@ void LLAppViewer::forceErrorSoftwareException() throw; } +void LLAppViewer::forceErrorDriverCrash() +{ + glDeleteTextures(1, NULL); +} + void LLAppViewer::initMainloopTimeout(const std::string& state, F32 secs) { if(!mMainloopTimeout) |