Fix Windows/Unix line endings and increse logging when named prim cannot be found.

pull/1/merge
Jak Daniels 2015-06-01 11:53:46 +01:00
parent d556a68cec
commit bee8823d9d
2 changed files with 8 additions and 8 deletions

View File

@ -50,7 +50,7 @@ namespace Flocking
set {
//if( value < m_flock.Count ) {
// m_flock.RemoveRange( 0, m_flock.Count - value );
//} else
//} else
m_flock = new List<Bird>();
while( value > m_flock.Count ) {
AddBird(m_name + m_flock.Count);
@ -89,27 +89,27 @@ namespace Flocking
}
public float MaxSpeed {
get {return m_maxSpeed;}
get {return m_maxSpeed;}
set { m_maxSpeed = value; }
}
public float MaxForce {
get {return m_maxForce;}
get {return m_maxForce;}
set { m_maxForce = value; }
}
public float NeighbourDistance {
get {return m_neighbourDistance;}
get {return m_neighbourDistance;}
set { m_neighbourDistance = value; }
}
public float DesiredSeparation {
get {return m_desiredSeparation;}
get {return m_desiredSeparation;}
set { m_desiredSeparation = value; }
}
public float Tolerance {
get {return m_tolerance;}
get {return m_tolerance;}
set { m_tolerance = value; }
}

View File

@ -143,9 +143,9 @@ namespace Flocking
break;
}
}
// 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);
}