diff options
| author | dahlia | 2011-04-25 17:11:54 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-04-25 19:13:02 -0700 |
| commit | 6a3a39b87610abda0ff9cb903f50f178aba69983 (patch) | |
| tree | 5d6bff85579afed0cf1b13fb8d3f1ace0c0b8ad6 | |
| parent | Made things consistent between LocalInventoryServiceConnector and RemoteXInve... (diff) | |
| download | opensim-SC_OLD-6a3a39b87610abda0ff9cb903f50f178aba69983.zip opensim-SC_OLD-6a3a39b87610abda0ff9cb903f50f178aba69983.tar.gz opensim-SC_OLD-6a3a39b87610abda0ff9cb903f50f178aba69983.tar.bz2 opensim-SC_OLD-6a3a39b87610abda0ff9cb903f50f178aba69983.tar.xz | |
recover from unhandled exception from bad rotation data while processing entity updates in LLClientView.cs
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 1f7e66d..0f7f666 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -4764,7 +4764,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4764 | data.RelativePosition.ToBytes(objectData, 0); | 4764 | data.RelativePosition.ToBytes(objectData, 0); |
| 4765 | data.Velocity.ToBytes(objectData, 12); | 4765 | data.Velocity.ToBytes(objectData, 12); |
| 4766 | data.Acceleration.ToBytes(objectData, 24); | 4766 | data.Acceleration.ToBytes(objectData, 24); |
| 4767 | data.RotationOffset.ToBytes(objectData, 36); | 4767 | try |
| 4768 | { | ||
| 4769 | data.RotationOffset.ToBytes(objectData, 36); | ||
| 4770 | } | ||
| 4771 | catch (Exception e) | ||
| 4772 | { | ||
| 4773 | m_log.Warn("[LLClientView]: exception converting quaternion to bytes, using Quaternion.Identity. Exception: " + e.ToString()); | ||
| 4774 | OpenMetaverse.Quaternion.Identity.ToBytes(objectData, 36); | ||
| 4775 | } | ||
| 4768 | data.AngularVelocity.ToBytes(objectData, 48); | 4776 | data.AngularVelocity.ToBytes(objectData, 48); |
| 4769 | 4777 | ||
| 4770 | ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock(); | 4778 | ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock(); |