diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 150 |
1 files changed, 92 insertions, 58 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9100c29..8a42616 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -233,6 +233,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
233 | private bool m_collisionEventFlag = false; | 233 | private bool m_collisionEventFlag = false; |
234 | private object m_collisionEventLock = new Object(); | 234 | private object m_collisionEventLock = new Object(); |
235 | 235 | ||
236 | private Vector3 m_prevSitOffset; | ||
237 | |||
236 | protected AvatarAppearance m_appearance; | 238 | protected AvatarAppearance m_appearance; |
237 | 239 | ||
238 | public AvatarAppearance Appearance | 240 | public AvatarAppearance Appearance |
@@ -295,13 +297,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
295 | /// </summary> | 297 | /// </summary> |
296 | public PhysicsActor PhysicsActor { get; private set; } | 298 | public PhysicsActor PhysicsActor { get; private set; } |
297 | 299 | ||
298 | private byte m_movementflag; | 300 | /// <summary> |
299 | 301 | /// Record user movement inputs. | |
300 | public byte MovementFlag | 302 | /// </summary> |
301 | { | 303 | public byte MovementFlag { get; private set; } |
302 | set { m_movementflag = value; } | ||
303 | get { return m_movementflag; } | ||
304 | } | ||
305 | 304 | ||
306 | private bool m_updateflag; | 305 | private bool m_updateflag; |
307 | 306 | ||
@@ -647,6 +646,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
647 | } | 646 | } |
648 | private uint m_parentID; | 647 | private uint m_parentID; |
649 | 648 | ||
649 | public UUID ParentUUID | ||
650 | { | ||
651 | get { return m_parentUUID; } | ||
652 | set { m_parentUUID = value; } | ||
653 | } | ||
654 | private UUID m_parentUUID = UUID.Zero; | ||
655 | |||
650 | public float Health | 656 | public float Health |
651 | { | 657 | { |
652 | get { return m_health; } | 658 | get { return m_health; } |
@@ -868,7 +874,26 @@ namespace OpenSim.Region.Framework.Scenes | |||
868 | "[SCENE]: Upgrading child to root agent for {0} in {1}", | 874 | "[SCENE]: Upgrading child to root agent for {0} in {1}", |
869 | Name, m_scene.RegionInfo.RegionName); | 875 | Name, m_scene.RegionInfo.RegionName); |
870 | 876 | ||
871 | //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count); | 877 | if (ParentUUID != UUID.Zero) |
878 | { | ||
879 | m_log.DebugFormat("[SCENE PRESENCE]: Sitting avatar back on prim {0}", ParentUUID); | ||
880 | SceneObjectPart part = m_scene.GetSceneObjectPart(ParentUUID); | ||
881 | if (part == null) | ||
882 | { | ||
883 | m_log.ErrorFormat("[SCENE PRESENCE]: Can't find prim {0} to sit on", ParentUUID); | ||
884 | } | ||
885 | else | ||
886 | { | ||
887 | part.ParentGroup.AddAvatar(UUID); | ||
888 | if (part.SitTargetPosition != Vector3.Zero) | ||
889 | part.SitTargetAvatar = UUID; | ||
890 | ParentPosition = part.GetWorldPosition(); | ||
891 | ParentID = part.LocalId; | ||
892 | m_pos = m_prevSitOffset; | ||
893 | pos = ParentPosition; | ||
894 | } | ||
895 | ParentUUID = UUID.Zero; | ||
896 | } | ||
872 | 897 | ||
873 | bool wasChild = IsChildAgent; | 898 | bool wasChild = IsChildAgent; |
874 | IsChildAgent = false; | 899 | IsChildAgent = false; |
@@ -881,62 +906,64 @@ namespace OpenSim.Region.Framework.Scenes | |||
881 | 906 | ||
882 | m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); | 907 | m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); |
883 | 908 | ||
884 | // Moved this from SendInitialData to ensure that Appearance is initialized | 909 | if (ParentID == 0) |
885 | // before the inventory is processed in MakeRootAgent. This fixes a race condition | ||
886 | // related to the handling of attachments | ||
887 | //m_scene.GetAvatarAppearance(ControllingClient, out Appearance); | ||
888 | if (m_scene.TestBorderCross(pos, Cardinals.E)) | ||
889 | { | 910 | { |
890 | Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E); | 911 | // Moved this from SendInitialData to ensure that Appearance is initialized |
891 | pos.X = crossedBorder.BorderLine.Z - 1; | 912 | // before the inventory is processed in MakeRootAgent. This fixes a race condition |
892 | } | 913 | // related to the handling of attachments |
914 | //m_scene.GetAvatarAppearance(ControllingClient, out Appearance); | ||
915 | if (m_scene.TestBorderCross(pos, Cardinals.E)) | ||
916 | { | ||
917 | Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E); | ||
918 | pos.X = crossedBorder.BorderLine.Z - 1; | ||
919 | } | ||
893 | 920 | ||
894 | if (m_scene.TestBorderCross(pos, Cardinals.N)) | 921 | if (m_scene.TestBorderCross(pos, Cardinals.N)) |
895 | { | 922 | { |
896 | Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N); | 923 | Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N); |
897 | pos.Y = crossedBorder.BorderLine.Z - 1; | 924 | pos.Y = crossedBorder.BorderLine.Z - 1; |
898 | } | 925 | } |
899 | 926 | ||
900 | CheckAndAdjustLandingPoint(ref pos); | 927 | CheckAndAdjustLandingPoint(ref pos); |
901 | 928 | ||
902 | if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f) | 929 | if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f) |
903 | { | 930 | { |
904 | m_log.WarnFormat( | 931 | m_log.WarnFormat( |
905 | "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Clamping", | 932 | "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Clamping", |
906 | pos, Name, UUID); | 933 | pos, Name, UUID); |
907 | 934 | ||
908 | if (pos.X < 0f) pos.X = 0f; | 935 | if (pos.X < 0f) pos.X = 0f; |
909 | if (pos.Y < 0f) pos.Y = 0f; | 936 | if (pos.Y < 0f) pos.Y = 0f; |
910 | if (pos.Z < 0f) pos.Z = 0f; | 937 | if (pos.Z < 0f) pos.Z = 0f; |
911 | } | 938 | } |
912 | 939 | ||
913 | float localAVHeight = 1.56f; | 940 | float localAVHeight = 1.56f; |
914 | if (Appearance.AvatarHeight > 0) | 941 | if (Appearance.AvatarHeight > 0) |
915 | localAVHeight = Appearance.AvatarHeight; | 942 | localAVHeight = Appearance.AvatarHeight; |
916 | 943 | ||
917 | float posZLimit = 0; | 944 | float posZLimit = 0; |
918 | 945 | ||
919 | if (pos.X < Constants.RegionSize && pos.Y < Constants.RegionSize) | 946 | if (pos.X < Constants.RegionSize && pos.Y < Constants.RegionSize) |
920 | posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y]; | 947 | posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y]; |
921 | 948 | ||
922 | float newPosZ = posZLimit + localAVHeight / 2; | 949 | float newPosZ = posZLimit + localAVHeight / 2; |
923 | if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ))) | 950 | if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ))) |
924 | { | 951 | { |
925 | pos.Z = newPosZ; | 952 | pos.Z = newPosZ; |
926 | } | 953 | } |
927 | AbsolutePosition = pos; | 954 | AbsolutePosition = pos; |
928 | 955 | ||
929 | AddToPhysicalScene(isFlying); | 956 | AddToPhysicalScene(isFlying); |
930 | 957 | ||
931 | if (ForceFly) | 958 | if (ForceFly) |
932 | { | 959 | { |
933 | Flying = true; | 960 | Flying = true; |
934 | } | 961 | } |
935 | else if (FlyDisabled) | 962 | else if (FlyDisabled) |
936 | { | 963 | { |
937 | Flying = false; | 964 | Flying = false; |
965 | } | ||
938 | } | 966 | } |
939 | |||
940 | // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying | 967 | // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying |
941 | // avatar to return to the standing position in mid-air. On login it looks like this is being sent | 968 | // avatar to return to the standing position in mid-air. On login it looks like this is being sent |
942 | // elsewhere anyway | 969 | // elsewhere anyway |
@@ -954,11 +981,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
954 | { | 981 | { |
955 | m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments..."); | 982 | m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments..."); |
956 | // Resume scripts | 983 | // Resume scripts |
957 | foreach (SceneObjectGroup sog in m_attachments) | 984 | Util.FireAndForget(delegate(object x) { |
958 | { | 985 | foreach (SceneObjectGroup sog in m_attachments) |
959 | sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource()); | 986 | { |
960 | sog.ResumeScripts(); | 987 | sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource()); |
961 | } | 988 | sog.ResumeScripts(); |
989 | } | ||
990 | }); | ||
962 | } | 991 | } |
963 | } | 992 | } |
964 | 993 | ||
@@ -3122,6 +3151,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3122 | cAgent.AlwaysRun = SetAlwaysRun; | 3151 | cAgent.AlwaysRun = SetAlwaysRun; |
3123 | 3152 | ||
3124 | cAgent.Appearance = new AvatarAppearance(Appearance); | 3153 | cAgent.Appearance = new AvatarAppearance(Appearance); |
3154 | |||
3155 | cAgent.ParentPart = ParentUUID; | ||
3156 | cAgent.SitOffset = m_pos; | ||
3125 | 3157 | ||
3126 | lock (scriptedcontrols) | 3158 | lock (scriptedcontrols) |
3127 | { | 3159 | { |
@@ -3181,6 +3213,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3181 | CameraAtAxis = cAgent.AtAxis; | 3213 | CameraAtAxis = cAgent.AtAxis; |
3182 | CameraLeftAxis = cAgent.LeftAxis; | 3214 | CameraLeftAxis = cAgent.LeftAxis; |
3183 | m_CameraUpAxis = cAgent.UpAxis; | 3215 | m_CameraUpAxis = cAgent.UpAxis; |
3216 | ParentUUID = cAgent.ParentPart; | ||
3217 | m_prevSitOffset = cAgent.SitOffset; | ||
3184 | 3218 | ||
3185 | // When we get to the point of re-computing neighbors everytime this | 3219 | // When we get to the point of re-computing neighbors everytime this |
3186 | // changes, then start using the agent's drawdistance rather than the | 3220 | // changes, then start using the agent's drawdistance rather than the |