aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorDan Lake2011-10-04 16:59:35 -0700
committerDan Lake2011-10-04 16:59:35 -0700
commit38d205502a83ed334d9827f43862579cec305639 (patch)
tree31358ac05557104e6e821309a9c68dd7b3151032 /OpenSim/ApplicationPlugins
parentRemoved redundant IClientAPI calls from TreePopulatorModule. Removing tree ob... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-38d205502a83ed334d9827f43862579cec305639.zip
opensim-SC_OLD-38d205502a83ed334d9827f43862579cec305639.tar.gz
opensim-SC_OLD-38d205502a83ed334d9827f43862579cec305639.tar.bz2
opensim-SC_OLD-38d205502a83ed334d9827f43862579cec305639.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 08f3dc7..70b7d88 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -170,7 +170,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
170 { 170 {
171 foreach (string enabledMethod in enabledMethods.Split('|')) 171 foreach (string enabledMethod in enabledMethods.Split('|'))
172 { 172 {
173 m_httpServer.AddXmlRPCHandler(enabledMethod, availableMethods[enabledMethod]); 173 m_httpServer.AddXmlRPCHandler(enabledMethod, availableMethods[enabledMethod], false);
174 } 174 }
175 } 175 }
176 } 176 }
@@ -3115,7 +3115,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
3115 UserAccount account = userAccountService.GetUserAccount(scopeID, firstName, lastName); 3115 UserAccount account = userAccountService.GetUserAccount(scopeID, firstName, lastName);
3116 if (null == account) 3116 if (null == account)
3117 { 3117 {
3118 account = new UserAccount(scopeID, firstName, lastName, email); 3118 account = new UserAccount(scopeID, UUID.Random(), firstName, lastName, email);
3119 if (account.ServiceURLs == null || (account.ServiceURLs != null && account.ServiceURLs.Count == 0)) 3119 if (account.ServiceURLs == null || (account.ServiceURLs != null && account.ServiceURLs.Count == 0))
3120 { 3120 {
3121 account.ServiceURLs = new Dictionary<string, object>(); 3121 account.ServiceURLs = new Dictionary<string, object>();