aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-14 17:59:55 +0000
committerJustin Clark-Casey (justincc)2011-12-14 17:59:55 +0000
commitcec88872ae311ade010be0fe4220bf4ce496c7fb (patch)
treebaed64d0e38ab871f526bcb5ff01796a2f31f445
parentFix off by one bug in objects GrabbingBehaviour of pCampBot.exe (diff)
parentJust adding a comment to SendFullUpdatToClient (diff)
downloadopensim-SC-cec88872ae311ade010be0fe4220bf4ce496c7fb.zip
opensim-SC-cec88872ae311ade010be0fe4220bf4ce496c7fb.tar.gz
opensim-SC-cec88872ae311ade010be0fe4220bf4ce496c7fb.tar.bz2
opensim-SC-cec88872ae311ade010be0fe4220bf4ce496c7fb.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs14
2 files changed, 5 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9587d5f..f9e0b83 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1373,6 +1373,8 @@ namespace OpenSim.Region.Framework.Scenes
1373 1373
1374 #endregion 1374 #endregion
1375 1375
1376 // Send the parts of this SOG to a single client
1377 // Used when the client initially connects and when client sends RequestPrim packet
1376 public void SendFullUpdateToClient(IClientAPI remoteClient) 1378 public void SendFullUpdateToClient(IClientAPI remoteClient)
1377 { 1379 {
1378 RootPart.SendFullUpdate( 1380 RootPart.SendFullUpdate(
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c8b39a4..f5a00d7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -259,8 +259,6 @@ namespace OpenSim.Region.Framework.Scenes
259 259
260 private bool m_passTouches; 260 private bool m_passTouches;
261 261
262 private UpdateRequired m_updateFlag;
263
264 private PhysicsActor m_physActor; 262 private PhysicsActor m_physActor;
265 protected Vector3 m_acceleration; 263 protected Vector3 m_acceleration;
266 protected Vector3 m_angularVelocity; 264 protected Vector3 m_angularVelocity;
@@ -1004,11 +1002,7 @@ namespace OpenSim.Region.Framework.Scenes
1004 } 1002 }
1005 } 1003 }
1006 1004
1007 public UpdateRequired UpdateFlag 1005 public UpdateRequired UpdateFlag { get; set; }
1008 {
1009 get { return m_updateFlag; }
1010 set { m_updateFlag = value; }
1011 }
1012 1006
1013 /// <summary> 1007 /// <summary>
1014 /// Used for media on a prim. 1008 /// Used for media on a prim.
@@ -2949,6 +2943,7 @@ namespace OpenSim.Region.Framework.Scenes
2949 { 2943 {
2950 case UpdateRequired.TERSE: 2944 case UpdateRequired.TERSE:
2951 { 2945 {
2946 ClearUpdateSchedule();
2952 // Throw away duplicate or insignificant updates 2947 // Throw away duplicate or insignificant updates
2953 if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) || 2948 if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
2954 !Acceleration.Equals(m_lastAcceleration) || 2949 !Acceleration.Equals(m_lastAcceleration) ||
@@ -2958,9 +2953,7 @@ namespace OpenSim.Region.Framework.Scenes
2958 !OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) || 2953 !OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
2959 Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE) 2954 Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE)
2960 { 2955 {
2961
2962 SendTerseUpdateToAllClients(); 2956 SendTerseUpdateToAllClients();
2963 ClearUpdateSchedule();
2964 2957
2965 // Update the "last" values 2958 // Update the "last" values
2966 m_lastPosition = OffsetPosition; 2959 m_lastPosition = OffsetPosition;
@@ -2974,12 +2967,11 @@ namespace OpenSim.Region.Framework.Scenes
2974 } 2967 }
2975 case UpdateRequired.FULL: 2968 case UpdateRequired.FULL:
2976 { 2969 {
2970 ClearUpdateSchedule();
2977 SendFullUpdateToAllClients(); 2971 SendFullUpdateToAllClients();
2978 break; 2972 break;
2979 } 2973 }
2980 } 2974 }
2981
2982 ClearUpdateSchedule();
2983 } 2975 }
2984 2976
2985 /// <summary> 2977 /// <summary>