diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs (renamed from OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs) | 93 |
1 files changed, 56 insertions, 37 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs index 10d6f80..6d975af 100644 --- a/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -26,75 +26,94 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Reflection; | 29 | using System.Reflection; |
30 | using System.Collections.Generic; | ||
32 | using log4net; | 31 | using log4net; |
33 | using Nwc.XmlRpc; | 32 | using Nini.Config; |
34 | using OpenMetaverse; | ||
35 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications; | ||
37 | using OpenSim.Framework.Servers; | ||
38 | using OpenSim.Framework.Servers.HttpServer; | 34 | using OpenSim.Framework.Servers.HttpServer; |
39 | using OpenSim.Grid.Framework; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.Framework.Interfaces; | ||
37 | using OpenSim.Server.Base; | ||
38 | using OpenSim.Server.Handlers.Base; | ||
39 | using OpenSim.Server.Handlers.Grid; | ||
40 | using OpenSim.Services.Interfaces; | ||
40 | 41 | ||
41 | namespace OpenSim.Grid.UserServer.Modules | 42 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid |
42 | { | 43 | { |
43 | public class UserDataBaseService : UserManagerBase | 44 | public class GridInfoServiceInConnectorModule : ISharedRegionModule |
44 | { | 45 | { |
45 | protected IGridServiceCore m_core; | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | private static bool m_Enabled = false; | ||
48 | |||
49 | private IConfigSource m_Config; | ||
50 | bool m_Registered = false; | ||
46 | 51 | ||
47 | public UserDataBaseService(CommunicationsManager commsManager) | 52 | #region IRegionModule interface |
48 | : base(commsManager) | ||
49 | { | ||
50 | } | ||
51 | 53 | ||
52 | public void Initialise(IGridServiceCore core) | 54 | public void Initialise(IConfigSource config) |
53 | { | 55 | { |
54 | m_core = core; | 56 | m_Config = config; |
55 | 57 | IConfig moduleConfig = config.Configs["Modules"]; | |
56 | UserConfig cfg; | 58 | if (moduleConfig != null) |
57 | if (m_core.TryGet<UserConfig>(out cfg)) | ||
58 | { | 59 | { |
59 | AddPlugin(cfg.DatabaseProvider, cfg.DatabaseConnect); | 60 | m_Enabled = moduleConfig.GetBoolean("GridInfoServiceInConnector", false); |
61 | if (m_Enabled) | ||
62 | { | ||
63 | m_log.Info("[GRIDINFO IN CONNECTOR]: GridInfo Service In Connector enabled"); | ||
64 | } | ||
65 | |||
60 | } | 66 | } |
61 | 67 | ||
62 | m_core.RegisterInterface<UserDataBaseService>(this); | ||
63 | } | 68 | } |
64 | 69 | ||
65 | public void PostInitialise() | 70 | public void PostInitialise() |
66 | { | 71 | { |
67 | } | 72 | } |
68 | 73 | ||
69 | public void RegisterHandlers(BaseHttpServer httpServer) | 74 | public void Close() |
70 | { | 75 | { |
71 | } | 76 | } |
72 | 77 | ||
73 | public UserAgentData GetUserAgentData(UUID AgentID) | 78 | public Type ReplaceableInterface |
74 | { | 79 | { |
75 | UserProfileData userProfile = GetUserProfile(AgentID); | 80 | get { return null; } |
76 | 81 | } | |
77 | if (userProfile != null) | ||
78 | { | ||
79 | return userProfile.CurrentAgent; | ||
80 | } | ||
81 | 82 | ||
82 | return null; | 83 | public string Name |
84 | { | ||
85 | get { return "GridInfoService"; } | ||
83 | } | 86 | } |
84 | 87 | ||
85 | public override UserProfileData SetupMasterUser(string firstName, string lastName) | 88 | public void AddRegion(Scene scene) |
86 | { | 89 | { |
87 | throw new Exception("The method or operation is not implemented."); | 90 | if (!m_Enabled) |
91 | return; | ||
88 | } | 92 | } |
89 | 93 | ||
90 | public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) | 94 | public void RemoveRegion(Scene scene) |
91 | { | 95 | { |
92 | throw new Exception("The method or operation is not implemented."); | 96 | if (!m_Enabled) |
97 | return; | ||
93 | } | 98 | } |
94 | 99 | ||
95 | public override UserProfileData SetupMasterUser(UUID uuid) | 100 | public void RegionLoaded(Scene scene) |
96 | { | 101 | { |
97 | throw new Exception("The method or operation is not implemented."); | 102 | if (!m_Enabled) |
103 | return; | ||
104 | |||
105 | if (!m_Registered) | ||
106 | { | ||
107 | m_Registered = true; | ||
108 | |||
109 | m_log.Info("[GridInfo]: Starting..."); | ||
110 | |||
111 | new GridInfoServerInConnector(m_Config, MainServer.Instance, "GridInfoService"); | ||
112 | } | ||
113 | |||
98 | } | 114 | } |
115 | |||
116 | #endregion | ||
117 | |||
99 | } | 118 | } |
100 | } | 119 | } |