diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index acefe3f34e..884ba4fe06 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs @@ -45,13 +45,13 @@ namespace OpenSim.Grid.GridServer { protected GridConfig m_config; protected GridManager m_gridManager; - protected BaseHttpServer httpServer; + protected BaseHttpServer httpServer; protected List m_plugins = new List(); public BaseHttpServer HttpServer - { - get { return httpServer; } - } + { + get { return httpServer; } + } public void Work() { @@ -63,7 +63,7 @@ namespace OpenSim.Grid.GridServer } } - public GridServerBase( ) + public GridServerBase() { m_console = new ConsoleBase("OpenGrid", this); MainConsole.Instance = m_console; @@ -137,7 +137,6 @@ namespace OpenSim.Grid.GridServer m_plugins.Add(plugin); } } - protected virtual void SetupGridManager() { diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 3f971a857d..971c2951a6 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs @@ -2689,7 +2689,6 @@ namespace OpenSim.Region.ClientStack { AddAck(Pack); // this adds the need to ack this packet later - if (Pack.Type != PacketType.PacketAck && Pack.Type != PacketType.LogoutRequest) { SetPendingAcks(ref Pack); @@ -2727,7 +2726,7 @@ namespace OpenSim.Region.ClientStack public virtual void InPacket(Packet NewPack) { - if(!m_packetProcessingEnabled && NewPack.Type != PacketType.LogoutRequest) + if (!m_packetProcessingEnabled && NewPack.Type != PacketType.LogoutRequest) { PacketPool.Instance.ReturnPacket(NewPack); return; diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index e3c18009f5..ec722075c8 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs @@ -281,22 +281,22 @@ namespace OpenSim.Region.Environment.Scenes public void SetDebugPacketOnCurrentScene(int newDebug) { ForEachCurrentScene(delegate(Scene scene) - { - List scenePresences = scene.GetScenePresences(); + { + List scenePresences = scene.GetScenePresences(); - foreach (ScenePresence scenePresence in scenePresences) - { - if (!scenePresence.IsChildAgent) - { - m_log.ErrorFormat("Packet debug for {0} {1} set to {2}", - scenePresence.Firstname, - scenePresence.Lastname, - newDebug); + foreach (ScenePresence scenePresence in scenePresences) + { + if (!scenePresence.IsChildAgent) + { + m_log.ErrorFormat("Packet debug for {0} {1} set to {2}", + scenePresence.Firstname, + scenePresence.Lastname, + newDebug); - scenePresence.ControllingClient.SetDebug(newDebug); - } - } - }); + scenePresence.ControllingClient.SetDebug(newDebug); + } + } + }); } public List GetCurrentSceneAvatars()