Merged 3Di code that provides scene and avatar serialization, and plugin support for region move/split/merge. See ThirdParty/3Di/README.txt. Unless the new modules are used there should be no noticeable changes when running OpenSim.

1 files changed, 22 insertions, 1 deletions

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index f97db5c..43e2a24 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -71,6 +71,7 @@ namespace OpenSim.Framework
             m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
             RemotingAddress = ConvertFrom.RemotingAddress;
             RegionID = LLUUID.Zero;
+            ServerURI = ConvertFrom.ServerURI; 
         }
 
         public LLUUID RegionID = LLUUID.Zero;
@@ -84,6 +85,19 @@ namespace OpenSim.Framework
         }
         public bool m_allow_alternate_ports;
 
+        public string m_serverURI;
+        public string ServerURI
+        {
+            get
+            {
+                return m_serverURI;
+            }
+            set
+            {
+                m_serverURI = value;
+            }
+        }
+
         public string RemotingAddress;
 
         public IPEndPoint ExternalEndPoint
@@ -175,6 +189,8 @@ namespace OpenSim.Framework
         public string MasterAvatarFirstName = String.Empty;
         public string MasterAvatarLastName = String.Empty;
         public string MasterAvatarSandboxPassword = String.Empty;
+        public string proxyUrl = ""; 
+        public LLUUID originRegionID = LLUUID.Zero;
 
         // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
         private EstateSettings m_estateSettings;
@@ -227,6 +243,10 @@ namespace OpenSim.Framework
             m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
             RemotingAddress = ConvertFrom.RemotingAddress;
             RegionID = LLUUID.Zero;
+            proxyUrl = ConvertFrom.ProxyUrl;
+            originRegionID = ConvertFrom.OriginRegionID;
+            RegionName = ConvertFrom.RegionName;
+            ServerURI = ConvertFrom.ServerURI;
         }
 
         public RegionInfo(SimpleRegionInfo ConvertFrom)
@@ -239,6 +259,7 @@ namespace OpenSim.Framework
             m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
             RemotingAddress = ConvertFrom.RemotingAddress;
             RegionID = LLUUID.Zero;
+            ServerURI = ConvertFrom.ServerURI; 
         }
 
         //not in use, should swap to nini though.
@@ -411,4 +432,4 @@ namespace OpenSim.Framework
 
         }
     }
-}
\ No newline at end of file
+}