aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs14
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
3265 handlerSetAppearance = OnSetAppearance; 3265 handlerSetAppearance = OnSetAppearance;
3266 if (handlerSetAppearance != null) 3266 if (handlerSetAppearance != null)
3267 { 3267 {
3268 handlerSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam); 3268 // Temporarily protect ourselves from the mantis #951 failure.
3269 // However, we could do this for several other handlers where a failure isn't terminal
3270 // for the client session anyway, in order to protect ourselves against bad code in plugins
3271 try
3272 {
3273 handlerSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
3274 }
3275 catch (Exception e)
3276 {
3277 m_log.ErrorFormat(
3278 "[CLIENT VIEW]: AgentSetApperance packet handler threw an exception, {0}",
3279 e);
3280 }
3269 } 3281 }
3270 3282
3271 break; 3283 break;