diff options
author | Diva Canto | 2010-01-13 10:15:14 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-13 10:15:14 -0800 |
commit | d939668d6a54bb25cbc56ec840058c08992fe536 (patch) | |
tree | 3010c25757d314b2adc0cf1709d718721a062e9e | |
parent | One more buglet removed: send the region UUID, not the region handle. (diff) | |
download | opensim-SC_OLD-d939668d6a54bb25cbc56ec840058c08992fe536.zip opensim-SC_OLD-d939668d6a54bb25cbc56ec840058c08992fe536.tar.gz opensim-SC_OLD-d939668d6a54bb25cbc56ec840058c08992fe536.tar.bz2 opensim-SC_OLD-d939668d6a54bb25cbc56ec840058c08992fe536.tar.xz |
Bug fix in create user: create inventory was missing.
-rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 12 | ||||
-rw-r--r-- | bin/OpenSim.Server.ini.example | 6 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 3 |
3 files changed, 20 insertions, 1 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index a1dbb1e..c55013f 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
@@ -47,6 +47,7 @@ namespace OpenSim.Services.UserAccountService | |||
47 | protected IGridService m_GridService; | 47 | protected IGridService m_GridService; |
48 | protected IAuthenticationService m_AuthenticationService; | 48 | protected IAuthenticationService m_AuthenticationService; |
49 | protected IPresenceService m_PresenceService; | 49 | protected IPresenceService m_PresenceService; |
50 | protected IInventoryService m_InventoryService; | ||
50 | 51 | ||
51 | public UserAccountService(IConfigSource config) | 52 | public UserAccountService(IConfigSource config) |
52 | : base(config) | 53 | : base(config) |
@@ -72,6 +73,10 @@ namespace OpenSim.Services.UserAccountService | |||
72 | if (presenceServiceDll != string.Empty) | 73 | if (presenceServiceDll != string.Empty) |
73 | m_PresenceService = LoadPlugin<IPresenceService>(presenceServiceDll, new Object[] { config }); | 74 | m_PresenceService = LoadPlugin<IPresenceService>(presenceServiceDll, new Object[] { config }); |
74 | 75 | ||
76 | string invServiceDll = userConfig.GetString("InventoryService", string.Empty); | ||
77 | if (invServiceDll != string.Empty) | ||
78 | m_InventoryService = LoadPlugin<IInventoryService>(invServiceDll, new Object[] { config }); | ||
79 | |||
75 | MainConsole.Instance.Commands.AddCommand("UserService", false, | 80 | MainConsole.Instance.Commands.AddCommand("UserService", false, |
76 | "create user", | 81 | "create user", |
77 | "create user [<first> [<last> [<pass> [<email>]]]]", | 82 | "create user [<first> [<last> [<pass> [<email>]]]]", |
@@ -291,6 +296,13 @@ namespace OpenSim.Services.UserAccountService | |||
291 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to retrieve home region for account {0} {1}.", | 296 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to retrieve home region for account {0} {1}.", |
292 | firstName, lastName); | 297 | firstName, lastName); |
293 | 298 | ||
299 | if (m_InventoryService != null) | ||
300 | success = m_InventoryService.CreateUserInventory(account.PrincipalID); | ||
301 | if (!success) | ||
302 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to create inventory for account {0} {1}.", | ||
303 | firstName, lastName); | ||
304 | |||
305 | |||
294 | m_log.InfoFormat("[USER ACCOUNT SERVICE]: Account {0} {1} created successfully", firstName, lastName); | 306 | m_log.InfoFormat("[USER ACCOUNT SERVICE]: Account {0} {1} created successfully", firstName, lastName); |
295 | } | 307 | } |
296 | } | 308 | } |
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index d072ed4..81b5302 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example | |||
@@ -88,6 +88,12 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S | |||
88 | StorageProvider = "OpenSim.Data.MySQL.dll" | 88 | StorageProvider = "OpenSim.Data.MySQL.dll" |
89 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" | 89 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" |
90 | ; Realm = "useraccounts" | 90 | ; Realm = "useraccounts" |
91 | ;; These are for creating new accounts by the service | ||
92 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | ||
93 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | ||
94 | GridService = "OpenSim.Services.GridService.dll:GridService" | ||
95 | InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" | ||
96 | |||
91 | 97 | ||
92 | [PresenceService] | 98 | [PresenceService] |
93 | ; for the server connector | 99 | ; for the server connector |
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 277d05a..a3e0547 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -72,10 +72,11 @@ | |||
72 | 72 | ||
73 | [UserAccountService] | 73 | [UserAccountService] |
74 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 74 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
75 | ;; These are for creating new accounts | 75 | ;; These are for creating new accounts by the service |
76 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 76 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
77 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 77 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
78 | GridService = "OpenSim.Services.GridService.dll:GridService" | 78 | GridService = "OpenSim.Services.GridService.dll:GridService" |
79 | InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" | ||
79 | 80 | ||
80 | [LoginService] | 81 | [LoginService] |
81 | LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" | 82 | LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" |