From e3fa73da96f5612da52d140425f1633494d6edef Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 15 Jul 2012 17:17:59 +0200
Subject: Experimentally handle UseCircuitCode synchrnonously
---
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index bd8273d..56c0992 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -701,7 +701,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
object[] array = new object[] { buffer, packet };
- Util.FireAndForget(HandleUseCircuitCode, array);
+ //Util.FireAndForget(HandleUseCircuitCode, array);
+ HandleUseCircuitCode(array);
return;
}
--
cgit v1.1
From 8b4f7604e618ed409cd4dcb44dcf14ce22b72be7 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 15 Jul 2012 19:45:08 +0200
Subject: Revert "Experimentally handle UseCircuitCode synchrnonously"
This reverts commit e3fa73da96f5612da52d140425f1633494d6edef.
---
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 56c0992..bd8273d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -701,8 +701,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
object[] array = new object[] { buffer, packet };
- //Util.FireAndForget(HandleUseCircuitCode, array);
- HandleUseCircuitCode(array);
+ Util.FireAndForget(HandleUseCircuitCode, array);
return;
}
--
cgit v1.1
From 47f7cc9457bfc5c909290ac189b34dd3eceebe7f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 15 Jul 2012 20:41:10 +0200
Subject: Fix a sit rotation issue
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d2dab6f..952d5da 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8062,7 +8062,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
Quaternion srot = sitpart.RotationOffset;
- rot = Quaternion.Conjugate(srot) * rot; // removed sit part offset rotation
+ rot = srot * rot; // removed sit part offset rotation
av.Rotation = rot;
// av.SendAvatarDataToAllAgents();
av.SendTerseUpdateToAllClients();
--
cgit v1.1
From ec40c545091c8df70eea0e79e2878b69c0a649d9 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 15 Jul 2012 20:48:32 +0200
Subject: Revert "Fix a sit rotation issue"
This reverts commit 47f7cc9457bfc5c909290ac189b34dd3eceebe7f.
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 952d5da..d2dab6f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8062,7 +8062,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
Quaternion srot = sitpart.RotationOffset;
- rot = srot * rot; // removed sit part offset rotation
+ rot = Quaternion.Conjugate(srot) * rot; // removed sit part offset rotation
av.Rotation = rot;
// av.SendAvatarDataToAllAgents();
av.SendTerseUpdateToAllClients();
--
cgit v1.1
From a2d19b97030e2249372e8635b67276ff676460aa Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 15 Jul 2012 20:48:47 +0200
Subject: Replace sit position and rotation code with older, working version
---
.../Shared/Api/Implementation/LSL_Api.cs | 54 +++++++++++-----------
1 file changed, 28 insertions(+), 26 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d2dab6f..b20ca6d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8015,31 +8015,37 @@ 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;
@@ -8048,24 +8054,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
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 world rotation
+ LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
+ LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
-// 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();
+ 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;
--
cgit v1.1
From 8baf4dcc786b91a427e60dca9f0d0eeb05ddae19 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 15 Jul 2012 20:55:54 +0200
Subject: Reinstate older set rotation code for avatars since it works in all
cases
---
.../Shared/Api/Implementation/LSL_Api.cs | 23 +---------------------
1 file changed, 1 insertion(+), 22 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b20ca6d..5bade25 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;
@@ -8049,6 +8048,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
break;
+ case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
case (int)ScriptBaseClass.PRIM_ROTATION:
{
if (remain < 1)
@@ -8071,27 +8071,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
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();
- }
- break;
-
// parse rest doing nothing but number of parameters error check
case (int)ScriptBaseClass.PRIM_SIZE:
case (int)ScriptBaseClass.PRIM_MATERIAL:
--
cgit v1.1
From 283df0610de50f77460f980ba15e4cbb23f5b657 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 15 Jul 2012 21:45:06 +0200
Subject: Save packets received while the client is added and replay them
later.
---
.../Region/ClientStack/Linden/UDP/LLUDPServer.cs | 34 ++++++++++++++++++++++
1 file changed, 34 insertions(+)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index bd8273d..34923be 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,6 +714,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
IClientAPI client;
if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView))
{
+ 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);
return;
}
@@ -943,6 +954,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 +982,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(
--
cgit v1.1