Fix CR/LF inconsistencies
parent
9dc0a0d18b
commit
4ed2de0a43
|
@ -144,7 +144,7 @@ namespace Flocking
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// can't find it so make a default one
|
// 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);
|
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);
|
retVal = MakeDefaultPrim (name);
|
||||||
}
|
}
|
||||||
|
|
|
@ -181,12 +181,12 @@ namespace Flocking
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsWithinObstacle( int x, int y, int z ) {
|
public bool IsWithinObstacle( int x, int y, int z ) {
|
||||||
bool retVal = false;
|
bool retVal = false;
|
||||||
if (x >= LengthX || y >= LengthY || z >= LengthZ)
|
if (x >= LengthX || y >= LengthY || z >= LengthZ)
|
||||||
{
|
{
|
||||||
retVal = true;
|
retVal = true;
|
||||||
}
|
}
|
||||||
else if (x < 0 || y < 0 || z < 0)
|
else if (x < 0 || y < 0 || z < 0)
|
||||||
{
|
{
|
||||||
retVal = true;
|
retVal = true;
|
||||||
} else if (m_flowMap[x,y,z] > 50f) {
|
} else if (m_flowMap[x,y,z] > 50f) {
|
||||||
|
|
Loading…
Reference in New Issue