Merge branch 'master' into bigmerge

Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
author: Melanie 2011-10-30 10:16:25 +0000
committer: Melanie 2011-10-30 10:16:25 +0000
commit: 083b28de8c45589a43ce6ceed4dbfb70c698f2d0 (patch)
tree: fc494b5d401bf2190e8c2d9ee027021f330d6285 /OpenSim/Region/ClientStack
parent: Fix the offline message module to revert core changes and restore avn (diff)
parent: Add missing max_listens_per_region to [LL_Functions] config section in OpenSi... (diff)
download: opensim-SC_OLD-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.zip
opensim-SC_OLD-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.gz
opensim-SC_OLD-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.bz2
opensim-SC_OLD-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 0e82859..30acbdf 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4925,8 +4925,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            data.CollisionPlane.ToBytes(objectData, 0);
            data.OffsetPosition.ToBytes(objectData, 16);
-            //data.Velocity.ToBytes(objectData, 28);
+//            data.Velocity.ToBytes(objectData, 28);
-            //data.Acceleration.ToBytes(objectData, 40);
+//            data.Acceleration.ToBytes(objectData, 40);
            data.Rotation.ToBytes(objectData, 52);
            //data.AngularVelocity.ToBytes(objectData, 64);
author	Melanie	2011-10-30 10:16:25 +0000
committer	Melanie	2011-10-30 10:16:25 +0000
commit	083b28de8c45589a43ce6ceed4dbfb70c698f2d0 (patch)
tree	fc494b5d401bf2190e8c2d9ee027021f330d6285 /OpenSim/Region/ClientStack
parent	Fix the offline message module to revert core changes and restore avn (diff)
parent	Add missing max_listens_per_region to [LL_Functions] config section in OpenSi... (diff)
download	opensim-SC_OLD-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.zip opensim-SC_OLD-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.gz opensim-SC_OLD-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.bz2 opensim-SC_OLD-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.xz

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 0e82859..30acbdf 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4925,8 +4925,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4925		4925
4926	data.CollisionPlane.ToBytes(objectData, 0);	4926	data.CollisionPlane.ToBytes(objectData, 0);
4927	data.OffsetPosition.ToBytes(objectData, 16);	4927	data.OffsetPosition.ToBytes(objectData, 16);
4928	//data.Velocity.ToBytes(objectData, 28);	4928	// data.Velocity.ToBytes(objectData, 28);
4929	//data.Acceleration.ToBytes(objectData, 40);	4929	// data.Acceleration.ToBytes(objectData, 40);
4930	data.Rotation.ToBytes(objectData, 52);	4930	data.Rotation.ToBytes(objectData, 52);
4931	//data.AngularVelocity.ToBytes(objectData, 64);	4931	//data.AngularVelocity.ToBytes(objectData, 64);
4932		4932