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

* 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
0.6.3-post-fixes
diva 2009-02-08 00:54:56 +00:00
parent 0031489072
commit 665269a277
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -940,7 +940,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
protected bool WaitForCallback(UUID id)
public bool WaitForCallback(UUID id)
{
int count = 20;
while (m_agentsInTransit.Contains(id) && count-- > 0)
@ -961,7 +961,7 @@ namespace OpenSim.Region.Framework.Scenes
return ResetFromTransit(id);
}
protected void SetInTransit(UUID id)
public void SetInTransit(UUID id)
{
lock (m_agentsInTransit)
{

9
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -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>