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

* Added AddToPhysicalScene and RemoveFromPhysicalScene and added to MakeAvatar and MakeChildAgent respectively

Browse Source 
* Removed unused m_child from ClientView
This commit is contained in:
lbsa71
2007-09-19 04:19:27 +00:00
parent 440819fab9
commit 2afbf8b22b
6 changed files with 39 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -706,7 +706,9 @@ namespace OpenSim.Region.Environment.Scenes
{
SubscribeToClientEvents(client);
m_estateManager.sendRegionHandshake(client);
CreateAndAddScenePresence(client, child);
m_LandManager.sendParcelOverlay(client);
commsManager.UserProfiles.AddNewUser(client.AgentId);
commsManager.TransactionsManager.AddUser(client.AgentId);
@@ -791,13 +793,7 @@ namespace OpenSim.Region.Environment.Scenes
MainLog.Instance.Verbose(RegionInfo.RegionName + ": Creating new root agent.");
MainLog.Instance.Verbose(RegionInfo.RegionName + ": Adding Physical agent.");
PhysicsVector pVec =
new PhysicsVector(newAvatar.AbsolutePosition.X, newAvatar.AbsolutePosition.Y,
newAvatar.AbsolutePosition.Z);
lock (m_syncRoot)
{
newAvatar.PhysActor = phyScene.AddAvatar(pVec);
}
newAvatar.AddToPhysicalScene( );
}
lock (Entities)

35
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@@ -265,17 +265,17 @@ namespace OpenSim.Region.Environment.Scenes
}
}
/// <summary>
///
/// </summary>
/// <param name="pos"></param>
public void MakeAvatar(LLVector3 pos, bool isFlying)
{
//this.childAvatar = false;
AbsolutePosition = pos;
_physActor.Flying = isFlying;
newAvatar = true;
childAgent = false;
AbsolutePosition = pos;
AddToPhysicalScene( );
_physActor.Flying = isFlying;
m_scene.SendAllSceneObjectsToClient(this);
}
@@ -283,9 +283,17 @@ namespace OpenSim.Region.Environment.Scenes
{
Velocity = new LLVector3(0, 0, 0);
childAgent = true;
RemoveFromPhysicalScene();
//this.Pos = new LLVector3(128, 128, 70);
}
private void RemoveFromPhysicalScene()
{
m_scene.phyScene.RemoveAvatar( this.PhysActor );
}
/// <summary>
///
/// </summary>
@@ -832,7 +840,18 @@ namespace OpenSim.Region.Environment.Scenes
public override void SetText(string text, Vector3 color, double alpha)
{
throw new Exception("The method or operation is not implemented.");
throw new Exception("Can't set Text on avatar.");
}
public void AddToPhysicalScene( )
{
PhysicsScene scene = m_scene.phyScene;
PhysicsVector pVec =
new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y,
AbsolutePosition.Z);
_physActor = scene.AddAvatar(pVec);
}
}
}