Merge branch 'master' into careminster-presence-refactor

7 files changed, 23 insertions, 197 deletions

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index b4b5808..2a495b0 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -35,7 +35,6 @@ namespace OpenSim.Framework
     public class EstateSettings
     {
         // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly ConfigurationMember configMember;
 
         public delegate void SaveDelegate(EstateSettings rs);
 
@@ -43,7 +42,7 @@ namespace OpenSim.Framework
 
         // Only the client uses these
         //
-        private uint m_EstateID = 100;
+        private uint m_EstateID = 0;
 
         public uint EstateID
         {
@@ -51,7 +50,7 @@ namespace OpenSim.Framework
             set { m_EstateID = value; }
         }
 
-        private string m_EstateName;
+        private string m_EstateName = "My Estate";
 
         public string EstateName
         {
@@ -59,7 +58,7 @@ namespace OpenSim.Framework
             set { m_EstateName = value; }
         }
 
-        private uint m_ParentEstateID = 100;
+        private uint m_ParentEstateID = 1;
 
         public uint ParentEstateID
         {
@@ -67,7 +66,7 @@ namespace OpenSim.Framework
             set { m_ParentEstateID = value; }
         }
 
-        private float m_BillableFactor;
+        private float m_BillableFactor = 0.0f;
 
         public float BillableFactor
         {
@@ -75,7 +74,7 @@ namespace OpenSim.Framework
             set { m_BillableFactor = value; }
         }
 
-        private int m_PricePerMeter;
+        private int m_PricePerMeter = 1;
 
         public int PricePerMeter
         {
@@ -83,7 +82,7 @@ namespace OpenSim.Framework
             set { m_PricePerMeter = value; }
         }
 
-        private int m_RedirectGridX;
+        private int m_RedirectGridX = 0;
 
         public int RedirectGridX
         {
@@ -91,7 +90,7 @@ namespace OpenSim.Framework
             set { m_RedirectGridX = value; }
         }
 
-        private int m_RedirectGridY;
+        private int m_RedirectGridY = 0;
 
         public int RedirectGridY
         {
@@ -273,25 +272,6 @@ namespace OpenSim.Framework
 
         public EstateSettings()
         {
-            if (configMember == null)
-            {
-                try
-                {
-                    // Load legacy defaults
-                    //
-                    configMember =
-                        new ConfigurationMember(Path.Combine(Util.configDir(),
-                                "estate_settings.xml"), "ESTATE SETTINGS",
-                                loadConfigurationOptions,
-                                handleIncomingConfiguration, true);
-
-                    l_EstateManagers.Clear();
-                    configMember.performConfigurationRetrieve();
-                }
-                catch (Exception)
-                {
-                }
-            }
         }
 
         public void Save()
@@ -393,165 +373,5 @@ namespace OpenSim.Framework
 
             return l_EstateAccess.Contains(user);
         }
-
-        public void loadConfigurationOptions()
-        {
-            configMember.addConfigurationOption("billable_factor",
-                    ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
-                    String.Empty, "0.0", true);
-
-//            configMember.addConfigurationOption("estate_id",
-//                    ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-//                    String.Empty, "100", true);
-
-//            configMember.addConfigurationOption("parent_estate_id",
-//                    ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-//                    String.Empty, "1", true);
-
-            configMember.addConfigurationOption("redirect_grid_x",
-                    ConfigurationOption.ConfigurationTypes.TYPE_INT32,
-                    String.Empty, "0", true);
-
-            configMember.addConfigurationOption("redirect_grid_y",
-                    ConfigurationOption.ConfigurationTypes.TYPE_INT32,
-                    String.Empty, "0", true);
-
-            configMember.addConfigurationOption("price_per_meter",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                    String.Empty, "1", true);
-
-            configMember.addConfigurationOption("estate_name",
-                    ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                    String.Empty, "My Estate", true);
-
-            configMember.addConfigurationOption("estate_manager_0",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-
-            configMember.addConfigurationOption("estate_manager_1",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-
-            configMember.addConfigurationOption("estate_manager_2",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-
-            configMember.addConfigurationOption("estate_manager_3",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-
-            configMember.addConfigurationOption("estate_manager_4",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-
-            configMember.addConfigurationOption("estate_manager_5",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-
-            configMember.addConfigurationOption("estate_manager_6",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-
-            configMember.addConfigurationOption("estate_manager_7",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-
-            configMember.addConfigurationOption("estate_manager_8",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-
-            configMember.addConfigurationOption("estate_manager_9",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-
-            configMember.addConfigurationOption("region_flags",
-                    ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                    String.Empty, "336723974", true);
-        }
-
-        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
-        {
-            switch (configuration_key)
-            {
-                case "region_flags":
-                    RegionFlags flags = (RegionFlags)(uint)configuration_result;
-                    if ((flags & (RegionFlags)(1<<29)) != 0)
-                        m_AllowVoice = true;
-                    if ((flags & RegionFlags.AllowDirectTeleport) != 0)
-                        m_AllowDirectTeleport = true;
-                    if ((flags & RegionFlags.DenyAnonymous) != 0)
-                         m_DenyAnonymous = true;
-                    if ((flags & RegionFlags.DenyIdentified) != 0)
-                        m_DenyIdentified = true;
-                    if ((flags & RegionFlags.DenyTransacted) != 0)
-                        m_DenyTransacted = true;
-                    if ((flags & RegionFlags.AbuseEmailToEstateOwner) != 0)
-                        m_AbuseEmailToEstateOwner = true;
-                    if ((flags & RegionFlags.BlockDwell) != 0)
-                        m_BlockDwell = true;
-                    if ((flags & RegionFlags.EstateSkipScripts) != 0)
-                        m_EstateSkipScripts = true;
-                    if ((flags & RegionFlags.ResetHomeOnTeleport) != 0)
-                        m_ResetHomeOnTeleport = true;
-                    if ((flags & RegionFlags.TaxFree) != 0)
-                        m_TaxFree = true;
-                    if ((flags & RegionFlags.PublicAllowed) != 0)
-                        m_PublicAccess = true;
-                    break;
-                case "billable_factor":
-                    m_BillableFactor = (float) configuration_result;
-                    break;
-//                case "estate_id":
-//                    m_EstateID = (uint) configuration_result;
-//                    break;
-//                case "parent_estate_id":
-//                    m_ParentEstateID = (uint) configuration_result;
-//                    break;
-                case "redirect_grid_x":
-                    m_RedirectGridX = (int) configuration_result;
-                    break;
-                case "redirect_grid_y":
-                    m_RedirectGridY = (int) configuration_result;
-                    break;
-                case "price_per_meter":
-                    m_PricePerMeter = Convert.ToInt32(configuration_result);
-                    break;
-                case "estate_name":
-                    m_EstateName = (string) configuration_result;
-                    break;
-                case "estate_manager_0":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_1":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_2":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_3":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_4":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_5":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_6":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_7":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_8":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-                case "estate_manager_9":
-                    AddEstateManager((UUID)configuration_result);
-                    break;
-            }
-
-            return true;
-        }
     }
 }
diff --git a/OpenSim/Framework/GroupData.cs b/OpenSim/Framework/GroupData.cs
index e3b8626..815946c 100644
--- a/OpenSim/Framework/GroupData.cs
+++ b/OpenSim/Framework/GroupData.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Framework
     public class GroupMembershipData
     {
         // Group base data
-        //
         public UUID GroupID;
         public string GroupName;
         public bool AllowPublish = true;
@@ -61,7 +60,6 @@ namespace OpenSim.Framework
         public bool ShowInList = true;
 
         // Per user data
-        //
         public bool AcceptNotices = true;
         public int Contribution = 0;
         public ulong GroupPowers = 0;
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 86d63f8..19ab409 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Framework
         /// </exception>
         bool PresenceChildStatus(UUID agentId);
 
-        bool TryGetAvatar(UUID agentID, out object scenePresence);
+        bool TryGetScenePresence(UUID agentID, out object scenePresence);
 
         T RequestModuleInterface<T>();
         T[] RequestModuleInterfaces<T>();
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs
index 84cc05e..1f5f208 100644
--- a/OpenSim/Framework/MainServer.cs
+++ b/OpenSim/Framework/MainServer.cs
@@ -25,13 +25,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Framework.Servers.HttpServer;
 using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using OpenSim.Framework.Servers.HttpServer;
 
 namespace OpenSim.Framework
 {
     public class MainServer
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
         private static BaseHttpServer instance = null;
         private static Dictionary<uint, BaseHttpServer> m_Servers =
                 new Dictionary<uint, BaseHttpServer>();
@@ -53,6 +57,8 @@ namespace OpenSim.Framework
                 return m_Servers[port];
 
             m_Servers[port] = new BaseHttpServer(port);
+
+            m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port);
             m_Servers[port].Start();
 
             return m_Servers[port];
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 350c041..a6e00c2 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -310,7 +310,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0} {1}", e.Message, e.StackTrace);
+                m_log.Error(string.Format("[BASE HTTP SERVER]: OnRequest() failed with "), e);
             }
         }
 
@@ -1580,7 +1580,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public void Start()
         {
-            m_log.Info("[BASE HTTP SERVER]: Starting up HTTP Server");
             StartHTTP();
         }
 
@@ -1588,7 +1587,6 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             try
             {
-                m_log.Debug("[BASE HTTP SERVER]: Spawned main thread OK");
                 //m_httpListener = new HttpListener();
                 NotSocketErrors = 0;
                 if (!m_ssl)
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index f618047..cd2f384 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.6.8CM";
+        private const string VERSION_NUMBER = "0.7CM";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
         public enum Flavour
         {
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 16e44af..2843e20 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -263,8 +263,12 @@ namespace OpenSim.Framework
 
             foreach (string key in parameters.Keys)
             {
-                foreach (string value in parameters.GetValues(key))
-                    items.Add(String.Concat(key, "=", HttpUtility.UrlEncode(value ?? String.Empty)));
+                string[] values = parameters.GetValues(key);
+                if (values != null)
+                {
+                    foreach (string value in values)
+                        items.Add(String.Concat(key, "=", HttpUtility.UrlEncode(value ?? String.Empty)));
+                }
             }
 
             return String.Join("&", items.ToArray());