From 43b2ff1d112174c36bb18caf353945afc6390840 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 1 Aug 2008 18:49:48 +0000
Subject: * Drop cached inventory from the local region when a user crosses out
 into a remote region * May resolves inventory problems that occur when the
 user moves between two regions` * e.g. if the user moves to a second region,
 adds an inventory item, moves back to the original region then tries to
 manipulate that item * Not yet implemented for teleport

---
 OpenSim/Framework/RegionInfo.cs | 42 +++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

(limited to 'OpenSim/Framework/RegionInfo.cs')

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index ee64bf2..1d9d9ec 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -41,20 +41,34 @@ namespace OpenSim.Framework
         // private static readonly log4net.ILog m_log
         //     = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected bool Allow_Alternate_Ports;
-        public bool m_allow_alternate_ports;
-        protected string m_externalHostName;
-
-        /// <value>
+        /// <summary>
         /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
-        /// </value>
+        /// </summary>
+        public uint HttpPort
+        {
+            get { return m_httpPort; }
+            set { m_httpPort = value; }
+        }
         protected uint m_httpPort;
+        
+        /// <summary>
+        /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
+        /// </summary>
+        public string ServerURI
+        {
+            get { return m_serverURI; }
+            set { m_serverURI = value; }
+        }        
+        protected string m_serverURI;
 
+        protected bool Allow_Alternate_Ports;
+        public bool m_allow_alternate_ports;
+        protected string m_externalHostName;
+        
         protected IPEndPoint m_internalEndPoint;
         protected uint? m_regionLocX;
         protected uint? m_regionLocY;
-        protected uint m_remotingPort;
-        protected string m_serverURI;
+        protected uint m_remotingPort;        
         public LLUUID RegionID = LLUUID.Zero;
         public string RemotingAddress;
 
@@ -101,18 +115,6 @@ namespace OpenSim.Framework
             set { m_remotingPort = value; }
         }
 
-        public uint HttpPort
-        {
-            get { return m_httpPort; }
-            set { m_httpPort = value; }
-        }
-
-        public string ServerURI
-        {
-            get { return m_serverURI; }
-            set { m_serverURI = value; }
-        }
-
         /// <value>
         /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw.
         ///
-- 
cgit v1.1