aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMW2007-08-09 12:59:42 +0000
committerMW2007-08-09 12:59:42 +0000
commita56a17fab20e1ef94e70dbf6648ebb2f437de364 (patch)
treee19a6a858725ffadbcf34c8f9a7409db350a5681 /OpenSim/Region/Environment/Scenes/ScenePresence.cs
parentTransition between not flying / flying should be smoother (diff)
downloadopensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.zip
opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.gz
opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.bz2
opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.xz
Making sure my local working copy is in sync with svn before I start the job of enabling the new SceneObject classes.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 17c1b3a..b021b44 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -620,7 +620,10 @@ namespace OpenSim.Region.Environment.Scenes
620 bool res = this.m_scene.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos, this._physActor.Flying); 620 bool res = this.m_scene.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos, this._physActor.Flying);
621 if (res) 621 if (res)
622 { 622 {
623 this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint); 623 //TODO: following line is hard coded to port 9000, really need to change this as soon as possible
624 AgentCircuitData circuitdata = this.ControllingClient.RequestClientInfo();
625 string capsPath = "http://" + neighbourRegion.ExternalEndPoint.Address.ToString() + ":9000/CAPS/" +this.m_scene.AuthenticateHandler.AgentCircuits[circuitdata.circuitcode].CapsPath + "0000/";
626 this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, capsPath);
624 this.MakeChildAgent(); 627 this.MakeChildAgent();
625 } 628 }
626 } 629 }