diff options
author | Melanie Thielker | 2009-06-26 11:32:36 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-06-26 11:32:36 +0000 |
commit | febd54499b5decd9cb58191ead5695b6fab247c8 (patch) | |
tree | 54c48023e13b0a300e905137cb46c597a349bd88 /OpenSim/ApplicationPlugins/RemoteController | |
parent | Make delete-region delete the section from an ini file. Will delete the whole (diff) | |
download | opensim-SC_OLD-febd54499b5decd9cb58191ead5695b6fab247c8.zip opensim-SC_OLD-febd54499b5decd9cb58191ead5695b6fab247c8.tar.gz opensim-SC_OLD-febd54499b5decd9cb58191ead5695b6fab247c8.tar.bz2 opensim-SC_OLD-febd54499b5decd9cb58191ead5695b6fab247c8.tar.xz |
Enable the RemoteAdmin module to save regions as ini files rather than XML
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index f768516..bcab2d1 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -556,25 +556,28 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
556 | } | 556 | } |
557 | else | 557 | else |
558 | { | 558 | { |
559 | // no client supplied UUID: look it up... | 559 | if (masterFirst != String.Empty && masterLast != String.Empty) // User requests a master avatar |
560 | CachedUserInfo userInfo | ||
561 | = m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails( | ||
562 | masterFirst, masterLast); | ||
563 | |||
564 | if (null == userInfo) | ||
565 | { | ||
566 | m_log.InfoFormat("master avatar does not exist, creating it"); | ||
567 | // ...or create new user | ||
568 | userID = m_app.CommunicationsManager.UserAdminService.AddUser( | ||
569 | masterFirst, masterLast, masterPassword, "", region.RegionLocX, region.RegionLocY); | ||
570 | |||
571 | if (userID == UUID.Zero) | ||
572 | throw new Exception(String.Format("failed to create new user {0} {1}", | ||
573 | masterFirst, masterLast)); | ||
574 | } | ||
575 | else | ||
576 | { | 560 | { |
577 | userID = userInfo.UserProfile.ID; | 561 | // no client supplied UUID: look it up... |
562 | CachedUserInfo userInfo | ||
563 | = m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails( | ||
564 | masterFirst, masterLast); | ||
565 | |||
566 | if (null == userInfo) | ||
567 | { | ||
568 | m_log.InfoFormat("master avatar does not exist, creating it"); | ||
569 | // ...or create new user | ||
570 | userID = m_app.CommunicationsManager.UserAdminService.AddUser( | ||
571 | masterFirst, masterLast, masterPassword, "", region.RegionLocX, region.RegionLocY); | ||
572 | |||
573 | if (userID == UUID.Zero) | ||
574 | throw new Exception(String.Format("failed to create new user {0} {1}", | ||
575 | masterFirst, masterLast)); | ||
576 | } | ||
577 | else | ||
578 | { | ||
579 | userID = userInfo.UserProfile.ID; | ||
580 | } | ||
578 | } | 581 | } |
579 | } | 582 | } |
580 | 583 | ||