1 files changed, 23 insertions, 2 deletions

diff --git a/linden/indra/newview/llhudeffectbeam.cpp b/linden/indra/newview/llhudeffectbeam.cpp
index a7c1214..f6dff50 100644
--- a/linden/indra/newview/llhudeffectbeam.cpp
+++ b/linden/indra/newview/llhudeffectbeam.cpp
@@ -83,9 +83,30 @@ LLHUDEffectBeam::~LLHUDEffectBeam()
 
 void LLHUDEffectBeam::packData(LLMessageSystem *mesgsys)
 {
-        if (!mSourceObject)
+        LLViewerObject* source_object = (LLViewerObject*)mSourceObject;
+
+        if (!source_object)
+        {
+                markDead();
+                return;
+        }
+        else if (!source_object->isAvatar())
         {
-                llwarns << "Missing source object!" << llendl;
+                LL_DEBUGS("HUDEffect")<<"Non-Avatar HUDEffectBeam message for ID: " 
+                        <<  source_object->getID().asString()<< LL_ENDL;
+                markDead();
+                return;
+        }
+        else 
+        {
+                LLVOAvatar* source_avatar = (LLVOAvatar*)source_object;
+                if (!source_avatar->isSelf())
+                {
+                        LL_DEBUGS("HUDEffect")<<"Non-self HUDEffectBeam message for ID: " 
+                                << source_avatar->getID().asString()<< LL_ENDL;
+                        markDead();
+                        return;
+                }
         }
 
         // Pack the default data