diff options
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-rw-r--r-- | OpenSim/Region/Communications/Local/CommunicationsLocal.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalLoginService.cs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index e2a953c..9ff9133 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs | |||
@@ -33,6 +33,7 @@ using OpenSim.Framework.Communications.Caches; | |||
33 | using OpenSim.Framework.Console; | 33 | using OpenSim.Framework.Console; |
34 | using OpenSim.Framework.Utilities; | 34 | using OpenSim.Framework.Utilities; |
35 | using OpenSim.Framework.Data; | 35 | using OpenSim.Framework.Data; |
36 | using OpenSim.Framework.UserManagement; | ||
36 | 37 | ||
37 | namespace OpenSim.Region.Communications.Local | 38 | namespace OpenSim.Region.Communications.Local |
38 | { | 39 | { |
@@ -42,6 +43,7 @@ namespace OpenSim.Region.Communications.Local | |||
42 | public LocalUserServices UserServices; | 43 | public LocalUserServices UserServices; |
43 | public LocalLoginService LoginServices; | 44 | public LocalLoginService LoginServices; |
44 | public LocalInventoryService InvenServices; | 45 | public LocalInventoryService InvenServices; |
46 | // public CAPSService CapsServices; | ||
45 | 47 | ||
46 | public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, bool accountsAuthenticate, string welcomeMessage ) | 48 | public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, bool accountsAuthenticate, string welcomeMessage ) |
47 | : base(serversInfo, httpServer, assetCache) | 49 | : base(serversInfo, httpServer, assetCache) |
@@ -57,6 +59,8 @@ namespace OpenSim.Region.Communications.Local | |||
57 | InstanceServices = new LocalBackEndServices(); | 59 | InstanceServices = new LocalBackEndServices(); |
58 | GridServer = InstanceServices; | 60 | GridServer = InstanceServices; |
59 | InterRegion = InstanceServices; | 61 | InterRegion = InstanceServices; |
62 | |||
63 | //CapsServices = new CAPSService(httpServer); | ||
60 | 64 | ||
61 | LoginServices = new LocalLoginService(UserServices, welcomeMessage, this, serversInfo, accountsAuthenticate); | 65 | LoginServices = new LocalLoginService(UserServices, welcomeMessage, this, serversInfo, accountsAuthenticate); |
62 | httpServer.AddXmlRPCHandler("login_to_simulator", LoginServices.XmlRpcLoginMethod); | 66 | httpServer.AddXmlRPCHandler("login_to_simulator", LoginServices.XmlRpcLoginMethod); |
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 88377bc..d3b76de 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -90,6 +90,7 @@ namespace OpenSim.Region.Communications.Local | |||
90 | response.RegionY = reg.RegionLocY; | 90 | response.RegionY = reg.RegionLocY; |
91 | 91 | ||
92 | response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; | 92 | response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; |
93 | // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/"; | ||
93 | theUser.currentAgent.currentRegion = reg.SimUUID; | 94 | theUser.currentAgent.currentRegion = reg.SimUUID; |
94 | theUser.currentAgent.currentHandle = reg.RegionHandle; | 95 | theUser.currentAgent.currentHandle = reg.RegionHandle; |
95 | 96 | ||