ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization

Browse Source
This commit is contained in:
John Hurliman
2009-10-19 15:19:37 -07:00
parent 142008121e 0a259caeef
commit bd03cbd815
16 changed files with 86 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/BlockingQueue.cs
View File

@@ -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);
}
}
}

24
OpenSim/Framework/Serialization/External/LandDataSerializer.cs vendored
View File

@@ -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();
}
}

2
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@@ -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