diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 839259f..d89c1c0 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -757,7 +757,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
757 | m_name = String.Format("{0} {1}", Firstname, Lastname); | 757 | m_name = String.Format("{0} {1}", Firstname, Lastname); |
758 | m_scene = world; | 758 | m_scene = world; |
759 | m_uuid = client.AgentId; | 759 | m_uuid = client.AgentId; |
760 | m_localId = m_scene.AllocateLocalId(); | 760 | LocalId = m_scene.AllocateLocalId(); |
761 | 761 | ||
762 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid); | 762 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid); |
763 | if (account != null) | 763 | if (account != null) |
@@ -860,9 +860,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
860 | #region Status Methods | 860 | #region Status Methods |
861 | 861 | ||
862 | /// <summary> | 862 | /// <summary> |
863 | /// This turns a child agent, into a root agent | 863 | /// Turns a child agent into a root agent. |
864 | /// This is called when an agent teleports into a region, or if an | 864 | /// </summary> |
865 | /// agent crosses into this region from a neighbor over the border | 865 | /// Child agents are logged into neighbouring sims largely to observe changes. Root agents exist when the |
866 | /// avatar is actual in the sim. They can perform all actions. | ||
867 | /// This change is made whenever an avatar enters a region, whether by crossing over from a neighbouring sim, | ||
868 | /// teleporting in or on initial login. | ||
869 | /// | ||
870 | /// This method is on the critical path for transferring an avatar from one region to another. Delay here | ||
871 | /// delays that crossing. | ||
866 | /// </summary> | 872 | /// </summary> |
867 | public void MakeRootAgent(Vector3 pos, bool isFlying) | 873 | public void MakeRootAgent(Vector3 pos, bool isFlying) |
868 | { | 874 | { |