aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/UserAccountService
diff options
context:
space:
mode:
authorJohn Hurliman2010-02-22 14:10:19 -0800
committerJohn Hurliman2010-02-22 14:10:19 -0800
commit71c6559a91a58d93588dcdd8c74b5fce0c1a3780 (patch)
treecca5b1ea88ad4b29156767afdd77e37ec072c8a7 /OpenSim/Services/UserAccountService
parent* Adds CreatorID to asset metadata. This is just the plumbing to support Crea... (diff)
parentMerge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff)
downloadopensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.zip
opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.gz
opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.bz2
opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.xz
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Services/UserAccountService')
-rw-r--r--OpenSim/Services/UserAccountService/UserAccountService.cs17
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index ffb9cca..e498bd5 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -77,13 +77,16 @@ namespace OpenSim.Services.UserAccountService
77 if (invServiceDll != string.Empty) 77 if (invServiceDll != string.Empty)
78 m_InventoryService = LoadPlugin<IInventoryService>(invServiceDll, new Object[] { config }); 78 m_InventoryService = LoadPlugin<IInventoryService>(invServiceDll, new Object[] { config });
79 79
80 MainConsole.Instance.Commands.AddCommand("UserService", false, 80 if (MainConsole.Instance != null)
81 "create user", 81 {
82 "create user [<first> [<last> [<pass> [<email>]]]]", 82 MainConsole.Instance.Commands.AddCommand("UserService", false,
83 "Create a new user", HandleCreateUser); 83 "create user",
84 MainConsole.Instance.Commands.AddCommand("UserService", false, "reset user password", 84 "create user [<first> [<last> [<pass> [<email>]]]]",
85 "reset user password [<first> [<last> [<password>]]]", 85 "Create a new user", HandleCreateUser);
86 "Reset a user password", HandleResetUserPassword); 86 MainConsole.Instance.Commands.AddCommand("UserService", false, "reset user password",
87 "reset user password [<first> [<last> [<password>]]]",
88 "Reset a user password", HandleResetUserPassword);
89 }
87 90
88 } 91 }
89 92