summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp9
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)