From ef43a87ac0190ca3460eb5adc3ed9b4c3311a382 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sat, 16 Apr 2011 02:07:24 +0200
Subject: [PATCH] Anti suicide kind of thing

---
 indra/newview/llviewerobjectlist.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 964661d48..167a3b9bd 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -909,6 +909,13 @@ void LLViewerObjectList::removeDrawable(LLDrawable* drawablep)
 
 BOOL LLViewerObjectList::killObject(LLViewerObject *objectp)
 {
+	// Don't commit suicide just because someone thinks you are on a ledge. -SG
+	if (objectp == gAgent.getAvatarObject())
+	{
+		objectp->setRegion(gAgent.getRegion());
+		return FALSE;
+	}	
+	
 	// When we're killing objects, all we do is mark them as dead.
 	// We clean up the dead objects later.