5 files changed, 40 insertions, 17 deletions

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index 857930a..3658161 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -67,8 +67,8 @@ namespace OpenSim.Framework
                     return m_pqueue.Dequeue();
                 
                 if (m_queue.Count > 0)
-                                        return m_queue.Dequeue();
-                                return default(T);
+                    return m_queue.Dequeue();
+                return default(T);
             }
         }
 
@@ -121,7 +121,7 @@ namespace OpenSim.Framework
             {
                 m_pqueue.Clear();
                 m_queue.Clear();
-                                Monitor.Pulse(m_queueSync);
+                Monitor.Pulse(m_queueSync);
             }
         }
     }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 29846f5..9fd043c 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -792,6 +792,7 @@ namespace OpenSim.Framework
         event PickGodDelete OnPickGodDelete;
         event PickInfoUpdate OnPickInfoUpdate;
         event AvatarNotesUpdate OnAvatarNotesUpdate;
+        event AvatarInterestUpdate OnAvatarInterestUpdate;
 
         event MuteListRequest OnMuteListRequest;
 
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index d3a5357..a7315f5 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -303,6 +303,7 @@ namespace OpenSim.Framework
         private int m_physPrimMax = 0;
         private bool m_clampPrimSize = false;
         private int m_objectCapacity = 0;
+        private string m_regionType = String.Empty;
 
 
         // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
@@ -478,6 +479,11 @@ namespace OpenSim.Framework
             get { return (byte)Util.ConvertMaturityToAccessLevel((uint)RegionSettings.Maturity); }
         }
 
+        public string RegionType
+        {
+            get { return m_regionType; }
+        }
+
         public void SetEndPoint(string ipaddr, int port)
         {
             IPAddress tmpIP = IPAddress.Parse(ipaddr);
@@ -654,8 +660,8 @@ namespace OpenSim.Framework
 
             MasterAvatarAssignedUUID = new UUID(masterAvatarUUID);
 
+            m_regionType = config.GetString("RegionType", String.Empty);
 
-            
             // Prim stuff
             //
             m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 256);
@@ -721,6 +727,9 @@ namespace OpenSim.Framework
 
             if (ScopeID != UUID.Zero)
                 config.Set("ScopeID", ScopeID.ToString());
+
+            if (RegionType != String.Empty)
+                config.Set("RegionType", RegionType);
         }
 
         public bool ignoreIncomingConfiguration(string configuration_key, object configuration_result)
@@ -810,6 +819,9 @@ namespace OpenSim.Framework
             
             configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                                                 "Scope ID for this region", ScopeID.ToString(), true);
+
+            configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                                "Region Type", String.Empty, true);
         }
 
         public void loadConfigurationOptions()
@@ -873,6 +885,9 @@ namespace OpenSim.Framework
 
             configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                                                 "Scope ID for this region", UUID.Zero.ToString(), true);
+
+            configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                                "Region Type", String.Empty, true);
         }
 
         public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
@@ -953,6 +968,9 @@ namespace OpenSim.Framework
                 case "scope_id":
                     ScopeID = (UUID)configuration_result;
                     break;
+                case "region_type":
+                    m_regionType = (string)configuration_result;
+                    break;
             }
 
             return true;
@@ -988,6 +1006,8 @@ namespace OpenSim.Framework
             args["allow_alt_ports"] = OSD.FromBoolean(m_allow_alternate_ports);
             if ((proxyUrl != null) && !proxyUrl.Equals(""))
                 args["proxy_url"] = OSD.FromString(proxyUrl);
+            if (RegionType != String.Empty)
+                args["region_type"] = OSD.FromString(RegionType);
 
             return args;
         }
@@ -1035,6 +1055,8 @@ namespace OpenSim.Framework
                 m_allow_alternate_ports = args["allow_alt_ports"].AsBoolean();
             if (args["proxy_url"] != null)
                 proxyUrl = args["proxy_url"].AsString();
