aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llappviewer.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 63711ba..e1a0fe2 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3206,8 +3206,6 @@ void LLAppViewer::idle()
3206 return; 3206 return;
3207 } 3207 }
3208 3208
3209 gViewerWindow->handlePerFrameHover();
3210
3211 /////////////////////////////////////// 3209 ///////////////////////////////////////
3212 // Agent and camera movement 3210 // Agent and camera movement
3213 // 3211 //
@@ -3485,12 +3483,12 @@ void LLAppViewer::sendLogoutRequest()
3485 if (mLogoutMarkerFile) 3483 if (mLogoutMarkerFile)
3486 { 3484 {
3487 llinfos << "Created logout marker file " << mLogoutMarkerFileName << llendl; 3485 llinfos << "Created logout marker file " << mLogoutMarkerFileName << llendl;
3486 apr_file_close(mLogoutMarkerFile);
3488 } 3487 }
3489 else 3488 else
3490 { 3489 {
3491 llwarns << "Cannot create logout marker file " << mLogoutMarkerFileName << llendl; 3490 llwarns << "Cannot create logout marker file " << mLogoutMarkerFileName << llendl;
3492 } 3491 }
3493 apr_file_close(mLogoutMarkerFile);
3494 } 3492 }
3495} 3493}
3496 3494
@@ -3711,6 +3709,11 @@ void LLAppViewer::forceErrorSoftwareException()
3711 throw; 3709 throw;
3712} 3710}
3713 3711
3712void LLAppViewer::forceErrorDriverCrash()
3713{
3714 glDeleteTextures(1, NULL);
3715}
3716
3714void LLAppViewer::initMainloopTimeout(const std::string& state, F32 secs) 3717void LLAppViewer::initMainloopTimeout(const std::string& state, F32 secs)
3715{ 3718{
3716 if(!mMainloopTimeout) 3719 if(!mMainloopTimeout)