From 7f0d836d35e579632413e1b06d5f5e6e6981ca05 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 31 Oct 2007 05:29:51 +0000
Subject: made illogical bitwise operations logical

---
 OpenSim/Region/Environment/Modules/TextureDownloadModule.cs | 2 +-
 OpenSim/Region/Environment/Scenes/Scene.cs                  | 4 ++--
 OpenSim/Region/Environment/Scenes/ScenePresence.cs          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Environment')

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
             {
                 SendPacket();
                 counter++;
-                if ((PacketCounter >= NumPackets) | counter > 100 | (NumPackets == 1) | (request.DiscardLevel == -1))
+                if ((PacketCounter >= NumPackets) || counter > 100 || (NumPackets == 1) || (request.DiscardLevel == -1))
                 {
                     return true;
                 }
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
             XmlDocument doc = new XmlDocument();
             XmlNode rootNode;
             int primCount = 0;
-            if ((fileName.StartsWith("http:")) | (File.Exists(fileName)))
+            if (fileName.StartsWith("http:") || File.Exists(fileName))
             {
                 XmlTextReader reader = new XmlTextReader(fileName);
                 reader.WhitespaceHandling = WhitespaceHandling.None;
@@ -710,7 +710,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             XmlDocument doc = new XmlDocument();
             XmlNode rootNode;
-            if ((fileName.StartsWith("http:")) | (File.Exists(fileName)))
+            if (fileName.StartsWith("http:") || File.Exists(fileName))
             {
                 XmlTextReader reader = new XmlTextReader(fileName);
                 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
                         updateCount++;
                     }
 
-                    if (m_partsUpdateQueue.Count < 1 | updateCount > 60)
+                    if (m_partsUpdateQueue.Count < 1 || updateCount > 60)
                     {
                         runUpdate = false;
                     }
-- 
cgit v1.1