Add proper handling for shared vs. unshared modules to the command

interface. Shared modules will now only get added once, so the command
handler is called once per module, not once per scene. Removal of scenes
has no adverse effects. Nonshared modules will be called for each scene.

4 files changed, 15 insertions, 13 deletions

diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 3fb07b5..9cc25e8 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -114,15 +114,17 @@ namespace OpenSim.Grid.GridServer
 
             base.StartupSpecific();
 
-            m_console.Commands.AddCommand("gridserver", "enable registration",
+            m_console.Commands.AddCommand("gridserver", false,
+                    "enable registration",
                     "enable registration",
                     "Enable new regions to register", HandleRegistration);
 
-            m_console.Commands.AddCommand("gridserver", "disable registration",
+            m_console.Commands.AddCommand("gridserver", false,
+                    "disable registration",
                     "disable registration",
                     "Disable registering new regions", HandleRegistration);
 
-            m_console.Commands.AddCommand("gridserver", "show status",
+            m_console.Commands.AddCommand("gridserver", false, "show status",
                     "show status",
                     "Show registration status", HandleShowStatus);
         }
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 4727f6e..862ae58 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Grid.InventoryServer
 
             base.StartupSpecific();
 
-            m_console.Commands.AddCommand("inventoryserver", "add user",
+            m_console.Commands.AddCommand("inventoryserver", false, "add user",
                     "add user",
                     "Add a random user inventory", HandleAddUser);
         }
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 9b7e731..13f52ab 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -127,11 +127,11 @@ namespace OpenSim.Grid.MessagingServer
 
             base.StartupSpecific();
 
-            m_console.Commands.AddCommand("messageserver", "clear cache",
+            m_console.Commands.AddCommand("messageserver", false, "clear cache",
                     "clear cache",
                     "Clear presence cache", HandleClearCache);
 
-            m_console.Commands.AddCommand("messageserver", "register",
+            m_console.Commands.AddCommand("messageserver", false, "register",
                     "register",
                     "Re-register with user server(s)", HandleRegister);
         }
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 0b0bee1..dd3f0b7 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -122,32 +122,32 @@ namespace OpenSim.Grid.UserServer
             
             base.StartupSpecific();
 
-            m_console.Commands.AddCommand("userserver", "create user",
+            m_console.Commands.AddCommand("userserver", false, "create user",
                     "create user [<first> [<last> [<x> <y> [email]]]]",
                     "Create a new user account", RunCommand);
 
-            m_console.Commands.AddCommand("userserver", "reset user password",
+            m_console.Commands.AddCommand("userserver", false, "reset user password",
                     "reset user password [<first> [<last> [<new password>]]]",
                     "Reset a user's password", RunCommand);
 
-            m_console.Commands.AddCommand("userserver", "login level",
+            m_console.Commands.AddCommand("userserver", false, "login level",
                     "login level <level>",
                     "Set the minimum user level to log in", HandleLoginCommand);
 
-            m_console.Commands.AddCommand("userserver", "login reset",
+            m_console.Commands.AddCommand("userserver", false, "login reset",
                     "login reset",
                     "Reset the login level to allow all users",
                     HandleLoginCommand);
 
-            m_console.Commands.AddCommand("userserver", "login text",
+            m_console.Commands.AddCommand("userserver", false, "login text",
                     "login text <text>",
                     "Set the text users will see on login", HandleLoginCommand);
 
-            m_console.Commands.AddCommand("userserver", "test-inventory",
+            m_console.Commands.AddCommand("userserver", false, "test-inventory",
                     "test-inventory",
                     "Perform a test inventory transaction", RunCommand);
 
-            m_console.Commands.AddCommand("userserver", "logoff-user",
+            m_console.Commands.AddCommand("userserver", false, "logoff-user",
                     "logoff-user <first> <last> <message>",
                     "Log off a named user", RunCommand);
         }