mirror of
https://github.com/opensim/opensim.git
synced 2026-08-14 09:25:45 +08:00
* Removed the duplicate AddCapsHandler that existed in ScenePresence.MakeRootAgent; CAPs are already in place when this runs.
* Moved MoveAgentIntoRegion further down in the CompleteMovement method. * changed a couple of methods from protected to public in SceneCommunicationService
This commit is contained in:
@@ -848,7 +848,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
|
||||
m_scene.SwapRootAgentCount(false);
|
||||
m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid);
|
||||
m_scene.CapsModule.AddCapsHandler(m_uuid);
|
||||
//m_scene.CapsModule.AddCapsHandler(m_uuid);
|
||||
|
||||
// On the next prim update, all objects will be sent
|
||||
//
|
||||
@@ -1005,8 +1005,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
look = new Vector3(0.99f, 0.042f, 0);
|
||||
}
|
||||
|
||||
m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look);
|
||||
|
||||
if (m_isChildAgent)
|
||||
{
|
||||
m_isChildAgent = false;
|
||||
@@ -1021,7 +1019,10 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
}
|
||||
|
||||
//m_log.DebugFormat("Completed movement");
|
||||
}
|
||||
}
|
||||
|
||||
m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look);
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user