From bc2d73310938117d9d0ec5739768e6094e71e9b2 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 29 May 2012 00:57:15 +0200
Subject: [PATCH] FIRE-6011; fix a crash when gAgentAvatp is not valid
 yet/anymore.

---
 indra/newview/llviewermenu.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 240c70bdf8..d4e60ddf5e 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3861,8 +3861,14 @@ class FSSelfCheckForceSit : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		bool new_value = gAgentAvatarp->isSitting();
-		return new_value;
+		// <FS:ND> don't use gAgentAvatarp if it's not valid yet/anymore.
+		//		bool new_value = gAgentAvatarp->isSitting();
+		//		return new_value;
+		if( !isAgentAvatarValid() )
+			return false;
+
+		return gAgentAvatarp->isSitting();
+		// </FS:ND>
 	}
 };