aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-28 15:34:30 +0000
committerJustin Clarke Casey2008-11-28 15:34:30 +0000
commit0862627b341641ec0223bb4191dfee8d85724c9e (patch)
treeef1815b067c345aa92a81375f12137a3e47876f3 /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
parent* Changed name of auth function to better reflect actual use (diff)
downloadopensim-SC-0862627b341641ec0223bb4191dfee8d85724c9e.zip
opensim-SC-0862627b341641ec0223bb4191dfee8d85724c9e.tar.gz
opensim-SC-0862627b341641ec0223bb4191dfee8d85724c9e.tar.bz2
opensim-SC-0862627b341641ec0223bb4191dfee8d85724c9e.tar.xz
* refactor: move CreateUser into UserServiceAdmin
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index db99450..7f7689d 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -474,7 +474,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
474 { 474 {
475 m_log.InfoFormat("master avatar does not exist, creating it"); 475 m_log.InfoFormat("master avatar does not exist, creating it");
476 // ...or create new user 476 // ...or create new user
477 userID = m_app.CreateUser(masterFirst, masterLast, masterPassword, "", region.RegionLocX, region.RegionLocY); 477 userID = m_app.CommunicationsManager.UserServiceAdmin.AddUser(
478 masterFirst, masterLast, masterPassword, "", region.RegionLocX, region.RegionLocY);
479
478 if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}", 480 if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}",
479 masterFirst, masterLast)); 481 masterFirst, masterLast));
480 } 482 }
@@ -668,7 +670,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
668 if (null != userProfile) 670 if (null != userProfile)
669 throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname)); 671 throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname));
670 672
671 UUID userID = m_app.CreateUser(firstname, lastname, passwd, email, regX, regY); 673 UUID userID
674 = m_app.CommunicationsManager.UserServiceAdmin.AddUser(
675 firstname, lastname, passwd, email, regX, regY);
672 676
673 if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}", 677 if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}",
674 firstname, lastname)); 678 firstname, lastname));
@@ -764,7 +768,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
764 if (null != userProfile) 768 if (null != userProfile)
765 throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname)); 769 throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname));
766 770
767 UUID userID = m_app.CreateUser(firstname, lastname, passwd, email, regX, regY); 771 UUID userID
772 = m_app.CommunicationsManager.UserServiceAdmin.AddUser(
773 firstname, lastname, passwd, email, regX, regY);
768 774
769 if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}", 775 if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}",
770 firstname, lastname)); 776 firstname, lastname));