diff options
Diffstat (limited to 'OpenSim/Region/Communications/Hypergrid')
3 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs index 002ea17..e80f6ab 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs | |||
@@ -50,11 +50,11 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
50 | HGUserServices userServices = new HGUserServices(this); | 50 | HGUserServices userServices = new HGUserServices(this); |
51 | // This plugin arrangement could eventually be configurable rather than hardcoded here. | 51 | // This plugin arrangement could eventually be configurable rather than hardcoded here. |
52 | userServices.AddPlugin(new TemporaryUserProfilePlugin()); | 52 | userServices.AddPlugin(new TemporaryUserProfilePlugin()); |
53 | userServices.AddPlugin(new HGUserDataPlugin(this, userServices)); | 53 | userServices.AddPlugin(new HGUserDataPlugin(this, userServices)); |
54 | 54 | ||
55 | m_userService = userServices; | 55 | m_userService = userServices; |
56 | m_messageService = userServices; | 56 | m_messageService = userServices; |
57 | m_avatarService = userServices; | 57 | m_avatarService = userServices; |
58 | } | 58 | } |
59 | } | 59 | } |
60 | } | 60 | } |
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs index f5126ca..4e3f5a1 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs | |||
@@ -41,13 +41,13 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
41 | public class HGCommunicationsStandalone : CommunicationsManager | 41 | public class HGCommunicationsStandalone : CommunicationsManager |
42 | { | 42 | { |
43 | public HGCommunicationsStandalone( | 43 | public HGCommunicationsStandalone( |
44 | ConfigSettings configSettings, | 44 | ConfigSettings configSettings, |
45 | NetworkServersInfo serversInfo, | 45 | NetworkServersInfo serversInfo, |
46 | BaseHttpServer httpServer, | 46 | BaseHttpServer httpServer, |
47 | LibraryRootFolder libraryRootFolder, | 47 | LibraryRootFolder libraryRootFolder, |
48 | bool dumpAssetsToFile) | 48 | bool dumpAssetsToFile) |
49 | : base(serversInfo, libraryRootFolder) | 49 | : base(serversInfo, libraryRootFolder) |
50 | { | 50 | { |
51 | LocalUserServices localUserService = | 51 | LocalUserServices localUserService = |
52 | new LocalUserServices( | 52 | new LocalUserServices( |
53 | serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); | 53 | serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); |
@@ -58,8 +58,8 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
58 | hgUserService.AddPlugin(new TemporaryUserProfilePlugin()); | 58 | hgUserService.AddPlugin(new TemporaryUserProfilePlugin()); |
59 | hgUserService.AddPlugin(new HGUserDataPlugin(this, hgUserService)); | 59 | hgUserService.AddPlugin(new HGUserDataPlugin(this, hgUserService)); |
60 | 60 | ||
61 | m_userService = hgUserService; | 61 | m_userService = hgUserService; |
62 | m_userAdminService = hgUserService; | 62 | m_userAdminService = hgUserService; |
63 | m_avatarService = hgUserService; | 63 | m_avatarService = hgUserService; |
64 | m_messageService = hgUserService; | 64 | m_messageService = hgUserService; |
65 | 65 | ||
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs index f1a56ef..49a2261 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | |||
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
87 | return m_localUserServices.AddUserAgent(agentdata); | 87 | return m_localUserServices.AddUserAgent(agentdata); |
88 | 88 | ||
89 | return base.AddUserAgent(agentdata); | 89 | return base.AddUserAgent(agentdata); |
90 | } | 90 | } |
91 | 91 | ||
92 | public override UserAgentData GetAgentByUUID(UUID userId) | 92 | public override UserAgentData GetAgentByUUID(UUID userId) |
93 | { | 93 | { |