diff options
| author | Melanie Thielker | 2014-08-21 02:38:57 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-08-21 02:38:57 +0200 |
| commit | f06f13b59dd7261bfdcee59b546431fe47dcc635 (patch) | |
| tree | 81cdfa2c9d8064708a5d6e4543b5ba90a3513e41 /OpenSim/Framework/PriorityQueue.cs | |
| parent | Merge branch 'ubitworkmaster' (diff) | |
| parent | add a direct sendpartfullUpdate to send a full object update to a part, (diff) | |
| download | opensim-SC-f06f13b59dd7261bfdcee59b546431fe47dcc635.zip opensim-SC-f06f13b59dd7261bfdcee59b546431fe47dcc635.tar.gz opensim-SC-f06f13b59dd7261bfdcee59b546431fe47dcc635.tar.bz2 opensim-SC-f06f13b59dd7261bfdcee59b546431fe47dcc635.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/PriorityQueue.cs | 4 |
1 files changed, 3 insertions, 1 deletions
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 | |||
| 62 | private uint m_nextQueue = 0; | 62 | private uint m_nextQueue = 0; |
| 63 | private uint m_countFromQueue = 0; | 63 | private uint m_countFromQueue = 0; |
| 64 | // first queues are imediate, so no counts | 64 | // first queues are imediate, so no counts |
| 65 | private uint[] m_queueCounts = {0, 0, 8, 4, 4, 2, 2, 2, 2, 1, 1, 1}; | 65 | // private uint[] m_queueCounts = { 0, 0, 8, 4, 4, 2, 2, 2, 2, 1, 1, 1 }; |
| 66 | private uint[] m_queueCounts = {0, 0, 8, 8, 5, 4, 3, 2, 1, 1, 1, 1}; | ||
| 67 | // this is ava, ava, attach, <10m, 20,40,80,160m,320,640,1280, + | ||
| 66 | 68 | ||
| 67 | // next request is a counter of the number of updates queued, it provides | 69 | // next request is a counter of the number of updates queued, it provides |
| 68 | // a total ordering on the updates coming through the queue and is more | 70 | // a total ordering on the updates coming through the queue and is more |