aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController
diff options
context:
space:
mode:
authorMelanie2010-04-19 07:00:40 +0100
committerMelanie2010-04-19 07:00:40 +0100
commit98cb4f74b265dfb8ca3eb8c8d3ad604249398df1 (patch)
tree1339d3707430a20662bdcd3eb4e9ef86abc6a4fd /OpenSim/ApplicationPlugins/RemoteController
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentAll scripts are now created suspended and are only unsuspended when the object (diff)
downloadopensim-SC_OLD-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.zip
opensim-SC_OLD-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.tar.gz
opensim-SC_OLD-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.tar.bz2
opensim-SC_OLD-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 0c1e3ca..9f6414b 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1130,7 +1130,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1130 throw new Exception(String.Format("Account {0} {1} already exists", firstname, lastname)); 1130 throw new Exception(String.Format("Account {0} {1} already exists", firstname, lastname));
1131 1131
1132 account = new UserAccount(scopeID, firstname, lastname, email); 1132 account = new UserAccount(scopeID, firstname, lastname, email);
1133 // REFACTORING PROBLEM: no method to set the password!
1134 1133
1135 bool success = m_app.SceneManager.CurrentOrFirstScene.UserAccountService.StoreUserAccount(account); 1134 bool success = m_app.SceneManager.CurrentOrFirstScene.UserAccountService.StoreUserAccount(account);
1136 1135
@@ -1138,6 +1137,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1138 throw new Exception(String.Format("failed to create new user {0} {1}", 1137 throw new Exception(String.Format("failed to create new user {0} {1}",
1139 firstname, lastname)); 1138 firstname, lastname));
1140 1139
1140 // Store the password
1141 m_app.SceneManager.CurrentOrFirstScene.AuthenticationService.SetPassword(account.PrincipalID, passwd);
1142
1141 GridRegion home = m_app.SceneManager.CurrentOrFirstScene.GridService.GetRegionByPosition(scopeID, 1143 GridRegion home = m_app.SceneManager.CurrentOrFirstScene.GridService.GetRegionByPosition(scopeID,
1142 (int)(regX * Constants.RegionSize), (int)(regY * Constants.RegionSize)); 1144 (int)(regX * Constants.RegionSize), (int)(regY * Constants.RegionSize));
1143 if (home == null) 1145 if (home == null)