aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordan miller2007-09-24 02:40:13 +0000
committerdan miller2007-09-24 02:40:13 +0000
commita9a126063fa1d4f2ec628e4a00321c314cb893fd (patch)
treecc5b715ff903d1fac1b405dfa8be3d165b4d078d
parent* Renamed methods on IUserData (diff)
downloadopensim-SC_OLD-a9a126063fa1d4f2ec628e4a00321c314cb893fd.zip
opensim-SC_OLD-a9a126063fa1d4f2ec628e4a00321c314cb893fd.tar.gz
opensim-SC_OLD-a9a126063fa1d4f2ec628e4a00321c314cb893fd.tar.bz2
opensim-SC_OLD-a9a126063fa1d4f2ec628e4a00321c314cb893fd.tar.xz
long-lost fixes to physics -- proper physical avatar management on crossings, TP
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs1
3 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index dcca31c..3b4c0f8 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -277,7 +277,7 @@ namespace OpenSim.Region.ClientStack
277 clientPingTimer.Enabled = true; 277 clientPingTimer.Enabled = true;
278 278
279 MainLog.Instance.Verbose("OpenSimClient.cs:InitNewClient() - Adding viewer agent to scene"); 279 MainLog.Instance.Verbose("OpenSimClient.cs:InitNewClient() - Adding viewer agent to scene");
280 this.m_scene.AddNewClient(this, false); 280 this.m_scene.AddNewClient(this, true);
281 } 281 }
282 282
283 protected virtual void AuthUser() 283 protected virtual void AuthUser()
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 22f69a5..97a4ae1 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1063,9 +1063,9 @@ namespace OpenSim.Region.Environment.Scenes
1063 // agent.startpos = new LLVector3(128, 128, 70); 1063 // agent.startpos = new LLVector3(128, 128, 70);
1064 agent.startpos = position; 1064 agent.startpos = position;
1065 agent.child = true; 1065 agent.child = true;
1066 m_scenePresences[remoteClient.AgentId].Close();
1066 commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent); 1067 commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
1067 commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false); 1068 commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false);
1068
1069 AgentCircuitData circuitdata = remoteClient.RequestClientInfo(); 1069 AgentCircuitData circuitdata = remoteClient.RequestClientInfo();
1070 string capsPath = Util.GetCapsURL(remoteClient.AgentId); 1070 string capsPath = Util.GetCapsURL(remoteClient.AgentId);
1071 remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), capsPath); 1071 remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), capsPath);
@@ -1364,4 +1364,4 @@ namespace OpenSim.Region.Environment.Scenes
1364 base.Close(); 1364 base.Close();
1365 } 1365 }
1366 } 1366 }
1367} \ No newline at end of file 1367}
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index f594789..4d2c8e2 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -413,6 +413,7 @@ namespace OpenSim.Region.Environment.Scenes
413 m_isChildAgent = false; 413 m_isChildAgent = false;
414 414
415 //this.m_scene.SendAllSceneObjectsToClient(this.ControllingClient); 415 //this.m_scene.SendAllSceneObjectsToClient(this.ControllingClient);
416 this.MakeAvatarPhysical(this.AbsolutePosition, false);
416 } 417 }
417 } 418 }
418 419