aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-09-24 12:19:33 +0000
committerlbsa712007-09-24 12:19:33 +0000
commitc8157da17bbd21b41e3fd975585ee7a9e5f89a91 (patch)
tree2310d1d0c2094d843e9753b1f00e4b98583b14be
parent* Now login swallows WebException.Timeout; (thanks cfk!) (diff)
downloadopensim-SC_OLD-c8157da17bbd21b41e3fd975585ee7a9e5f89a91.zip
opensim-SC_OLD-c8157da17bbd21b41e3fd975585ee7a9e5f89a91.tar.gz
opensim-SC_OLD-c8157da17bbd21b41e3fd975585ee7a9e5f89a91.tar.bz2
opensim-SC_OLD-c8157da17bbd21b41e3fd975585ee7a9e5f89a91.tar.xz
* Hotfix for 'properties all the way into the sunset' bug; it just doesn't make sense, but maybe we need to handle agentUpdates form children too.
* Ignored some bins
-rw-r--r--OpenSim/Region/Environment/Scenes/EntityBase.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs20
2 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index dc1f7f1..ea50955 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Scenes
40 set { m_pos = value; } 40 set { m_pos = value; }
41 } 41 }
42 42
43 public LLVector3 m_velocity; 43 protected LLVector3 m_velocity;
44 44
45 /// <summary> 45 /// <summary>
46 /// 46 ///
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 83626b8..eaf15a1 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -419,16 +419,16 @@ namespace OpenSim.Region.Environment.Scenes
419 419
420 public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation) 420 public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
421 { 421 {
422 if (m_isChildAgent) 422 //if (m_isChildAgent)
423 { 423 //{
424 // Console.WriteLine("DEBUG: HandleAgentUpdate: child agent"); 424 // // Console.WriteLine("DEBUG: HandleAgentUpdate: child agent");
425 return; 425 // return;
426 } 426 //}
427 427
428 if(PhysicsActor==null) { 428 //if(PhysicsActor==null) {
429 // Console.WriteLine("DEBUG: HandleAgentUpdate: null PhysicsActor!"); 429 // // Console.WriteLine("DEBUG: HandleAgentUpdate: null PhysicsActor!");
430 return; 430 // return;
431 } 431 //}
432 432
433 int i = 0; 433 int i = 0;
434 bool update_movementflag = false; 434 bool update_movementflag = false;