Removed the additions from the last revision for the "ShowHelp" delegate handling, as it seems that system isn't in use anymore.

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;
 

 namespace OpenSim.Grid.Framework

 {

-    public delegate void ShowHelpDelegate(string[] helpArgs);

-

     public interface IUGAIMCore

     {

         T Get<T>();

         void RegisterInterface<T>(T iface);

         bool TryGet<T>(out T iface);

         BaseHttpServer GetHttpServer();

-        void RegisterConsoleHelpDelegate(ShowHelpDelegate showHelp);

     }

 }

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
         {
             return m_httpServer;
         }
-
-        public void RegisterConsoleHelpDelegate(ShowHelpDelegate showHelp)
-        {
-
-        }
         #endregion
     }
 }
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
         {
             return m_httpServer;
         }
-
-        public void RegisterConsoleHelpDelegate(ShowHelpDelegate showHelp)
-        {
-
-        }
         #endregion
     }
 }
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
 
         #region IUGAIMCore
         protected Dictionary<Type, object> m_moduleInterfaces = new Dictionary<Type, object>();
-        protected List<ShowHelpDelegate> m_showHelpDelegates = new List<ShowHelpDelegate>();
-
 
         /// <summary>
         /// Register an Module interface.
@@ -244,13 +242,7 @@ namespace OpenSim.Grid.UserServer
             return m_httpServer;
         }
 
-        public void RegisterConsoleHelpDelegate(ShowHelpDelegate showHelp)
-        {
-            lock (m_showHelpDelegates)
-            {
-                m_showHelpDelegates.Add(showHelp);
-            }
-        }
+     
         #endregion
         
         #region Console Command Handlers
@@ -258,14 +250,6 @@ namespace OpenSim.Grid.UserServer
         protected override void ShowHelp(string[] helpArgs)
         {
             base.ShowHelp(helpArgs);
-
-            lock (m_showHelpDelegates)
-            {
-                foreach (ShowHelpDelegate d in m_showHelpDelegates)
-                {
-                    d(helpArgs);
-                }
-            }
         }
         #endregion
 
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
 

         public void PostInitialise()

         {

-            m_core.RegisterConsoleHelpDelegate(ShowHelp);

         }

 

         public void RegisterHandlers(BaseHttpServer httpServer)

@@ -347,16 +346,6 @@ namespace OpenSim.Grid.UserServer
                     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

 }