Move Telehub tables and data from EstateSettings to RegionSettings.

This is damage control es EstateSettings is not the place this can be put.
EstateSettings is nt unique to a region and therefore would introduce
a hard limit of one telehub per estate, completely shutting off the
option of having SL style telehubs, e.g. one per region. Whole
estate teleport routing can still be implemented id desiresd, this
way all options are open while the other way most options get closed
off.

1 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 6a02ffe..cdcea65 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -609,9 +609,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
             {
                 case "info ui":
                     // Send info:
-                    if (Scene.RegionInfo.EstateSettings.HasTelehub)
+                    if (Scene.RegionInfo.RegionSettings.HasTelehub)
                     {
-                        EstateSettings settings = this.Scene.RegionInfo.EstateSettings;
+                        RegionSettings settings = this.Scene.RegionInfo.RegionSettings;
                             client.SendTelehubInfo(settings.TelehubObject, settings.TelehubName, settings.TelehubPos,
                                                settings.TelehubRot, settings.SpawnPoints());
                     }
@@ -626,7 +626,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     part = Scene.GetSceneObjectPart((uint)param1);
                     if (m_Telehub.Connect(part))
                     {
-                        EstateSettings settings = this.Scene.RegionInfo.EstateSettings;
+                        RegionSettings settings = this.Scene.RegionInfo.RegionSettings;
                             client.SendTelehubInfo(settings.TelehubObject, settings.TelehubName, settings.TelehubPos,
                                                settings.TelehubRot, settings.SpawnPoints());
                     }
@@ -637,7 +637,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     part = Scene.GetSceneObjectPart((uint)param1);
                     if (m_Telehub.DisConnect(part))
                     {
-                        EstateSettings settings = this.Scene.RegionInfo.EstateSettings;
+                        RegionSettings settings = this.Scene.RegionInfo.RegionSettings;
                             client.SendTelehubInfo(settings.TelehubObject, settings.TelehubName, settings.TelehubPos,
                                                settings.TelehubRot, settings.SpawnPoints());
                     }
@@ -648,7 +648,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     part = Scene.GetSceneObjectPart((uint)param1);
                     if( m_Telehub.AddSpawnPoint(part.AbsolutePosition))
                     {
-                        EstateSettings settings = this.Scene.RegionInfo.EstateSettings;
+                        RegionSettings settings = this.Scene.RegionInfo.RegionSettings;
                             client.SendTelehubInfo(settings.TelehubObject, settings.TelehubName, settings.TelehubPos,
                                                settings.TelehubRot, settings.SpawnPoints());
                     }
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     // Remove SpawnPoint from Telehub
                     if (m_Telehub.RemoveSpawnPoint((int)param1))
                     {
-                        EstateSettings settings = this.Scene.RegionInfo.EstateSettings;
+                        RegionSettings settings = this.Scene.RegionInfo.RegionSettings;
                             client.SendTelehubInfo(settings.TelehubObject, settings.TelehubName, settings.TelehubPos,
                                                settings.TelehubRot, settings.SpawnPoints());
                     }