aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/TextureDownloadModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs6
4 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 66c499b..5ba5941 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -187,7 +187,7 @@ namespace OpenSim.Region.Environment.Modules
187 { 187 {
188 SendPacket(); 188 SendPacket();
189 counter++; 189 counter++;
190 if ((PacketCounter >= NumPackets) | counter > 100 | (NumPackets == 1) | (request.DiscardLevel == -1)) 190 if ((PacketCounter >= NumPackets) || counter > 100 || (NumPackets == 1) || (request.DiscardLevel == -1))
191 { 191 {
192 return true; 192 return true;
193 } 193 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 0a2a5a3..279f34e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -653,7 +653,7 @@ namespace OpenSim.Region.Environment.Scenes
653 XmlDocument doc = new XmlDocument(); 653 XmlDocument doc = new XmlDocument();
654 XmlNode rootNode; 654 XmlNode rootNode;
655 int primCount = 0; 655 int primCount = 0;
656 if ((fileName.StartsWith("http:")) | (File.Exists(fileName))) 656 if (fileName.StartsWith("http:") || File.Exists(fileName))
657 { 657 {
658 XmlTextReader reader = new XmlTextReader(fileName); 658 XmlTextReader reader = new XmlTextReader(fileName);
659 reader.WhitespaceHandling = WhitespaceHandling.None; 659 reader.WhitespaceHandling = WhitespaceHandling.None;
@@ -710,7 +710,7 @@ namespace OpenSim.Region.Environment.Scenes
710 { 710 {
711 XmlDocument doc = new XmlDocument(); 711 XmlDocument doc = new XmlDocument();
712 XmlNode rootNode; 712 XmlNode rootNode;
713 if ((fileName.StartsWith("http:")) | (File.Exists(fileName))) 713 if (fileName.StartsWith("http:") || File.Exists(fileName))
714 { 714 {
715 XmlTextReader reader = new XmlTextReader(fileName); 715 XmlTextReader reader = new XmlTextReader(fileName);
716 reader.WhitespaceHandling = WhitespaceHandling.None; 716 reader.WhitespaceHandling = WhitespaceHandling.None;
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index b9c723b..56c1401 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -338,7 +338,7 @@ namespace OpenSim.Region.Environment.Scenes
338 updateCount++; 338 updateCount++;
339 } 339 }
340 340
341 if (m_partsUpdateQueue.Count < 1 | updateCount > 60) 341 if (m_partsUpdateQueue.Count < 1 || updateCount > 60)
342 { 342 {
343 runUpdate = false; 343 runUpdate = false;
344 } 344 }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 4afe784..82b94db 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -333,13 +333,13 @@ namespace OpenSim.Region.Physics.OdePlugin
333 step_time += timeStep; 333 step_time += timeStep;
334 lock (OdeLock) 334 lock (OdeLock)
335 { 335 {
336 if (_characters.Count > 0 & RENDER_FLAG) 336 if (_characters.Count > 0 && RENDER_FLAG)
337 { 337 {
338 Console.WriteLine("RENDER: frame"); 338 Console.WriteLine("RENDER: frame");
339 } 339 }
340 foreach (OdePrim p in _prims) 340 foreach (OdePrim p in _prims)
341 { 341 {
342 if (_characters.Count > 0 & RENDER_FLAG) 342 if (_characters.Count > 0 && RENDER_FLAG)
343 { 343 {
344 Vector3 rx, ry, rz; 344 Vector3 rx, ry, rz;
345 p.Orientation.ToAxes(out rx, out ry, out rz); 345 p.Orientation.ToAxes(out rx, out ry, out rz);
@@ -607,7 +607,7 @@ namespace OpenSim.Region.Physics.OdePlugin
607 d.Vector3 vel = d.BodyGetLinearVel(Body); 607 d.Vector3 vel = d.BodyGetLinearVel(Body);
608 608
609 // if velocity is zero, use position control; otherwise, velocity control 609 // if velocity is zero, use position control; otherwise, velocity control
610 if (_target_velocity.X == 0.0f & _target_velocity.Y == 0.0f & _target_velocity.Z == 0.0f & iscolliding) 610 if (_target_velocity.X == 0.0f && _target_velocity.Y == 0.0f && _target_velocity.Z == 0.0f && iscolliding)
611 { 611 {
612 // keep track of where we stopped. No more slippin' & slidin' 612 // keep track of where we stopped. No more slippin' & slidin'
613 if (!_zeroFlag) 613 if (!_zeroFlag)