diff options
| author | Mic Bowman | 2011-04-26 08:42:21 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-26 08:42:21 -0700 |
| commit | 36fef21e52ee7883e9958df8882e847ff8b18f4e (patch) | |
| tree | 9caaf86eb1b5c7fe97c8bf28c145f6d3a49c5610 /OpenSim/Region | |
| parent | Removed debug message in the token bucket code (diff) | |
| parent | Removed stale client components: MXP and VWoHTTP. (diff) | |
| download | opensim-SC-36fef21e52ee7883e9958df8882e847ff8b18f4e.zip opensim-SC-36fef21e52ee7883e9958df8882e847ff8b18f4e.tar.gz opensim-SC-36fef21e52ee7883e9958df8882e847ff8b18f4e.tar.bz2 opensim-SC-36fef21e52ee7883e9958df8882e847ff8b18f4e.tar.xz | |
Merge branch 'master' into queuetest
Diffstat (limited to 'OpenSim/Region')
| -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 cdd4224..22bad99 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -4856,7 +4856,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4856 | data.RelativePosition.ToBytes(objectData, 0); | 4856 | data.RelativePosition.ToBytes(objectData, 0); |
| 4857 | data.Velocity.ToBytes(objectData, 12); | 4857 | data.Velocity.ToBytes(objectData, 12); |
| 4858 | data.Acceleration.ToBytes(objectData, 24); | 4858 | data.Acceleration.ToBytes(objectData, 24); |
| 4859 | data.RotationOffset.ToBytes(objectData, 36); | 4859 | try |
| 4860 | { | ||
| 4861 | data.RotationOffset.ToBytes(objectData, 36); | ||
| 4862 | } | ||
| 4863 | catch (Exception e) | ||
| 4864 | { | ||
| 4865 | m_log.Warn("[LLClientView]: exception converting quaternion to bytes, using Quaternion.Identity. Exception: " + e.ToString()); | ||
| 4866 | OpenMetaverse.Quaternion.Identity.ToBytes(objectData, 36); | ||
| 4867 | } | ||
| 4860 | data.AngularVelocity.ToBytes(objectData, 48); | 4868 | data.AngularVelocity.ToBytes(objectData, 48); |
| 4861 | 4869 | ||
| 4862 | ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock(); | 4870 | ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock(); |