diff options
author | Adam Frisby | 2007-06-24 17:01:08 +0000 |
---|---|---|
committer | Adam Frisby | 2007-06-24 17:01:08 +0000 |
commit | 980a8cc629fe1228d450fa705fec3bacc3a84d98 (patch) | |
tree | 846a3fa7af7994a4c4948c46e28a3a5014f89251 /OpenSim | |
parent | A bit more work on the AssetCache. (diff) | |
download | opensim-SC_OLD-980a8cc629fe1228d450fa705fec3bacc3a84d98.zip opensim-SC_OLD-980a8cc629fe1228d450fa705fec3bacc3a84d98.tar.gz opensim-SC_OLD-980a8cc629fe1228d450fa705fec3bacc3a84d98.tar.bz2 opensim-SC_OLD-980a8cc629fe1228d450fa705fec3bacc3a84d98.tar.xz |
Refactoring:
* Renamed IPListenAddr to CommsIPListenAddr
* Renamed IPListenPort to CommsIPListenPort
New Features:
* Begun OGS/.1 implementation -- created new temporary "GridInfo" class to hold grid settings, needs reworking to wherever settings are stored these days.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs | 2 | ||||
-rw-r--r-- | OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs | 6 | ||||
-rw-r--r-- | OpenSim/OpenSim.Region/Scenes/Scene.cs | 9 | ||||
-rw-r--r-- | OpenSim/OpenSim.Region/Scenes/ScenePresence.cs | 2 | ||||
-rw-r--r-- | OpenSim/OpenSim/OpenSimMain.cs | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs index 4ca088b..ce48c6e 100644 --- a/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs +++ b/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.LocalCommunications | |||
51 | /// </summary> | 51 | /// </summary> |
52 | /// <param name="regionInfo"></param> | 52 | /// <param name="regionInfo"></param> |
53 | /// <returns></returns> | 53 | /// <returns></returns> |
54 | public RegionCommsListener RegisterRegion(RegionInfo regionInfo) | 54 | public RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo) |
55 | { | 55 | { |
56 | //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering"); | 56 | //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering"); |
57 | if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle)) | 57 | if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle)) |
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs index b8c6c3b..a7f7aa4 100644 --- a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs +++ b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs | |||
@@ -87,11 +87,11 @@ namespace OpenSim.LocalCommunications | |||
87 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + | 87 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + |
88 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; | 88 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; |
89 | string capsPath = Util.GetRandomCapsPath(); | 89 | string capsPath = Util.GetRandomCapsPath(); |
90 | response.SimAddress = reg.IPListenAddr; | 90 | response.SimAddress = reg.CommsIPListenAddr; |
91 | response.SimPort = (Int32)reg.IPListenPort; | 91 | response.SimPort = (Int32)reg.CommsIPListenPort; |
92 | response.RegionX = reg.RegionLocX ; | 92 | response.RegionX = reg.RegionLocX ; |
93 | response.RegionY = reg.RegionLocY ; | 93 | response.RegionY = reg.RegionLocY ; |
94 | response.SeedCapability = "http://" + reg.IPListenAddr + ":" + "9000" + "/CAPS/"+capsPath +"0000/"; | 94 | response.SeedCapability = "http://" + reg.CommsIPListenAddr + ":" + "9000" + "/CAPS/" + capsPath + "0000/"; |
95 | theUser.currentAgent.currentRegion = reg.SimUUID; | 95 | theUser.currentAgent.currentRegion = reg.SimUUID; |
96 | theUser.currentAgent.currentHandle = reg.RegionHandle; | 96 | theUser.currentAgent.currentHandle = reg.RegionHandle; |
97 | 97 | ||
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs index ad6d336..62edc4b 100644 --- a/OpenSim/OpenSim.Region/Scenes/Scene.cs +++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs | |||
@@ -704,7 +704,8 @@ namespace OpenSim.Region.Scenes | |||
704 | /// </summary> | 704 | /// </summary> |
705 | public void RegisterRegionWithComms() | 705 | public void RegisterRegionWithComms() |
706 | { | 706 | { |
707 | this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo); | 707 | GridInfo gridSettings = new GridInfo(); |
708 | this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo,gridSettings); | ||
708 | if (this.regionCommsHost != null) | 709 | if (this.regionCommsHost != null) |
709 | { | 710 | { |
710 | this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); | 711 | this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); |
@@ -726,7 +727,7 @@ namespace OpenSim.Region.Scenes | |||
726 | if (agent.CapsPath != "") | 727 | if (agent.CapsPath != "") |
727 | { | 728 | { |
728 | //Console.WriteLine("new user, so creating caps handler for it"); | 729 | //Console.WriteLine("new user, so creating caps handler for it"); |
729 | Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.IPListenAddr, 9000, agent.CapsPath, agent.AgentID); | 730 | Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID); |
730 | cap.RegisterHandlers(); | 731 | cap.RegisterHandlers(); |
731 | this.capsHandlers.Add(cap); | 732 | this.capsHandlers.Add(cap); |
732 | } | 733 | } |
@@ -765,7 +766,7 @@ namespace OpenSim.Region.Scenes | |||
765 | agent.startpos = new LLVector3(128, 128, 70); | 766 | agent.startpos = new LLVector3(128, 128, 70); |
766 | agent.child = true; | 767 | agent.child = true; |
767 | this.commsManager.InterRegion.InformRegionOfChildAgent(neighbours[i].RegionHandle, agent); | 768 | this.commsManager.InterRegion.InformRegionOfChildAgent(neighbours[i].RegionHandle, agent); |
768 | remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); | 769 | remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr), (ushort)neighbours[i].CommsIPListenPort); |
769 | } | 770 | } |
770 | } | 771 | } |
771 | } | 772 | } |
@@ -826,7 +827,7 @@ namespace OpenSim.Region.Scenes | |||
826 | agent.child = true; | 827 | agent.child = true; |
827 | this.commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent); | 828 | this.commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent); |
828 | this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position); | 829 | this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position); |
829 | remoteClient.SendRegionTeleport(regionHandle, 13, reg.IPListenAddr, (ushort)reg.IPListenPort, 4, (1 << 4)); | 830 | remoteClient.SendRegionTeleport(regionHandle, 13, reg.CommsIPListenAddr, (ushort)reg.CommsIPListenPort, 4, (1 << 4)); |
830 | } | 831 | } |
831 | //remoteClient.SendTeleportCancel(); | 832 | //remoteClient.SendTeleportCancel(); |
832 | } | 833 | } |
diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs index fe82130..e2e30b9 100644 --- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs +++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs | |||
@@ -444,7 +444,7 @@ namespace OpenSim.Region.Scenes | |||
444 | if (res) | 444 | if (res) |
445 | { | 445 | { |
446 | this.MakeChildAgent(); | 446 | this.MakeChildAgent(); |
447 | this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, System.Net.IPAddress.Parse(neighbourRegion.IPListenAddr), (ushort)neighbourRegion.IPListenPort); | 447 | this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, System.Net.IPAddress.Parse(neighbourRegion.CommsIPListenAddr), (ushort)neighbourRegion.CommsIPListenPort); |
448 | } | 448 | } |
449 | } | 449 | } |
450 | } | 450 | } |
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs index 4e2f599..e2dddaf 100644 --- a/OpenSim/OpenSim/OpenSimMain.cs +++ b/OpenSim/OpenSim/OpenSimMain.cs | |||
@@ -233,7 +233,7 @@ namespace OpenSim | |||
233 | regionDat.InitConfig(this.m_sandbox, regionConfig); | 233 | regionDat.InitConfig(this.m_sandbox, regionConfig); |
234 | regionConfig.Close(); | 234 | regionConfig.Close(); |
235 | 235 | ||
236 | udpServer = new UDPServer(regionDat.IPListenPort, this.AssetCache, this.InventoryCache, this.m_log, authenBase); | 236 | udpServer = new UDPServer(regionDat.CommsIPListenPort, this.AssetCache, this.InventoryCache, this.m_log, authenBase); |
237 | 237 | ||
238 | m_udpServer.Add(udpServer); | 238 | m_udpServer.Add(udpServer); |
239 | this.regionData.Add(regionDat); | 239 | this.regionData.Add(regionDat); |