OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Formatting cleanup.

0.6.0-stable
Jeff Ames 2008-03-18 15:30:38 +00:00
parent aad69b9018
commit e5b9144282
13 changed files with 331 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -723,13 +723,19 @@ namespace OpenSim
break; break;
case "scene-debug": case "scene-debug":
if (cmdparams.Length == 3) { if (cmdparams.Length == 3)
if (m_sceneManager.CurrentScene == null) { {
if (m_sceneManager.CurrentScene == null)
{
m_console.Error("CONSOLE", "Please use 'change-region <regioname>' first"); m_console.Error("CONSOLE", "Please use 'change-region <regioname>' first");
} else { }
else
{
m_sceneManager.CurrentScene.SetSceneCoreDebug(!System.Convert.ToBoolean(cmdparams[0]), !System.Convert.ToBoolean(cmdparams[1]), !System.Convert.ToBoolean(cmdparams[2])); m_sceneManager.CurrentScene.SetSceneCoreDebug(!System.Convert.ToBoolean(cmdparams[0]), !System.Convert.ToBoolean(cmdparams[1]), !System.Convert.ToBoolean(cmdparams[2]));
} }
} else { }
else
{
m_console.Error("scene-debug <scripting> <collisions> <physics> (where inside <> is true/false)"); m_console.Error("scene-debug <scripting> <collisions> <physics> (where inside <> is true/false)");
} }
break; break;
@ -779,8 +785,8 @@ namespace OpenSim
// { // {
// _tc++; // _tc++;
// m_console.Notice("THREAD", _tc + ": ID: " + pt.Id + ", Started: " + pt.StartTime.ToString() + ", CPU time: " + pt.TotalProcessorTime + ", Pri: " + pt.BasePriority.ToString() + ", State: " + pt.ThreadState.ToString()); // m_console.Notice("THREAD", _tc + ": ID: " + pt.Id + ", Started: " + pt.StartTime.ToString() + ", CPU time: " + pt.TotalProcessorTime + ", Pri: " + pt.BasePriority.ToString() + ", State: " + pt.ThreadState.ToString());
// } // }
List<Thread> threads = OpenSim.Framework.ThreadTracker.GetThreads(); List<Thread> threads = OpenSim.Framework.ThreadTracker.GetThreads();
if (threads == null) if (threads == null)
{ {
@ -797,7 +803,6 @@ namespace OpenSim
} }
} }
break; break;
case "save-xml": case "save-xml":
if (cmdparams.Length > 0) if (cmdparams.Length > 0)
@ -1191,6 +1196,7 @@ namespace OpenSim
} }
#endregion #endregion
// TODO: remove me!! (almost same as XmlRpcCommand) // TODO: remove me!! (almost same as XmlRpcCommand)
public object ProxyCommand(string url, string methodName, params object[] args) public object ProxyCommand(string url, string methodName, params object[] args)
{ {
@ -1257,7 +1263,6 @@ namespace OpenSim
accounter++; accounter++;
}); });
regionnum = accounter; regionnum = accounter;
} }
} }
} }

17
OpenSim/Region/Environment/Modules/ChatModule.cs
View File

