From 682f4e9257bcec6e9690145760558cc3331bc5d8 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Tue, 15 Apr 2008 06:21:44 +0000
Subject: * Fixes an issue with the BaseHttpServer in Linux * Fixes an estate
 naming issue * Fixes a land issue with the landobject not reporting the
 proper parcel prim. * A few other tweaks.

---
 OpenSim/Framework/EstateSettings.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'OpenSim/Framework/EstateSettings.cs')

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index f27c1c3..42154e9 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -486,6 +486,19 @@ namespace OpenSim.Framework
             }
         }
 
+        // Estate name
+        private string m_estateName;
+
+        public string estateName
+        {
+            get { return m_estateName; }
+            set
+            {
+                m_estateName = value;
+                configMember.forceSetConfigurationOption("estate_name", m_estateName.ToString());
+            }
+        }
+
         private LLUUID m_estateManager0;
         private LLUUID m_estateManager1;
         private LLUUID m_estateManager2;
@@ -835,6 +848,8 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
                                                 String.Empty, "00000000-0000-0000-0000-000000000000", true);
 
+            configMember.addConfigurationOption("estate_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                                String.Empty, "TestEstate", true);
             configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
                                                 String.Empty, "00000000-0000-0000-0000-000000000000", true);
             configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
@@ -966,6 +981,9 @@ namespace OpenSim.Framework
                 case "terrain_file":
                     m_terrainFile = (string) configuration_result;
                     break;
+                case "estate_name":
+                    m_estateName = (string) configuration_result;
+                    break;
                 case "terrain_multiplier":
                     m_terrainMultiplier = Convert.ToDouble(configuration_result);
                     break;
-- 
cgit v1.1