ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bulletsim

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs
This commit is contained in:
Mic Bowman
2011-08-19 14:49:16 -07:00
parent fef73a1a10 a0a0c64cb1
commit 384cb79a1a
111 changed files with 2656 additions and 1160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@@ -258,7 +258,11 @@ namespace OpenSim.Region.Physics.OdePlugin
public override bool Flying
{
get { return flying; }
set { flying = value; }
set
{
flying = value;
// m_log.DebugFormat("[PHYSICS]: Set OdeCharacter Flying to {0}", flying);
}
}
/// <summary>
@@ -305,10 +309,12 @@ namespace OpenSim.Region.Physics.OdePlugin
{
m_iscolliding = true;
}
if (m_wascolliding != m_iscolliding)
{
//base.SendCollisionUpdate(new CollisionEventUpdate());
}
m_wascolliding = m_iscolliding;
}
}