1 files changed, 13 insertions, 1 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 939bd8f..9fe2144 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -3265,7 +3265,19 @@ namespace OpenSim.Region.ClientStack
                         handlerSetAppearance = OnSetAppearance;
                         if (handlerSetAppearance != null)
                         {
-                            handlerSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
+                            // Temporarily protect ourselves from the mantis #951 failure.
+                            // However, we could do this for several other handlers where a failure isn't terminal
+                            // for the client session anyway, in order to protect ourselves against bad code in plugins 
+                            try
+                            {
+                                handlerSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
+                            }
+                            catch (Exception e)
+                            {
+                                m_log.ErrorFormat(
+                                    "[CLIENT VIEW]: AgentSetApperance packet handler threw an exception, {0}", 
+                                    e);
+                            }
                         }
 
                         break;