From 0ef11cf31364456ec247b0fc7ad8f6d1de408400 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 28 Jan 2009 20:04:52 -0600
Subject: Second Life viewer sources 1.22.6-RC

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

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

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()
 		return;
     }
 
-	gViewerWindow->handlePerFrameHover();
-
 	///////////////////////////////////////
 	// Agent and camera movement
 	//
@@ -3485,12 +3483,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);
 	}
 }
 
@@ -3711,6 +3709,11 @@ void LLAppViewer::forceErrorSoftwareException()
     throw; 
 }
 
+void LLAppViewer::forceErrorDriverCrash()
+{
+	glDeleteTextures(1, NULL);
+}
+
 void LLAppViewer::initMainloopTimeout(const std::string& state, F32 secs)
 {
 	if(!mMainloopTimeout)
-- 
cgit v1.1