From 88587b4e73b240693bd03172d52c4f13b5f47868 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 20 Aug 2014 21:41:16 +0100
Subject: reserve updates priority queue 2 for attachments, send them by it on
BestAvatarResp scheme. Attachments cannot be sent on imediate queues, since
they will block everything. Changed distance to priority math, keeping
identical result, shifted to start at queue 3.
---
OpenSim/Framework/PriorityQueue.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/PriorityQueue.cs b/OpenSim/Framework/PriorityQueue.cs
index e4f1111..d6c39a7 100644
--- a/OpenSim/Framework/PriorityQueue.cs
+++ b/OpenSim/Framework/PriorityQueue.cs
@@ -62,7 +62,9 @@ namespace OpenSim.Framework
private uint m_nextQueue = 0;
private uint m_countFromQueue = 0;
// first queues are imediate, so no counts
- private uint[] m_queueCounts = {0, 0, 8, 4, 4, 2, 2, 2, 2, 1, 1, 1};
+// private uint[] m_queueCounts = { 0, 0, 8, 4, 4, 2, 2, 2, 2, 1, 1, 1 };
+ private uint[] m_queueCounts = {0, 0, 8, 8, 5, 4, 3, 2, 1, 1, 1, 1};
+ // this is ava, ava, attach, <10m, 20,40,80,160m,320,640,1280, +
// next request is a counter of the number of updates queued, it provides
// a total ordering on the updates coming through the queue and is more
--
cgit v1.1
From 5bf145a3977a55c474106bbe2a6c107dd9457f0d Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 21 Aug 2014 00:49:10 +0100
Subject: add a direct sendpartfullUpdate to send a full object update to a
part, optionally overriding its parentID. check what it does to attachments
---
OpenSim/Framework/IClientAPI.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 3b0430b..d73802e 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1116,6 +1116,8 @@ namespace OpenSim.Framework
///
void SendKillObject(List localID);
+ void SendPartFullUpdate(ISceneEntity ent, uint? parentID);
+
void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
--
cgit v1.1