diff options
author | lbsa71 | 2007-09-19 04:19:27 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-19 04:19:27 +0000 |
commit | 2afbf8b22b1548c7994981acf92882c6d9628bb9 (patch) | |
tree | aae0d8494f800b7d23748069f108e606358cd5d1 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | * Deleted unused RegionManager.cs (diff) | |
download | opensim-SC_OLD-2afbf8b22b1548c7994981acf92882c6d9628bb9.zip opensim-SC_OLD-2afbf8b22b1548c7994981acf92882c6d9628bb9.tar.gz opensim-SC_OLD-2afbf8b22b1548c7994981acf92882c6d9628bb9.tar.bz2 opensim-SC_OLD-2afbf8b22b1548c7994981acf92882c6d9628bb9.tar.xz |
* Added AddToPhysicalScene and RemoveFromPhysicalScene and added to MakeAvatar and MakeChildAgent respectively
* Removed unused m_child from ClientView
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index df125aa..3a45e23 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -706,7 +706,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
706 | { | 706 | { |
707 | SubscribeToClientEvents(client); | 707 | SubscribeToClientEvents(client); |
708 | m_estateManager.sendRegionHandshake(client); | 708 | m_estateManager.sendRegionHandshake(client); |
709 | |||
709 | CreateAndAddScenePresence(client, child); | 710 | CreateAndAddScenePresence(client, child); |
711 | |||
710 | m_LandManager.sendParcelOverlay(client); | 712 | m_LandManager.sendParcelOverlay(client); |
711 | commsManager.UserProfiles.AddNewUser(client.AgentId); | 713 | commsManager.UserProfiles.AddNewUser(client.AgentId); |
712 | commsManager.TransactionsManager.AddUser(client.AgentId); | 714 | commsManager.TransactionsManager.AddUser(client.AgentId); |
@@ -791,13 +793,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
791 | MainLog.Instance.Verbose(RegionInfo.RegionName + ": Creating new root agent."); | 793 | MainLog.Instance.Verbose(RegionInfo.RegionName + ": Creating new root agent."); |
792 | MainLog.Instance.Verbose(RegionInfo.RegionName + ": Adding Physical agent."); | 794 | MainLog.Instance.Verbose(RegionInfo.RegionName + ": Adding Physical agent."); |
793 | 795 | ||
794 | PhysicsVector pVec = | 796 | newAvatar.AddToPhysicalScene( ); |
795 | new PhysicsVector(newAvatar.AbsolutePosition.X, newAvatar.AbsolutePosition.Y, | ||
796 | newAvatar.AbsolutePosition.Z); | ||
797 | lock (m_syncRoot) | ||
798 | { | ||
799 | newAvatar.PhysActor = phyScene.AddAvatar(pVec); | ||
800 | } | ||
801 | } | 797 | } |
802 | 798 | ||
803 | lock (Entities) | 799 | lock (Entities) |