7 files changed, 2 insertions, 43 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
index 570d31c..4d8409be 100644
--- a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
@@ -35,7 +35,9 @@ namespace OpenSim.Services.Interfaces
     public interface IBakedTextureModule
     {
         WearableCacheItem[] Get(UUID id);
+
         void Store(UUID id);
+        void Store(UUID id, WearableCacheItem[] WearableCache);
         void UpdateMeshAvatar(UUID id);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 50448b4..80f8244 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -93,15 +93,9 @@ namespace OpenSim.Region.Framework.Interfaces
 
         void EnableChildAgent(ScenePresence agent, GridRegion region);
 
-<<<<<<< HEAD
-        GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version,
-                                        out Vector3 newpos, out string reason);
-
-=======
         GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version, out Vector3 newpos);
         GridRegion GetObjectDestination(SceneObjectGroup grp, Vector3 targetPosition, out Vector3 newpos);
         bool checkAgentAccessToRegion(ScenePresence agent, GridRegion destiny, Vector3 position, out string version, out string reason);
->>>>>>> avn/ubitvar
         void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
         bool CrossPrimGroupIntoNewRegion(GridRegion destination, Vector3 newPosition, SceneObjectGroup grp, bool silent);
 
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
index 2f9b222..efc9ddc 100644
--- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
@@ -58,8 +58,6 @@ namespace OpenSim.Region.Framework.Interfaces
     public interface IHttpRequestModule
     {
         UUID MakeHttpRequest(string url, string parameters, string body);
-<<<<<<< HEAD
-
         /// <summary>
         /// Starts the http request.
         /// </summary>
@@ -86,12 +84,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// Stop and remove all http requests for the given script.
         /// </summary>
         /// <param name='id'></param>
-        void StopHttpRequestsForScript(UUID id);
-
-=======
-        UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body);
         void StopHttpRequest(uint m_localID, UUID m_itemID);
->>>>>>> avn/ubitvar
         IServiceRequest GetNextCompletedRequest();
         void RemoveCompletedRequest(UUID id);
     }
diff --git a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
index eb79711..5151567 100644
--- a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
@@ -25,24 +25,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-<<<<<<< HEAD
-using System.Drawing;
-using OpenSim.Framework;
-=======
 using OpenMetaverse;
 using OpenSim.Framework;
 using System.Drawing;
->>>>>>> avn/ubitvar
 
 namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IMapImageUploadModule
     {
-<<<<<<< HEAD
-        void UploadMapTile(IScene scene, Bitmap mapTile);
-    }
-}
-=======
         /// <summary>
         /// Upload a new maptile
         /// </summary>
@@ -50,4 +40,3 @@ namespace OpenSim.Region.Framework.Interfaces
         void UploadMapTile(IScene scene, Bitmap mapTile);
     }
 }
->>>>>>> avn/ubitvar
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 445342d..99bc87d 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -127,12 +127,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
         /// <param name="options">
         /// Dictionary of options.
-<<<<<<< HEAD
         /// </param>
         void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string,object> options);
-=======
-        /// </param>    
-        void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string, object> options);
->>>>>>> avn/ubitvar
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
index ff18519..472e5a5d 100644
--- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
@@ -28,11 +28,8 @@ using System.IO;
 
 using OpenSim.Framework;
 
-<<<<<<< HEAD
-=======
 using System.IO;
 using OpenSim.Framework;
->>>>>>> avn/ubitvar
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
@@ -56,12 +53,6 @@ namespace OpenSim.Region.Framework.Interfaces
         void PushTerrain(IClientAPI pClient);
      
         /// <summary>
-        /// When a client initially connects, all the terrain must be pushed to the viewer.
-        /// This call causes all the terrain patches to be sent to the client.
-        /// </summary>
-        void PushTerrain(IClientAPI pClient);
-        
-        /// <summary>
         /// Load a terrain from a stream.
         /// </summary>
         /// <param name="filename">
@@ -69,7 +60,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </param>
         /// <param name="stream"></param>
         void LoadFromStream(string filename, Stream stream);
-        void LoadFromStream(string filename, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement, Stream stream);
         void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap);
         void LoadFromStream(string filename, Vector3 displacement,
                                 float radianRotation, Vector2 rotationDisplacement, Stream stream);
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
index 08dc3e3..e9cf4ad 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
@@ -37,10 +37,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         void GenerateMaptile();
         List<MapBlockData> Map2BlockFromGridRegion(GridRegion r, uint flag);
-<<<<<<< HEAD
-        MapBlockData MapBlockFromGridRegion(GridRegion r, uint flag);
-=======
         void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag);
->>>>>>> avn/ubitvar
     }
 }