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

Minor formatting / svn properties cleanup.

0.6.0-stable
Jeff Ames 2008-03-25 01:45:23 +00:00
parent dd6e6e7bdf
commit d2b1a8aa1e
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Grid/GridServer/GridServerBase.cs
View File

@ -45,13 +45,13 @@ namespace OpenSim.Grid.GridServer
{ {
protected GridConfig m_config; protected GridConfig m_config;
protected GridManager m_gridManager; protected GridManager m_gridManager;
protected BaseHttpServer httpServer; protected BaseHttpServer httpServer;
protected List<IGridPlugin> m_plugins = new List<IGridPlugin>(); protected List<IGridPlugin> m_plugins = new List<IGridPlugin>();
public BaseHttpServer HttpServer public BaseHttpServer HttpServer
{ {
get { return httpServer; } get { return httpServer; }
} }
public void Work() public void Work()
{ {
@ -63,7 +63,7 @@ namespace OpenSim.Grid.GridServer
} }
} }
public GridServerBase( ) public GridServerBase()
{ {
m_console = new ConsoleBase("OpenGrid", this); m_console = new ConsoleBase("OpenGrid", this);
MainConsole.Instance = m_console; MainConsole.Instance = m_console;
@ -138,7 +138,6 @@ namespace OpenSim.Grid.GridServer
} }
} }
protected virtual void SetupGridManager() protected virtual void SetupGridManager()
{ {
m_console.Status("[GRID]: Connecting to Storage Server"); m_console.Status("[GRID]: Connecting to Storage Server");

3
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -2689,7 +2689,6 @@ namespace OpenSim.Region.ClientStack
{ {
AddAck(Pack); // this adds the need to ack this packet later AddAck(Pack); // this adds the need to ack this packet later
if (Pack.Type != PacketType.PacketAck && Pack.Type != PacketType.LogoutRequest) if (Pack.Type != PacketType.PacketAck && Pack.Type != PacketType.LogoutRequest)
{ {
SetPendingAcks(ref Pack); SetPendingAcks(ref Pack);
@ -2727,7 +2726,7 @@ namespace OpenSim.Region.ClientStack
public virtual void InPacket(Packet NewPack) public virtual void InPacket(Packet NewPack)
{ {
if(!m_packetProcessingEnabled && NewPack.Type != PacketType.LogoutRequest) if (!m_packetProcessingEnabled && NewPack.Type != PacketType.LogoutRequest)
{ {
PacketPool.Instance.ReturnPacket(NewPack); PacketPool.Instance.ReturnPacket(NewPack);
return; return;

28
OpenSim/Region/Environment/Scenes/SceneManager.cs
View File

@ -281,22 +281,22 @@ namespace OpenSim.Region.Environment.Scenes
public void SetDebugPacketOnCurrentScene(int newDebug) public void SetDebugPacketOnCurrentScene(int newDebug)
{ {
ForEachCurrentScene(delegate(Scene scene) ForEachCurrentScene(delegate(Scene scene)
{ {
List<ScenePresence> scenePresences = scene.GetScenePresences(); List<ScenePresence> scenePresences = scene.GetScenePresences();
foreach (ScenePresence scenePresence in scenePresences) foreach (ScenePresence scenePresence in scenePresences)
{ {
if (!scenePresence.IsChildAgent) if (!scenePresence.IsChildAgent)
{ {
m_log.ErrorFormat("Packet debug for {0} {1} set to {2}", m_log.ErrorFormat("Packet debug for {0} {1} set to {2}",
scenePresence.Firstname, scenePresence.Firstname,
scenePresence.Lastname, scenePresence.Lastname,
newDebug); newDebug);
scenePresence.ControllingClient.SetDebug(newDebug); scenePresence.ControllingClient.SetDebug(newDebug);
} }
} }
}); });
} }
public List<ScenePresence> GetCurrentSceneAvatars() public List<ScenePresence> GetCurrentSceneAvatars()