From ff2eb24022f906ea20e673756d2b72162e707491 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Thu, 21 Aug 2008 11:04:57 +0000
Subject: - corrects statement about {asset,user,inventory} source
 configuration   as those all work with MySQL (and are in fact required it
 seems);   adds examples as well

- adds region_file_template functionality for the create_region XmlRpc
  call of RemoteAdminPlugin

- cleans up and fixes typo in UserProfileData



---
 .../ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs  | 11 ++++++++---
 OpenSim/Framework/UserProfileData.cs                          |  8 ++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index c79122c..ec28350 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -33,6 +33,7 @@ using System.Reflection;
 using System.Timers;
 using libsecondlife;
 using log4net;
+using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
@@ -47,6 +48,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         private OpenSimBase m_app;
         private BaseHttpServer m_httpd;
+        private IConfig m_config;
         private string requiredPassword = String.Empty;
 
         // TODO: required by IPlugin, but likely not at all right
@@ -69,8 +71,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (openSim.ConfigSource.Source.Configs["RemoteAdmin"] != null &&
                     openSim.ConfigSource.Source.Configs["RemoteAdmin"].GetBoolean("enabled", false))
                 {
+                    m_config = openSim.ConfigSource.Source.Configs["RemoteAdmin"];
                     m_log.Info("[RADMIN]: Remote Admin Plugin Enabled");
-                    requiredPassword = openSim.ConfigSource.Source.Configs["RemoteAdmin"].GetString("access_password", String.Empty);
+                    requiredPassword = m_config.GetString("access_password", String.Empty);
 
                     m_app = openSim;
                     m_httpd = openSim.HttpServer;
@@ -436,10 +439,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (persist)
                 {
                     string regionConfigPath = Path.Combine(Path.Combine(Util.configDir(), "Regions"),
-                                                           String.Format("{0}x{1}-{2}.xml",
+                                                           String.Format(m_config.GetString("region_file_template", "{0}x{1}-{2}.xml"),
                                                                          region.RegionLocX.ToString(),
                                                                          region.RegionLocY.ToString(),
-                                                                         regionID.ToString()));
+                                                                         regionID.ToString(),
+                                                                         region.InternalEndPoint.Port.ToString(),
+                                                                         region.RegionName.Replace(" ", "_").Replace(":", "_").Replace("/", "_")));
                     m_log.DebugFormat("[RADMIN] CreateRegion: persisting region {0} to {1}",
                                       region.RegionID, regionConfigPath);
                     region.SaveRegionToFile("dynamic region", regionConfigPath);
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index d0b4c25..2d06148 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -145,7 +145,9 @@ namespace OpenSim.Framework
         private LLUUID _partner;
 
         /// <summary>
-        /// The regionhandle of the users preffered home region. If multiple sims occupy the same spot, the grid may decide which region the user logs into
+        /// The regionhandle of the users preferred home region. If
+        /// multiple sims occupy the same spot, the grid may decide
+        /// which region the user logs into
         /// </summary>
         public virtual ulong HomeRegion
         {
@@ -159,7 +161,9 @@ namespace OpenSim.Framework
 
         private LLUUID _homeRegionID;
         /// <summary>
-        /// The regionID of the users home region. This is unique; even if the position of the region changes within the grid, this will refer to the same region.
+        /// The regionID of the users home region. This is unique;
+        /// even if the position of the region changes within the
+        /// grid, this will refer to the same region.
         /// </summary>
         public LLUUID HomeRegionID
         {
-- 
cgit v1.1