+            if (args["region_type"] != null)
+                m_regionType = args["region_type"].AsString();
         }
 
         public static RegionInfo Create(UUID regionID, string regionName, uint regX, uint regY, string externalHostName, uint httpPort, uint simPort, uint remotingPort, string serverURI)
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
index a3bc5d1..ff0afc8 100644
--- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Serialization.External
     public class LandDataSerializer
     {
         protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
-        
+
         /// <summary>
         /// Reify/deserialize landData
         /// </summary>
@@ -52,7 +52,7 @@ namespace OpenSim.Framework.Serialization.External
         {
             return Deserialize(m_utf8Encoding.GetString(serializedLandData, 0, serializedLandData.Length));
         }
-        
+
         /// <summary>
         /// Reify/deserialize landData
         /// </summary>
@@ -62,10 +62,10 @@ namespace OpenSim.Framework.Serialization.External
         public static LandData Deserialize(string serializedLandData)
         {
             LandData landData = new LandData();
-            
+
             StringReader sr = new StringReader(serializedLandData);
             XmlTextReader xtr = new XmlTextReader(sr);
-            
+
             xtr.ReadStartElement("LandData");
 
             landData.Area           = Convert.ToInt32(                 xtr.ReadElementString("Area"));
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Serialization.External
                     pae.Time       = Convert.ToDateTime(                   xtr.ReadElementString("Time"));
                     pae.Flags      = (AccessList)Convert.ToUInt32(         xtr.ReadElementString("AccessList"));
                     xtr.ReadEndElement();
-                    
+
                     landData.ParcelAccessList.Add(pae);
                 }
             }
@@ -122,13 +122,13 @@ namespace OpenSim.Framework.Serialization.External
             landData.OtherCleanTime = Convert.ToInt32(                     xtr.ReadElementString("OtherCleanTime"));
 
             xtr.ReadEndElement();
-            
+
             xtr.Close();
             sr.Close();
-            
+
             return landData;
         }
-        
+
         public static string Serialize(LandData landData)
         {
             StringWriter sw = new StringWriter();
@@ -137,8 +137,8 @@ namespace OpenSim.Framework.Serialization.External
 
             xtw.WriteStartDocument();
             xtw.WriteStartElement("LandData");
-            
-            xtw.WriteElementString("Area",           Convert.ToString(landData.Area));            
+
+            xtw.WriteElementString("Area",           Convert.ToString(landData.Area));
             xtw.WriteElementString("AuctionID",      Convert.ToString(landData.AuctionID));
             xtw.WriteElementString("AuthBuyerID",    landData.AuthBuyerID.ToString());
             xtw.WriteElementString("Category",       Convert.ToString((sbyte)landData.Category));
@@ -170,7 +170,7 @@ namespace OpenSim.Framework.Serialization.External
                 xtw.WriteEndElement();
             }
             xtw.WriteEndElement();
-            
+
             xtw.WriteElementString("PassHours",       Convert.ToString(landData.PassHours));
             xtw.WriteElementString("PassPrice",       Convert.ToString(landData.PassPrice));
             xtw.WriteElementString("SalePrice",       Convert.ToString(landData.SalePrice));
@@ -184,7 +184,7 @@ namespace OpenSim.Framework.Serialization.External
 
             xtw.Close();
             sw.Close();
-            
+
             return sw.ToString();
         }
     }
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 845a9fe..0d93ff7 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -246,7 +246,7 @@ namespace OpenSim.Framework.Servers
                 foreach (ProcessThread t in threads)
                 {
                     sb.Append("ID: " + t.Id + ", TotalProcessorTime: " + t.TotalProcessorTime + ", TimeRunning: " +
-                        (DateTime.Now - t.StartTime) + ", Pri: " + t.CurrentPriority + ", State: " + t.ThreadState );
+                        (DateTime.Now - t.StartTime) + ", Pri: " + t.CurrentPriority + ", State: " + t.ThreadState);
                     if (t.ThreadState == System.Diagnostics.ThreadState.Wait)
                         sb.Append(", Reason: " + t.WaitReason + Environment.NewLine);
                     else