diff options
| author | Melanie | 2012-05-04 21:00:41 +0200 |
|---|---|---|
| committer | Melanie | 2012-05-04 21:00:41 +0200 |
| commit | 197163e12a265af66a9393bc6753c7a50520c5b1 (patch) | |
| tree | 35037d7ff6a00058daf4c416fdb2df7fb2d77ecb /OpenSim | |
| parent | Add the default animation to the child agent data update (diff) | |
| download | opensim-SC-197163e12a265af66a9393bc6753c7a50520c5b1.zip opensim-SC-197163e12a265af66a9393bc6753c7a50520c5b1.tar.gz opensim-SC-197163e12a265af66a9393bc6753c7a50520c5b1.tar.bz2 opensim-SC-197163e12a265af66a9393bc6753c7a50520c5b1.tar.xz | |
Fix teleporting from older to newer regions
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 7962ff4..e718aa6 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
| @@ -602,7 +602,14 @@ namespace OpenSim.Framework | |||
| 602 | 602 | ||
| 603 | if (args["default_animation"] != null) | 603 | if (args["default_animation"] != null) |
| 604 | { | 604 | { |
| 605 | DefaultAnim = new Animation((OSDMap)args["default_animation"]); | 605 | try |
| 606 | { | ||
| 607 | DefaultAnim = new Animation((OSDMap)args["default_animation"]); | ||
| 608 | } | ||
| 609 | catch | ||
| 610 | { | ||
| 611 | DefaultAnim = null; | ||
| 612 | } | ||
| 606 | } | 613 | } |
| 607 | 614 | ||
| 608 | //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array) | 615 | //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array) |