6 files changed, 21 insertions, 5 deletions

diff --git a/OpenSim/Framework/General/Types/RegionHandle.cs b/OpenSim/Framework/General/Types/RegionHandle.cs
index 409b05a..4a055ad 100644
--- a/OpenSim/Framework/General/Types/RegionHandle.cs
+++ b/OpenSim/Framework/General/Types/RegionHandle.cs
@@ -20,7 +20,10 @@ namespace OpenSim.Framework.Types
         {

             IPAddress addr = IPAddress.Parse(ip);

 

-            long baseHandle = addr.Address;

+            if (addr.AddressFamily != System.Net.Sockets.AddressFamily.InterNetwork)

+                throw new Exception("Bad RegionHandle Parameter - must be an IPv4 address");

+

+            uint baseHandle = BitConverter.ToUInt32(addr.GetAddressBytes(), 0);

 

             // Split the IP address in half

             short a = (short)((baseHandle << 16) & 0xFFFF);

diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
index d9d6f51..4a283b2 100644
--- a/OpenSim/Region/Capabilities/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -75,6 +75,7 @@ namespace OpenSim.Region.Capabilities
             httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);

             httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);

             httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue);

+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestTexture, RequestTexture);

         }

 

         /// <summary>

@@ -131,6 +132,19 @@ namespace OpenSim.Region.Capabilities
         /// <summary>

         /// 

         /// </summary>

+        /// <param name="request"></param>

+        /// <param name="path"></param>

+        /// <param name="param"></param>

+        /// <returns></returns>

+        public string RequestTexture(string request, string path, string param)

+        {

+            // Needs implementing (added to remove compiler warning)

+            return "";

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

         /// <returns></returns>

         protected LLSDMapLayer BuildLLSDMapLayerResponse()

         {

diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 7f961ef..64856ea 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -456,7 +456,7 @@ namespace OpenSim.Region.ClientStack
                         {

                             AssetLandmark lm = new AssetLandmark(lma);

 

-                            if (lm.RegionID == m_regionData.SimUUID)

+                            if (lm.RegionID == m_world.RegionInfo.SimUUID)

                             {

                                 TeleportLocalPacket tpLocal = new TeleportLocalPacket();

 

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 606ca1d..52749a1 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -75,7 +75,6 @@ namespace OpenSim.Region.ClientStack
         private AssetCache m_assetCache;

         private InventoryCache m_inventoryCache;

         private int cachedtextureserial = 0;

-        private RegionInfo m_regionData;

         protected AuthenticateSessionsBase m_authenticateSessionsHandler;

         private Encoding enc = Encoding.ASCII;

 

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 5fff777..a11995a 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.Communications.OGS1
         private void StartRemoting()

         {

             TcpChannel ch = new TcpChannel(8895);

-            ChannelServices.RegisterChannel(ch);

+            ChannelServices.RegisterChannel(ch, true);

 

             WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton);

             RemotingConfiguration.RegisterWellKnownServiceType(wellType);

diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 3d97a06..9a46fbf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
         private Encoding enc = Encoding.ASCII;

         private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>(); //list of all primitive id's that are part of this group

         public Primitive rootPrimitive;

-        private Scene m_world;

+        private new Scene m_world;

         protected ulong m_regionHandle;

 

         private bool physicsEnabled = false;