diff options
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim')
4 files changed, 24 insertions, 8 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 7a34f0b..13f974b 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1082,7 +1082,15 @@ namespace OpenSim.Framework | |||
1082 | void SendWindData(Vector2[] windSpeeds); | 1082 | void SendWindData(Vector2[] windSpeeds); |
1083 | void SendCloudData(float[] cloudCover); | 1083 | void SendCloudData(float[] cloudCover); |
1084 | 1084 | ||
1085 | /// <summary> | ||
1086 | /// Sent when an agent completes its movement into a region. | ||
1087 | /// </summary> | ||
1088 | /// <remarks> | ||
1089 | /// This packet marks completion of the arrival of a root avatar in a region, whether through login, region | ||
1090 | /// crossing or direct teleport. | ||
1091 | /// </remarks> | ||
1085 | void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look); | 1092 | void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look); |
1093 | |||
1086 | void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint); | 1094 | void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint); |
1087 | 1095 | ||
1088 | /// <summary> | 1096 | /// <summary> |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index a097ec9..873c56c 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -785,9 +785,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
785 | OutPacket(handshake, ThrottleOutPacketType.Task); | 785 | OutPacket(handshake, ThrottleOutPacketType.Task); |
786 | } | 786 | } |
787 | 787 | ||
788 | /// <summary> | ||
789 | /// | ||
790 | /// </summary> | ||
791 | public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) | 788 | public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) |
792 | { | 789 | { |
793 | AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete); | 790 | AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete); |
@@ -3497,6 +3494,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3497 | 3494 | ||
3498 | public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) | 3495 | public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) |
3499 | { | 3496 | { |
3497 | // m_log.DebugFormat( | ||
3498 | // "[LLCLIENTVIEW]: Sending avatar appearance for {0} with {1} bytes to {2} {3}", | ||
3499 | // agentID, textureEntry.Length, Name, AgentId); | ||
3500 | |||
3500 | AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance); | 3501 | AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance); |
3501 | // TODO: don't create new blocks if recycling an old packet | 3502 | // TODO: don't create new blocks if recycling an old packet |
3502 | avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; | 3503 | avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; |
@@ -3518,7 +3519,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3518 | 3519 | ||
3519 | public void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs) | 3520 | public void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs) |
3520 | { | 3521 | { |
3521 | //m_log.DebugFormat("[CLIENT]: Sending animations to {0}", Name); | 3522 | // m_log.DebugFormat("[LLCLIENTVIEW]: Sending animations for {0} to {1}", sourceAgentId, Name); |
3522 | 3523 | ||
3523 | AvatarAnimationPacket ani = (AvatarAnimationPacket)PacketPool.Instance.GetPacket(PacketType.AvatarAnimation); | 3524 | AvatarAnimationPacket ani = (AvatarAnimationPacket)PacketPool.Instance.GetPacket(PacketType.AvatarAnimation); |
3524 | // TODO: don't create new blocks if recycling an old packet | 3525 | // TODO: don't create new blocks if recycling an old packet |
@@ -3553,6 +3554,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3553 | /// </summary> | 3554 | /// </summary> |
3554 | public void SendAvatarDataImmediate(ISceneEntity avatar) | 3555 | public void SendAvatarDataImmediate(ISceneEntity avatar) |
3555 | { | 3556 | { |
3557 | // m_log.DebugFormat( | ||
3558 | // "[LLCLIENTVIEW]: Sending immediate object update for avatar {0} {1} to {2} {3}", | ||
3559 | // avatar.Name, avatar.UUID, Name, AgentId); | ||
3560 | |||
3556 | ScenePresence presence = avatar as ScenePresence; | 3561 | ScenePresence presence = avatar as ScenePresence; |
3557 | if (presence == null) | 3562 | if (presence == null) |
3558 | return; | 3563 | return; |
@@ -3562,7 +3567,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3562 | 3567 | ||
3563 | objupdate.RegionData.RegionHandle = presence.RegionHandle; | 3568 | objupdate.RegionData.RegionHandle = presence.RegionHandle; |
3564 | objupdate.RegionData.TimeDilation = ushort.MaxValue; | 3569 | objupdate.RegionData.TimeDilation = ushort.MaxValue; |
3565 | 3570 | ||
3566 | objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1]; | 3571 | objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1]; |
3567 | objupdate.ObjectData[0] = CreateAvatarUpdateBlock(presence); | 3572 | objupdate.ObjectData[0] = CreateAvatarUpdateBlock(presence); |
3568 | 3573 | ||
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 94989de..fdbcbb0 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1216,7 +1216,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1216 | m_callbackURI = null; | 1216 | m_callbackURI = null; |
1217 | } | 1217 | } |
1218 | 1218 | ||
1219 | //m_log.DebugFormat("[SCENE PRESENCE] Completed movement"); | 1219 | // m_log.DebugFormat("[SCENE PRESENCE] Completed movement"); |
1220 | 1220 | ||
1221 | ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); | 1221 | ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); |
1222 | ValidateAndSendAppearanceAndAgentData(); | 1222 | ValidateAndSendAppearanceAndAgentData(); |
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index f5d4da8..feef49b 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
@@ -254,8 +254,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
254 | // Will need some controls around this | 254 | // Will need some controls around this |
255 | m_scene.LoginsDisabled = true; | 255 | m_scene.LoginsDisabled = true; |
256 | m_scene.LoginLock = true; | 256 | m_scene.LoginLock = true; |
257 | RRAlert("loading oar"); | 257 | if ( m_uri != string.Empty ) |
258 | RRAlert("disabled"); | 258 | { |
259 | RRAlert("loading oar"); | ||
260 | RRAlert("disabled"); | ||
261 | } | ||
259 | } | 262 | } |
260 | } | 263 | } |
261 | 264 | ||