Fix CR/LF inconsistencies

pull/1/merge
Jak Daniels 2015-09-23 19:56:25 +01:00
parent 9dc0a0d18b
commit 4ed2de0a43
2 changed files with 6 additions and 6 deletions

View File

@ -144,7 +144,7 @@ namespace Flocking
}
}
// can't find it so make a default one
if (retVal == null) {
if (retVal == null) {
m_log.InfoFormat("[{0}]: Prim named {1} was not found in region {2}. Making default wooden sphere.", m_name, name, m_scene.RegionInfo.RegionName);
retVal = MakeDefaultPrim (name);
}

View File

@ -181,12 +181,12 @@ namespace Flocking
}
public bool IsWithinObstacle( int x, int y, int z ) {
bool retVal = false;
if (x >= LengthX || y >= LengthY || z >= LengthZ)
bool retVal = false;
if (x >= LengthX || y >= LengthY || z >= LengthZ)
{
retVal = true;
}
else if (x < 0 || y < 0 || z < 0)
retVal = true;
}
else if (x < 0 || y < 0 || z < 0)
{
retVal = true;
} else if (m_flowMap[x,y,z] > 50f) {