diff options
author | Jeff Ames | 2007-10-31 05:29:51 +0000 |
---|---|---|
committer | Jeff Ames | 2007-10-31 05:29:51 +0000 |
commit | 7f0d836d35e579632413e1b06d5f5e6e6981ca05 (patch) | |
tree | b7b2dad1fad193ff43ec431c046d381f7f9751bc /OpenSim/Region/Environment/Scenes | |
parent | Thank you Teravus, very much, for a 'jump', 'crouch' and 'inertia' patch for ... (diff) | |
download | opensim-SC_OLD-7f0d836d35e579632413e1b06d5f5e6e6981ca05.zip opensim-SC_OLD-7f0d836d35e579632413e1b06d5f5e6e6981ca05.tar.gz opensim-SC_OLD-7f0d836d35e579632413e1b06d5f5e6e6981ca05.tar.bz2 opensim-SC_OLD-7f0d836d35e579632413e1b06d5f5e6e6981ca05.tar.xz |
made illogical bitwise operations logical
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 |
2 files changed, 3 insertions, 3 deletions
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 | } |