diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index c64b5f2dcb..10e8e48fb1 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -153,6 +153,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Flag to signal when clients should send pings
private bool m_sendPing;
+ private ExpiringCache> m_pendingCache = new ExpiringCache>();
+
private int m_defaultRTO = 0;
private int m_maxRTO = 0;
@@ -701,6 +703,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
object[] array = new object[] { buffer, packet };
+ lock (m_pendingCache)
+ m_pendingCache.AddOrUpdate(address, new Queue(), 60);
Util.FireAndForget(HandleUseCircuitCode, array);
return;
@@ -710,7 +714,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
IClientAPI client;
if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView))
{
+<<<<<<< HEAD
m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
+=======
+ lock (m_pendingCache)
+ {
+ Queue queue;
+ if (m_pendingCache.TryGetValue(address, out queue))
+ queue.Enqueue(buffer);
+ }
+
+// m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
+>>>>>>> 2606484e45138adef289386509b1e27552a32aee
return;
}
@@ -943,6 +958,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// We only want to send initial data to new clients, not ones which are being converted from child to root.
if (client != null)
client.SceneAgent.SendInitialDataToMe();
+
+ // Now we know we can handle more data
+ Thread.Sleep(200);
+
+ // Obtain the queue and remove it from the cache
+ Queue queue = null;
+
+ lock (m_pendingCache)
+ {
+ if (!m_pendingCache.TryGetValue(remoteEndPoint, out queue))
+ return;
+ m_pendingCache.Remove(remoteEndPoint);
+ }
+
+ // Reinject queued packets
+ while(queue.Count > 0)
+ {
+ UDPPacketBuffer buf = queue.Dequeue();
+ PacketReceived(buf);
+ }
+ queue = null;
}
else
{
@@ -950,6 +986,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_log.WarnFormat(
"[LLUDPSERVER]: Connection request for client {0} connecting with unnotified circuit code {1} from {2}",
uccp.CircuitCode.ID, uccp.CircuitCode.Code, remoteEndPoint);
+ lock (m_pendingCache)
+ m_pendingCache.Remove(remoteEndPoint);
}
// m_log.DebugFormat(
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d2dab6fe4c..5bade25e68 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8000,7 +8000,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
//This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
int idx = 0;
- SceneObjectPart sitpart = World.GetSceneObjectPart(av.ParentID); // betting this will be used
bool positionChanged = false;
Vector3 finalPos = Vector3.Zero;
@@ -8015,78 +8014,60 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
switch (code)
{
- // a avatar is a child
case (int)ScriptBaseClass.PRIM_POSITION:
case (int)ScriptBaseClass.PRIM_POS_LOCAL:
{
if (remain < 1)
return;
+
LSL_Vector v;
v = rules.GetVector3Item(idx++);
- if (sitpart == null)
+ SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
+ if (part == null)
break;
- Vector3 pos = new Vector3((float)v.x, (float)v.y, (float)v.z); // requested absolute position
-
- if (sitpart != sitpart.ParentGroup.RootPart)
+ LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
+ LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
+ if (llGetLinkNumber() > 1)
{
- pos -= sitpart.OffsetPosition; // remove sit part offset
- Quaternion rot = sitpart.RotationOffset;
- pos *= Quaternion.Conjugate(rot); // removed sit part rotation
+ localRot = llGetLocalRot();
+ localPos = llGetLocalPos();
}
- Vector3 sitOffset = (Zrot(av.Rotation)) * (av.Appearance.AvatarHeight * 0.02638f * 2.0f);
- pos += sitOffset;
- finalPos = pos;
- positionChanged = true;
+ v -= localPos;
+ v /= localRot;
+
+ LSL_Vector sitOffset = (llRot2Up(new LSL_Rotation(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W)) * av.Appearance.AvatarHeight * 0.02638f);
+
+ v = v + 2 * sitOffset;
+
+ av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
+ av.SendAvatarDataToAllAgents();
+
}
break;
+ case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
case (int)ScriptBaseClass.PRIM_ROTATION:
{
if (remain < 1)
return;
- if (sitpart == null)
- break;
+ LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
+ LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
- LSL_Rotation r = rules.GetQuaternionItem(idx++);
- Quaternion rot = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); // requested world rotation
-
-// need to replicate SL bug
- SceneObjectGroup sitgrp = sitpart.ParentGroup;
- if (sitgrp != null && sitgrp.RootPart != sitpart)
+ if (llGetLinkNumber() > 1)
{
- rot = sitgrp.RootPart.RotationOffset * rot;
+ localRot = llGetLocalRot();
+ localPos = llGetLocalPos();
}
- Quaternion srot = sitpart.RotationOffset;
- rot = Quaternion.Conjugate(srot) * rot; // removed sit part offset rotation
- av.Rotation = rot;
-// av.SendAvatarDataToAllAgents();
- av.SendTerseUpdateToAllClients();
- }
- break;
-
- case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
- {
- if (remain < 1)
- return;
-
- if (sitpart == null)
- break;
-
- LSL_Rotation r = rules.GetQuaternionItem(idx++);
- Quaternion rot = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); // requested offset rotation
- if (sitpart != sitpart.ParentGroup.RootPart)
- {
- Quaternion srot = sitpart.RotationOffset;
- rot = Quaternion.Conjugate(srot) * rot; // remove sit part offset rotation
- }
- av.Rotation = rot;
-// av.SendAvatarDataToAllAgents();
- av.SendTerseUpdateToAllClients();
+ LSL_Rotation r;
+ r = rules.GetQuaternionItem(idx++);
+ r = r * llGetRootRotation() / localRot;
+ av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
+ av.SendAvatarDataToAllAgents();
}
break;