aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2008-03-25 01:45:23 +0000
committerJeff Ames2008-03-25 01:45:23 +0000
commitd2b1a8aa1ee9396f8f73ce8a54e554a2fe730438 (patch)
treeb18d370d10dadc5c15d1d98933887f970a2ef0a2
parent* Added llApplyImpulse in the local frame. (diff)
downloadopensim-SC_OLD-d2b1a8aa1ee9396f8f73ce8a54e554a2fe730438.zip
opensim-SC_OLD-d2b1a8aa1ee9396f8f73ce8a54e554a2fe730438.tar.gz
opensim-SC_OLD-d2b1a8aa1ee9396f8f73ce8a54e554a2fe730438.tar.bz2
opensim-SC_OLD-d2b1a8aa1ee9396f8f73ce8a54e554a2fe730438.tar.xz
Minor formatting / svn properties cleanup.
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs11
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs32
3 files changed, 22 insertions, 24 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index acefe3f..884ba4f 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -45,13 +45,13 @@ namespace OpenSim.Grid.GridServer
45 { 45 {
46 protected GridConfig m_config; 46 protected GridConfig m_config;
47 protected GridManager m_gridManager; 47 protected GridManager m_gridManager;
48 protected BaseHttpServer httpServer; 48 protected BaseHttpServer httpServer;
49 protected List<IGridPlugin> m_plugins = new List<IGridPlugin>(); 49 protected List<IGridPlugin> m_plugins = new List<IGridPlugin>();
50 50
51 public BaseHttpServer HttpServer 51 public BaseHttpServer HttpServer
52 { 52 {
53 get { return httpServer; } 53 get { return httpServer; }
54 } 54 }
55 55
56 public void Work() 56 public void Work()
57 { 57 {
@@ -63,7 +63,7 @@ namespace OpenSim.Grid.GridServer
63 } 63 }
64 } 64 }
65 65
66 public GridServerBase( ) 66 public GridServerBase()
67 { 67 {
68 m_console = new ConsoleBase("OpenGrid", this); 68 m_console = new ConsoleBase("OpenGrid", this);
69 MainConsole.Instance = m_console; 69 MainConsole.Instance = m_console;
@@ -137,7 +137,6 @@ namespace OpenSim.Grid.GridServer
137 m_plugins.Add(plugin); 137 m_plugins.Add(plugin);
138 } 138 }
139 } 139 }
140
141 140
142 protected virtual void SetupGridManager() 141 protected virtual void SetupGridManager()
143 { 142 {
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 3f971a8..971c295 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2689,7 +2689,6 @@ namespace OpenSim.Region.ClientStack
2689 { 2689 {
2690 AddAck(Pack); // this adds the need to ack this packet later 2690 AddAck(Pack); // this adds the need to ack this packet later
2691 2691
2692
2693 if (Pack.Type != PacketType.PacketAck && Pack.Type != PacketType.LogoutRequest) 2692 if (Pack.Type != PacketType.PacketAck && Pack.Type != PacketType.LogoutRequest)
2694 { 2693 {
2695 SetPendingAcks(ref Pack); 2694 SetPendingAcks(ref Pack);
@@ -2727,7 +2726,7 @@ namespace OpenSim.Region.ClientStack
2727 2726
2728 public virtual void InPacket(Packet NewPack) 2727 public virtual void InPacket(Packet NewPack)
2729 { 2728 {
2730 if(!m_packetProcessingEnabled && NewPack.Type != PacketType.LogoutRequest) 2729 if (!m_packetProcessingEnabled && NewPack.Type != PacketType.LogoutRequest)
2731 { 2730 {
2732 PacketPool.Instance.ReturnPacket(NewPack); 2731 PacketPool.Instance.ReturnPacket(NewPack);
2733 return; 2732 return;
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index e3c1800..ec72207 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -281,22 +281,22 @@ namespace OpenSim.Region.Environment.Scenes
281 public void SetDebugPacketOnCurrentScene(int newDebug) 281 public void SetDebugPacketOnCurrentScene(int newDebug)
282 { 282 {
283 ForEachCurrentScene(delegate(Scene scene) 283 ForEachCurrentScene(delegate(Scene scene)
284 { 284 {
285 List<ScenePresence> scenePresences = scene.GetScenePresences(); 285 List<ScenePresence> scenePresences = scene.GetScenePresences();
286 286
287 foreach (ScenePresence scenePresence in scenePresences) 287 foreach (ScenePresence scenePresence in scenePresences)
288 { 288 {
289 if (!scenePresence.IsChildAgent) 289 if (!scenePresence.IsChildAgent)
290 { 290 {
291 m_log.ErrorFormat("Packet debug for {0} {1} set to {2}", 291 m_log.ErrorFormat("Packet debug for {0} {1} set to {2}",
292 scenePresence.Firstname, 292 scenePresence.Firstname,
293 scenePresence.Lastname, 293 scenePresence.Lastname,
294 newDebug); 294 newDebug);
295 295
296 scenePresence.ControllingClient.SetDebug(newDebug); 296 scenePresence.ControllingClient.SetDebug(newDebug);
297 } 297 }
298 } 298 }
299 }); 299 });
300 } 300 }
301 301
302 public List<ScenePresence> GetCurrentSceneAvatars() 302 public List<ScenePresence> GetCurrentSceneAvatars()