Removed the additions from the last revision for the "ShowHelp" delegate handling, as it seems that system isn't in use anymore.
parent
1e2835a10c
commit
8645fa9215
|
@ -30,14 +30,11 @@ using OpenSim.Framework.Servers;
|
||||||
|
|
||||||
namespace OpenSim.Grid.Framework
|
namespace OpenSim.Grid.Framework
|
||||||
{
|
{
|
||||||
public delegate void ShowHelpDelegate(string[] helpArgs);
|
|
||||||
|
|
||||||
public interface IUGAIMCore
|
public interface IUGAIMCore
|
||||||
{
|
{
|
||||||
T Get<T>();
|
T Get<T>();
|
||||||
void RegisterInterface<T>(T iface);
|
void RegisterInterface<T>(T iface);
|
||||||
bool TryGet<T>(out T iface);
|
bool TryGet<T>(out T iface);
|
||||||
BaseHttpServer GetHttpServer();
|
BaseHttpServer GetHttpServer();
|
||||||
void RegisterConsoleHelpDelegate(ShowHelpDelegate showHelp);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -255,11 +255,6 @@ namespace OpenSim.Grid.GridServer
|
||||||
{
|
{
|
||||||
return m_httpServer;
|
return m_httpServer;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RegisterConsoleHelpDelegate(ShowHelpDelegate showHelp)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -245,11 +245,6 @@ namespace OpenSim.Grid.MessagingServer
|
||||||
{
|
{
|
||||||
return m_httpServer;
|
return m_httpServer;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RegisterConsoleHelpDelegate(ShowHelpDelegate showHelp)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -204,8 +204,6 @@ namespace OpenSim.Grid.UserServer
|
||||||
|
|
||||||
#region IUGAIMCore
|
#region IUGAIMCore
|
||||||
protected Dictionary<Type, object> m_moduleInterfaces = new Dictionary<Type, object>();
|
protected Dictionary<Type, object> m_moduleInterfaces = new Dictionary<Type, object>();
|
||||||
protected List<ShowHelpDelegate> m_showHelpDelegates = new List<ShowHelpDelegate>();
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Register an Module interface.
|
/// Register an Module interface.
|
||||||
|
@ -244,13 +242,7 @@ namespace OpenSim.Grid.UserServer
|
||||||
return m_httpServer;
|
return m_httpServer;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RegisterConsoleHelpDelegate(ShowHelpDelegate showHelp)
|
|
||||||
{
|
|
||||||
lock (m_showHelpDelegates)
|
|
||||||
{
|
|
||||||
m_showHelpDelegates.Add(showHelp);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Console Command Handlers
|
#region Console Command Handlers
|
||||||
|
@ -258,14 +250,6 @@ namespace OpenSim.Grid.UserServer
|
||||||
protected override void ShowHelp(string[] helpArgs)
|
protected override void ShowHelp(string[] helpArgs)
|
||||||
{
|
{
|
||||||
base.ShowHelp(helpArgs);
|
base.ShowHelp(helpArgs);
|
||||||
|
|
||||||
lock (m_showHelpDelegates)
|
|
||||||
{
|
|
||||||
foreach (ShowHelpDelegate d in m_showHelpDelegates)
|
|
||||||
{
|
|
||||||
d(helpArgs);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,6 @@ namespace OpenSim.Grid.UserServer
|
||||||
|
|
||||||
public void PostInitialise()
|
public void PostInitialise()
|
||||||
{
|
{
|
||||||
m_core.RegisterConsoleHelpDelegate(ShowHelp);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RegisterHandlers(BaseHttpServer httpServer)
|
public void RegisterHandlers(BaseHttpServer httpServer)
|
||||||
|
@ -347,16 +346,6 @@ namespace OpenSim.Grid.UserServer
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ShowHelp(string[] helpArgs)
|
|
||||||
{
|
|
||||||
m_console.Notice("create user - create a new user");
|
|
||||||
m_console.Notice("logoff-user <firstname> <lastname> <message> - logs off the specified user from the grid");
|
|
||||||
m_console.Notice("reset user password - reset a user's password.");
|
|
||||||
m_console.Notice("login-level <value> - Set the miminim userlevel allowed To login.");
|
|
||||||
m_console.Notice("login-reset - reset the login level to its default value.");
|
|
||||||
m_console.Notice("login-text <text to print during the login>");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue