OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make addavatar more friendly between plugins

avinationmerge
UbitUmarov 2015-09-03 22:09:27 +01:00
parent 7bfa311e32
commit 2f9a018bc8
2 changed files with 1968 additions and 3407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Physics/Manager/PhysicsScene.cs
View File

@ -156,12 +156,6 @@ namespace OpenSim.Region.Physics.Manager
public abstract PhysicsActor AddAvatar( public abstract PhysicsActor AddAvatar(
string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying); string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying);
public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
{
return null;
}
/// <summary> /// <summary>
/// Add an avatar /// Add an avatar
/// </summary> /// </summary>
@ -186,7 +180,7 @@ namespace OpenSim.Region.Physics.Manager
public virtual PhysicsActor AddAvatar( public virtual PhysicsActor AddAvatar(
uint localID, string avName, Vector3 position, Vector3 size, bool isFlying) uint localID, string avName, Vector3 position, Vector3 size, bool isFlying)
{ {
PhysicsActor ret = AddAvatar(avName, position, size, isFlying); PhysicsActor ret = AddAvatar(avName, position, Vector3.Zero, size, isFlying);
if (ret != null) if (ret != null)
ret.LocalID = localID; ret.LocalID = localID;
@ -197,7 +191,7 @@ namespace OpenSim.Region.Physics.Manager
public virtual PhysicsActor AddAvatar( public virtual PhysicsActor AddAvatar(
uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
{ {
PhysicsActor ret = AddAvatar(localID, avName, position, size, isFlying); PhysicsActor ret = AddAvatar(localID, avName, position, Vector3.Zero, size, isFlying);
return ret; return ret;
} }

5365
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

File diff suppressed because it is too large Load Diff