diff options
author | MW | 2009-02-24 18:06:06 +0000 |
---|---|---|
committer | MW | 2009-02-24 18:06:06 +0000 |
commit | 8645fa9215575a42e2f6a21b3d2284f8c19e4b27 (patch) | |
tree | 025dc78641d56e9cac08d4bd708eea5be3818cc8 /OpenSim/Grid | |
parent | More refactoring of the Grid/user/messaging servers. (diff) | |
download | opensim-SC-8645fa9215575a42e2f6a21b3d2284f8c19e4b27.zip opensim-SC-8645fa9215575a42e2f6a21b3d2284f8c19e4b27.tar.gz opensim-SC-8645fa9215575a42e2f6a21b3d2284f8c19e4b27.tar.bz2 opensim-SC-8645fa9215575a42e2f6a21b3d2284f8c19e4b27.tar.xz |
Removed the additions from the last revision for the "ShowHelp" delegate handling, as it seems that system isn't in use anymore.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/Framework/IUGAIMCore.cs | 3 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs | 5 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/Main.cs | 5 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 18 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserServerCommandModule.cs | 11 |
5 files changed, 1 insertions, 41 deletions
diff --git a/OpenSim/Grid/Framework/IUGAIMCore.cs b/OpenSim/Grid/Framework/IUGAIMCore.cs index 77245ce..a7df0d4 100644 --- a/OpenSim/Grid/Framework/IUGAIMCore.cs +++ b/OpenSim/Grid/Framework/IUGAIMCore.cs | |||
@@ -30,14 +30,11 @@ using OpenSim.Framework.Servers; | |||
30 | 30 | ||
31 | namespace OpenSim.Grid.Framework | 31 | namespace OpenSim.Grid.Framework |
32 | { | 32 | { |
33 | public delegate void ShowHelpDelegate(string[] helpArgs); | ||
34 | |||
35 | public interface IUGAIMCore | 33 | public interface IUGAIMCore |
36 | { | 34 | { |
37 | T Get<T>(); | 35 | T Get<T>(); |
38 | void RegisterInterface<T>(T iface); | 36 | void RegisterInterface<T>(T iface); |
39 | bool TryGet<T>(out T iface); | 37 | bool TryGet<T>(out T iface); |
40 | BaseHttpServer GetHttpServer(); | 38 | BaseHttpServer GetHttpServer(); |
41 | void RegisterConsoleHelpDelegate(ShowHelpDelegate showHelp); | ||
42 | } | 39 | } |
43 | } | 40 | } |
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index 70dd8a6..54a9443 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs | |||
@@ -255,11 +255,6 @@ namespace OpenSim.Grid.GridServer | |||
255 | { | 255 | { |
256 | return m_httpServer; | 256 | return m_httpServer; |
257 | } | 257 | } |
258 | |||
259 | public void RegisterConsoleHelpDelegate(ShowHelpDelegate showHelp) | ||
260 | { | ||
261 | |||
262 | } | ||
263 | #endregion | 258 | #endregion |
264 | } | 259 | } |
265 | } | 260 | } |
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index 07d0580..53c5e28 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs | |||
@@ -245,11 +245,6 @@ namespace OpenSim.Grid.MessagingServer | |||
245 | { | 245 | { |
246 | return m_httpServer; | 246 | return m_httpServer; |
247 | } | 247 | } |
248 | |||
249 | public void RegisterConsoleHelpDelegate(ShowHelpDelegate showHelp) | ||
250 | { | ||
251 | |||
252 | } | ||
253 | #endregion | 248 | #endregion |
254 | } | 249 | } |
255 | } | 250 | } |
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 49b0071..10235ab 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -204,8 +204,6 @@ namespace OpenSim.Grid.UserServer | |||
204 | 204 | ||
205 | #region IUGAIMCore | 205 | #region IUGAIMCore |
206 | protected Dictionary<Type, object> m_moduleInterfaces = new Dictionary<Type, object>(); | 206 | protected Dictionary<Type, object> m_moduleInterfaces = new Dictionary<Type, object>(); |
207 | protected List<ShowHelpDelegate> m_showHelpDelegates = new List<ShowHelpDelegate>(); | ||
208 | |||
209 | 207 | ||
210 | /// <summary> | 208 | /// <summary> |
211 | /// Register an Module interface. | 209 | /// Register an Module interface. |
@@ -244,13 +242,7 @@ namespace OpenSim.Grid.UserServer | |||
244 | return m_httpServer; | 242 | return m_httpServer; |
245 | } | 243 | } |
246 | 244 | ||
247 | public void RegisterConsoleHelpDelegate(ShowHelpDelegate showHelp) | 245 | |
248 | { | ||
249 | lock (m_showHelpDelegates) | ||
250 | { | ||
251 | m_showHelpDelegates.Add(showHelp); | ||
252 | } | ||
253 | } | ||
254 | #endregion | 246 | #endregion |
255 | 247 | ||
256 | #region Console Command Handlers | 248 | #region Console Command Handlers |
@@ -258,14 +250,6 @@ namespace OpenSim.Grid.UserServer | |||
258 | protected override void ShowHelp(string[] helpArgs) | 250 | protected override void ShowHelp(string[] helpArgs) |
259 | { | 251 | { |
260 | base.ShowHelp(helpArgs); | 252 | base.ShowHelp(helpArgs); |
261 | |||
262 | lock (m_showHelpDelegates) | ||
263 | { | ||
264 | foreach (ShowHelpDelegate d in m_showHelpDelegates) | ||
265 | { | ||
266 | d(helpArgs); | ||
267 | } | ||
268 | } | ||
269 | } | 253 | } |
270 | #endregion | 254 | #endregion |
271 | 255 | ||
diff --git a/OpenSim/Grid/UserServer/UserServerCommandModule.cs b/OpenSim/Grid/UserServer/UserServerCommandModule.cs index f3dfc23..d923c9a 100644 --- a/OpenSim/Grid/UserServer/UserServerCommandModule.cs +++ b/OpenSim/Grid/UserServer/UserServerCommandModule.cs | |||
@@ -73,7 +73,6 @@ namespace OpenSim.Grid.UserServer | |||
73 | 73 | ||
74 | public void PostInitialise() | 74 | public void PostInitialise() |
75 | { | 75 | { |
76 | m_core.RegisterConsoleHelpDelegate(ShowHelp); | ||
77 | } | 76 | } |
78 | 77 | ||
79 | public void RegisterHandlers(BaseHttpServer httpServer) | 78 | public void RegisterHandlers(BaseHttpServer httpServer) |
@@ -347,16 +346,6 @@ namespace OpenSim.Grid.UserServer | |||
347 | break; | 346 | break; |
348 | } | 347 | } |
349 | } | 348 | } |
350 | |||
351 | public void ShowHelp(string[] helpArgs) | ||
352 | { | ||
353 | m_console.Notice("create user - create a new user"); | ||
354 | m_console.Notice("logoff-user <firstname> <lastname> <message> - logs off the specified user from the grid"); | ||
355 | m_console.Notice("reset user password - reset a user's password."); | ||
356 | m_console.Notice("login-level <value> - Set the miminim userlevel allowed To login."); | ||
357 | m_console.Notice("login-reset - reset the login level to its default value."); | ||
358 | m_console.Notice("login-text <text to print during the login>"); | ||
359 | } | ||
360 | } | 349 | } |
361 | #endregion | 350 | #endregion |
362 | } | 351 | } |