ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

made illogical bitwise operations logical

Browse Source
This commit is contained in:
Jeff Ames
2007-10-31 05:29:51 +00:00
parent 33d6222e8d
commit 7f0d836d35
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
View File

@@ -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;
}

4
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -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;

2
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@@ -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;
}