Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge

author: Melanie 2011-10-12 01:30:14 +0100
committer: Melanie 2011-10-12 01:30:14 +0100
commit: 6af388ded9958b889700d8c3fc1d9f266cdf8759 (patch)
tree: 18289983c7f20e63e2ae8894b00324888515e202 /OpenSim/ApplicationPlugins
parent: Merge commit '413e299045112d4a1553929eb042e87587cb3d2e' into bigmerge (diff)
parent: When creating a new user on the comand line, give the option of allowing a UU... (diff)
download: opensim-SC_OLD-6af388ded9958b889700d8c3fc1d9f266cdf8759.zip
opensim-SC_OLD-6af388ded9958b889700d8c3fc1d9f266cdf8759.tar.gz
opensim-SC_OLD-6af388ded9958b889700d8c3fc1d9f266cdf8759.tar.bz2
opensim-SC_OLD-6af388ded9958b889700d8c3fc1d9f266cdf8759.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 94ab4da..76ff68b 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -3222,7 +3222,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
            UserAccount account = userAccountService.GetUserAccount(scopeID, firstName, lastName);
            if (null == account)
            {
-                account = new UserAccount(scopeID, firstName, lastName, email);
+                account = new UserAccount(scopeID, UUID.Random(), firstName, lastName, email);
                if (account.ServiceURLs == null || (account.ServiceURLs != null && account.ServiceURLs.Count == 0))
                {
                    account.ServiceURLs = new Dictionary<string, object>();
author	Melanie	2011-10-12 01:30:14 +0100
committer	Melanie	2011-10-12 01:30:14 +0100
commit	6af388ded9958b889700d8c3fc1d9f266cdf8759 (patch)
tree	18289983c7f20e63e2ae8894b00324888515e202 /OpenSim/ApplicationPlugins
parent	Merge commit '413e299045112d4a1553929eb042e87587cb3d2e' into bigmerge (diff)
parent	When creating a new user on the comand line, give the option of allowing a UU... (diff)
download	opensim-SC_OLD-6af388ded9958b889700d8c3fc1d9f266cdf8759.zip opensim-SC_OLD-6af388ded9958b889700d8c3fc1d9f266cdf8759.tar.gz opensim-SC_OLD-6af388ded9958b889700d8c3fc1d9f266cdf8759.tar.bz2 opensim-SC_OLD-6af388ded9958b889700d8c3fc1d9f266cdf8759.tar.xz

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 94ab4da..76ff68b 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -3222,7 +3222,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
3222	UserAccount account = userAccountService.GetUserAccount(scopeID, firstName, lastName);	3222	UserAccount account = userAccountService.GetUserAccount(scopeID, firstName, lastName);
3223	if (null == account)	3223	if (null == account)
3224	{	3224	{
3225	account = new UserAccount(scopeID, firstName, lastName, email);	3225	account = new UserAccount(scopeID, UUID.Random(), firstName, lastName, email);
3226	if (account.ServiceURLs == null \|\| (account.ServiceURLs != null && account.ServiceURLs.Count == 0))	3226	if (account.ServiceURLs == null \|\| (account.ServiceURLs != null && account.ServiceURLs.Count == 0))
3227	{	3227	{
3228	account.ServiceURLs = new Dictionary<string, object>();	3228	account.ServiceURLs = new Dictionary<string, object>();