From 5d5edde4290030345bc25841a25d23552e533972 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 7 May 2013 00:37:45 +0100
Subject: Step 2: commit the IEstateModuleInterface changes needed

---
 OpenSim/Region/Framework/Interfaces/IEstateModule.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Interfaces/IEstateModule.cs')

diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 1983984..d49b24e 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -40,11 +40,12 @@ namespace OpenSim.Region.Framework.Interfaces
 
         uint GetRegionFlags();
         bool IsManager(UUID avatarID);
-        
+
         /// <summary>
         /// Tell all clients about the current state of the region (terrain textures, water height, etc.).
         /// </summary>
         void sendRegionHandshakeToAll();
+        void TriggerEstateInfoChange();
 
         /// <summary>
         /// Fires the OnRegionInfoChange event.
-- 
cgit v1.1


From f106ba87ca92b477b32a84aa246e4b4481b0980b Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Wed, 18 Sep 2013 15:55:42 +0300
Subject: Made terrain uploads thread-safe

---
 OpenSim/Region/Framework/Interfaces/IEstateModule.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Region/Framework/Interfaces/IEstateModule.cs')

diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index d49b24e..944c66b 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -54,5 +54,10 @@ namespace OpenSim.Region.Framework.Interfaces
 
         void setEstateTerrainBaseTexture(int level, UUID texture);
         void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue);
+
+        /// <summary>
+        /// Returns whether the transfer ID is being used for a terrain transfer.
+        /// </summary>
+        bool IsTerrainXfer(ulong xferID);
     }
 }
-- 
cgit v1.1