diff options
author | MW | 2007-08-09 12:59:42 +0000 |
---|---|---|
committer | MW | 2007-08-09 12:59:42 +0000 |
commit | a56a17fab20e1ef94e70dbf6648ebb2f437de364 (patch) | |
tree | e19a6a858725ffadbcf34c8f9a7409db350a5681 /OpenSim/Region/Environment/Scenes | |
parent | Transition between not flying / flying should be smoother (diff) | |
download | opensim-SC-a56a17fab20e1ef94e70dbf6648ebb2f437de364.zip opensim-SC-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.gz opensim-SC-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.bz2 opensim-SC-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')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 19fd075..813308b 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -75,6 +75,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
75 | 75 | ||
76 | #region Properties | 76 | #region Properties |
77 | 77 | ||
78 | public AgentCircuitManager AuthenticateHandler | ||
79 | { | ||
80 | get { return this.authenticateHandler; } | ||
81 | } | ||
78 | /// <summary> | 82 | /// <summary> |
79 | /// | 83 | /// |
80 | /// </summary> | 84 | /// </summary> |
@@ -600,7 +604,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
600 | 604 | ||
601 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); | 605 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); |
602 | 606 | ||
603 | // client.OnCreateNewInventoryItem += CreateNewInventoryItem; | 607 | //client.OnCreateNewInventoryItem += CreateNewInventoryItem; |
604 | //client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; | 608 | //client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; |
605 | client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; | 609 | client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; |
606 | client.OnRequestTaskInventory += RequestTaskInventory; | 610 | client.OnRequestTaskInventory += RequestTaskInventory; |
@@ -922,7 +926,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
922 | commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent); | 926 | commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent); |
923 | commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false); | 927 | commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false); |
924 | 928 | ||
925 | remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4)); | 929 | //TODO: following line is hard coded to port 9000, really need to change this as soon as possible |
930 | AgentCircuitData circuitdata = remoteClient.RequestClientInfo(); | ||
931 | string capsPath = "http://" + reg.ExternalEndPoint.Address.ToString() + ":9000/CAPS/" + this.AuthenticateHandler.AgentCircuits[circuitdata.circuitcode].CapsPath + "0000/"; | ||
932 | remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), capsPath); | ||
926 | } | 933 | } |
927 | } | 934 | } |
928 | } | 935 | } |
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 | } |