aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.Region/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Scene.cs13
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs
index ca8e5c3..14c77c2 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs
@@ -43,6 +43,8 @@ using OpenSim.Region.Scripting;
43using OpenSim.Terrain; 43using OpenSim.Terrain;
44using OpenGrid.Framework.Communications; 44using OpenGrid.Framework.Communications;
45using OpenSim.Caches; 45using OpenSim.Caches;
46using OpenSim.Region;
47using OpenSim.Servers;
46 48
47namespace OpenSim.Region.Scenes 49namespace OpenSim.Region.Scenes
48{ 50{
@@ -67,6 +69,8 @@ namespace OpenSim.Region.Scenes
67 protected RegionCommsListener regionCommsHost; 69 protected RegionCommsListener regionCommsHost;
68 protected CommunicationsManager commsManager; 70 protected CommunicationsManager commsManager;
69 71
72 protected Caps TestCapsHandler;
73 protected BaseHttpServer httpListener;
70 74
71 public ParcelManager parcelManager; 75 public ParcelManager parcelManager;
72 public EstateManager estateManager; 76 public EstateManager estateManager;
@@ -96,7 +100,7 @@ namespace OpenSim.Region.Scenes
96 /// <param name="clientThreads">Dictionary to contain client threads</param> 100 /// <param name="clientThreads">Dictionary to contain client threads</param>
97 /// <param name="regionHandle">Region Handle for this region</param> 101 /// <param name="regionHandle">Region Handle for this region</param>
98 /// <param name="regionName">Region Name for this region</param> 102 /// <param name="regionName">Region Name for this region</param>
99 public Scene(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach) 103 public Scene(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
100 { 104 {
101 try 105 try
102 { 106 {
@@ -127,6 +131,9 @@ namespace OpenSim.Region.Scenes
127 Terrain = new TerrainEngine(); 131 Terrain = new TerrainEngine();
128 132
129 ScenePresence.LoadAnims(); 133 ScenePresence.LoadAnims();
134 this.httpListener = httpServer;
135 this.TestCapsHandler = new Caps(httpListener, "127.0.0.1" , 9000);
136 this.TestCapsHandler.RegisterHandlers();
130 } 137 }
131 catch (Exception e) 138 catch (Exception e)
132 { 139 {
@@ -755,7 +762,7 @@ namespace OpenSim.Region.Scenes
755 agent.InventoryFolder = LLUUID.Zero; 762 agent.InventoryFolder = LLUUID.Zero;
756 agent.startpos = new LLVector3(128, 128, 70); 763 agent.startpos = new LLVector3(128, 128, 70);
757 agent.child = true; 764 agent.child = true;
758 this.commsManager.InterRegion.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); 765 this.commsManager.InterRegion.InformRegionOfChildAgent(neighbours[i].RegionHandle, agent);
759 remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); 766 remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);
760 } 767 }
761 } 768 }
@@ -816,7 +823,7 @@ namespace OpenSim.Region.Scenes
816 agent.InventoryFolder = LLUUID.Zero; 823 agent.InventoryFolder = LLUUID.Zero;
817 agent.startpos = new LLVector3(128, 128, 70); 824 agent.startpos = new LLVector3(128, 128, 70);
818 agent.child = true; 825 agent.child = true;
819 this.commsManager.InterRegion.InformNeighbourOfChildAgent(regionHandle, agent); 826 this.commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
820 this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position); 827 this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position);
821 remoteClient.SendRegionTeleport(regionHandle, 13, reg.IPListenAddr, (ushort)reg.IPListenPort, 4, (1 << 4)); 828 remoteClient.SendRegionTeleport(regionHandle, 13, reg.IPListenAddr, (ushort)reg.IPListenPort, 4, (1 << 4));
822 } 829 }