@ -91,7 +91,8 @@ namespace OpenSim.Region.Environment.Modules
// setup IRC Relay // setup IRC Relay
if (m_irc == null) { m_irc = new IRCChatModule(config); } if (m_irc == null) { m_irc = new IRCChatModule(config); }
if (m_irc_connector == null) { if (m_irc_connector == null)
{
m_irc_connector = new Thread(IRCConnectRun); m_irc_connector = new Thread(IRCConnectRun);
m_irc_connector.Name = "IRCConnectorThread"; m_irc_connector.Name = "IRCConnectorThread";
m_irc_connector.IsBackground = true; m_irc_connector.IsBackground = true;
@ -106,12 +107,14 @@ namespace OpenSim.Region.Environment.Modules
try try
{ {
//m_irc.Connect(m_scenes); //m_irc.Connect(m_scenes);
if (m_irc_connector == null) { if (m_irc_connector == null)
{
m_irc_connector = new Thread(IRCConnectRun); m_irc_connector = new Thread(IRCConnectRun);
m_irc_connector.Name = "IRCConnectorThread"; m_irc_connector.Name = "IRCConnectorThread";
m_irc_connector.IsBackground = true; m_irc_connector.IsBackground = true;
} }
if (!m_irc_connector.IsAlive) { if (!m_irc_connector.IsAlive)
{
m_irc_connector.Start(); m_irc_connector.Start();
OpenSim.Framework.ThreadTracker.Add(m_irc_connector); OpenSim.Framework.ThreadTracker.Add(m_irc_connector);
} }
@ -255,11 +258,14 @@ namespace OpenSim.Region.Environment.Modules
// In a non-blocking way. Eventually the connector will get it started // In a non-blocking way. Eventually the connector will get it started
try try
{ {
if (m_irc_connector == null) { m_irc_connector = new Thread(IRCConnectRun); if (m_irc_connector == null)
{
m_irc_connector = new Thread(IRCConnectRun);
m_irc_connector.Name = "IRCConnectorThread"; m_irc_connector.Name = "IRCConnectorThread";
m_irc_connector.IsBackground = true; m_irc_connector.IsBackground = true;
} }
if (!m_irc_connector.IsAlive) { if (!m_irc_connector.IsAlive)
{
m_irc_connector.Start(); m_irc_connector.Start();
OpenSim.Framework.ThreadTracker.Add(m_irc_connector); OpenSim.Framework.ThreadTracker.Add(m_irc_connector);
} }
@ -298,7 +304,6 @@ namespace OpenSim.Region.Environment.Modules
if ((m_irc.Enabled)&&(!m_irc.Connected)) if ((m_irc.Enabled)&&(!m_irc.Connected))
{ {
m_irc.Connect(m_scenes); m_irc.Connect(m_scenes);
} }
Thread.Sleep(15000); Thread.Sleep(15000);
} }

7
OpenSim/Region/Environment/Modules/VectorRenderModule.cs
View File

@ -126,7 +126,8 @@ namespace OpenSim.Region.Environment.Modules
} }
/* private void CairoDraw(string data, System.Drawing.Graphics graph) /*
private void CairoDraw(string data, System.Drawing.Graphics graph)
{ {
using (Win32Surface draw = new Win32Surface(graph.GetHdc())) using (Win32Surface draw = new Win32Surface(graph.GetHdc()))
{ {
@ -160,7 +161,8 @@ namespace OpenSim.Region.Environment.Modules
} }
} }
graph.ReleaseHdc(); graph.ReleaseHdc();
}*/ }
*/
private void GDIDraw(string data, System.Drawing.Graphics graph) private void GDIDraw(string data, System.Drawing.Graphics graph)
{ {
@ -173,7 +175,6 @@ namespace OpenSim.Region.Environment.Modules
char[] partsDelimiter = { ',' }; char[] partsDelimiter = { ',' };
string[] lines = data.Split(lineDelimiter); string[] lines = data.Split(lineDelimiter);
foreach (string line in lines) foreach (string line in lines)
{ {
string nextLine = line.Trim(); string nextLine = line.Trim();

6
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -227,6 +227,7 @@ namespace OpenSim.Region.Environment.Scenes
get { return m_innerScene.RestorePresences; } get { return m_innerScene.RestorePresences; }
set { m_innerScene.RestorePresences = value; } set { m_innerScene.RestorePresences = value; }
} }
#endregion #endregion
#region Constructors #region Constructors
@ -1048,7 +1049,6 @@ namespace OpenSim.Region.Environment.Scenes
m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)");
} }
/// <summary> /// <summary>
/// Returns a new unallocated primitive ID /// Returns a new unallocated primitive ID
/// </summary> /// </summary>
@ -1269,12 +1269,14 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
} }
public void IncomingInterRegionPrimGroup(ulong regionHandle, LLUUID primID, string objXMLData) public void IncomingInterRegionPrimGroup(ulong regionHandle, LLUUID primID, string objXMLData)
{ {
m_log.Warn("{[INTERREGION]: A new prim arrived from a neighbor"); m_log.Warn("{[INTERREGION]: A new prim arrived from a neighbor");
m_sceneXmlLoader.LoadGroupFromXml2String(objXMLData); m_sceneXmlLoader.LoadGroupFromXml2String(objXMLData);
} }
#endregion #endregion
#region Add/Remove Avatar Methods #region Add/Remove Avatar Methods
@ -1903,8 +1905,6 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
#endregion #endregion
#region Other Methods #region Other Methods

4
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -115,12 +115,11 @@ namespace OpenSim.Region.Environment.Scenes
protected AvatarAppearance m_appearance; protected AvatarAppearance m_appearance;
private readonly List<ulong> m_knownChildRegions = new List<ulong>();
//neighbouring regions we have enabled a child agent in //neighbouring regions we have enabled a child agent in
private readonly List<ulong> m_knownChildRegions = new List<ulong>();
private SignificantClientMovement handlerSignificantClientMovement = null; //OnSignificantClientMovement; private SignificantClientMovement handlerSignificantClientMovement = null; //OnSignificantClientMovement;
/// <summary> /// <summary>
/// Implemented Control Flags /// Implemented Control Flags
/// </summary> /// </summary>
@ -1792,7 +1791,6 @@ namespace OpenSim.Region.Environment.Scenes
info.AddValue("FullID", FullID.UUID); info.AddValue("FullID", FullID.UUID);
info.AddValue("LastFullUpdateTime", LastFullUpdateTime); info.AddValue("LastFullUpdateTime", LastFullUpdateTime);
info.AddValue("LastTerseUpdateTime", LastTerseUpdateTime); info.AddValue("LastTerseUpdateTime", LastTerseUpdateTime);
} }
} }