Merge branch 'master' into V2TextureSystem

2011-04-16 18:25:11 -05:00
parent ad19c0209b c38a47ea48
commit d32f820903
7 changed files with 112 additions and 98 deletions
--- 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.