2 files changed, 16 insertions, 13 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index edce960..13f8b61 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -153,7 +153,6 @@ namespace OpenSim.Region.Environment.Scenes
             get { return m_authenticateHandler; }
         }
 
-        protected readonly EstateManager m_estateManager;
         // an instance to the physics plugin's Scene object.
         public PhysicsScene PhysicsScene
         {
@@ -167,11 +166,6 @@ namespace OpenSim.Region.Environment.Scenes
             get { return m_innerScene.m_syncRoot; }
         }
 
-        public EstateManager EstateManager
-        {
-            get { return m_estateManager; }
-        }
-
         public float TimeDilation
         {
             get { return m_timedilation; }
@@ -256,8 +250,6 @@ namespace OpenSim.Region.Environment.Scenes
             EventManager.OnLandObjectRemoved +=
                 new EventManager.LandObjectRemoved(m_storageManager.DataStore.RemoveLandObject);
 
-            m_estateManager = new EstateManager(this, m_regInfo);
-
             m_permissionManager = permissionManager;
             m_permissionManager.Initialise(this);
 
@@ -1514,8 +1506,6 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 m_log.Info("[REGION]: Add New Scene Presence");
 
-                m_estateManager.sendRegionHandshake(client);
-
                 CreateAndAddScenePresence(client, child);
 
                 LandChannel.sendParcelOverlay(client);
@@ -1572,9 +1562,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnParcelAccessListUpdateRequest +=
                 new ParcelAccessListUpdateRequest(LandChannel.handleParcelAccessUpdateRequest);
 
-            client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
-            client.OnRegionInfoRequest += m_estateManager.HandleRegionInfoRequest;
-            client.OnEstateCovenantRequest += m_estateManager.HandleEstateCovenantRequest;
+            
             client.OnRequestGodlikePowers += handleRequestGodlikePowers;
             client.OnGodKickUser += HandleGodlikeKickUser;
             client.OnObjectPermissions += HandleObjectPermissionsUpdate;
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 53a8d0f..2feed78 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -151,6 +151,10 @@ namespace OpenSim.Region.Environment.Scenes
 
         public event NewInventoryItemUploadComplete OnNewInventoryItemUploadComplete;
 
+        public delegate void RequestChangeWaterHeight(float height);
+
+        public event RequestChangeWaterHeight OnRequestChangeWaterHeight;
+
         public delegate void AvatarKillData(uint KillerLocalID, ScenePresence avatar);
 
         public event AvatarKillData OnAvatarKilled;
@@ -269,6 +273,8 @@ namespace OpenSim.Region.Environment.Scenes
         private RegisterCapsEvent handlerRegisterCaps = null; // OnRegisterCaps;
         private DeregisterCapsEvent handlerDeregisterCaps = null; // OnDeregisterCaps;
         private NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = null;
+        private RequestChangeWaterHeight handlerRequestChangeWaterHeight = null; //OnRequestChangeWaterHeight
+
         private LandBuy handlerLandBuy = null;
         private LandBuy handlerValidateLandBuy = null;
         private AvatarKillData handlerAvatarKill = null;
@@ -579,6 +585,15 @@ namespace OpenSim.Region.Environment.Scenes
                 handlerScriptNotAtTargetEvent(localID);
             }
         }
+
+        public void TriggerRequestChangeWaterHeight(float height)
+        {
+            handlerRequestChangeWaterHeight = OnRequestChangeWaterHeight;
+            if (handlerRequestChangeWaterHeight != null)
+            {
+                handlerRequestChangeWaterHeight(height);
+            }
+        }
         public void TriggerAvatarKill(uint KillerObjectLocalID, ScenePresence DeadAvatar)
         {
             handlerAvatarKill = OnAvatarKilled;