| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-14 | 1 | -1/+5 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'testmerge' into queuetest | Mic Bowman | 2011-04-13 | 50 | -541/+1075 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||||
| | | * | | | remove packet monitoring debugging code | Mic Bowman | 2011-04-13 | 1 | -116/+2 | |
| | | | | | | ||||||
| | | * | | | Fixed the update of items in the priority queue to enable both | Mic Bowman | 2011-04-13 | 3 | -7/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types of property updates to be specified. Not sure if one form of property update should supercede another. But for now the old OpenSim behavior is preserved by sending both. | |||||
| | | * | | | fixed a couple bugs with the property queues | Mic Bowman | 2011-04-13 | 1 | -1/+37 | |
| | | | | | | ||||||
| | | * | | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-13 | 11 | -208/+262 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code. | |||||
| | | * | | | New tokenbucket algorithm. This one provides fair sharing of the queues | Mic Bowman | 2011-04-13 | 4 | -145/+259 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when client and simulator throttles are set. This algorithm also uses pre-defined burst rate of 150% of the sustained rate for each of the throttles. Removed the "state" queue. The state queue is not a Linden queue and appeared to be used just to get kill packets sent. | |||||
| | * | | | | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into ↵ | Mic Bowman | 2011-04-13 | 3 | -4/+26 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | queuetest | |||||
| | | * \ \ \ | Merge branch 'master' of /home/git/repo/OpenSim into queuetest | BlueWall | 2011-04-13 | 7 | -43/+99 | |
| | | |\ \ \ \ | ||||||
| | | * | | | | | remove packet monitoring debugging code | Mic Bowman | 2011-04-12 | 1 | -116/+2 | |
| | | | | | | | | ||||||
| | | * | | | | | Fixed the update of items in the priority queue to enable both | Mic Bowman | 2011-04-12 | 3 | -7/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types of property updates to be specified. Not sure if one form of property update should supercede another. But for now the old OpenSim behavior is preserved by sending both. | |||||
| | | * | | | | | fixed a couple bugs with the property queues | Mic Bowman | 2011-04-12 | 1 | -1/+37 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge branch 'test-select' into queuetest | Mic Bowman | 2011-04-12 | 11 | -208/+262 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-12 | 11 | -208/+262 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code. | |||||
| | | * | | | | | | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-12 | 8 | -74/+158 | |
| | | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | | New tokenbucket algorithm. This one provides fair sharing of the queues | Mic Bowman | 2011-04-11 | 4 | -145/+259 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when client and simulator throttles are set. This algorithm also uses pre-defined burst rate of 150% of the sustained rate for each of the throttles. Removed the "state" queue. The state queue is not a Linden queue and appeared to be used just to get kill packets sent. | |||||
| | * | | | | | | | remove packet monitoring debugging code | Mic Bowman | 2011-04-12 | 1 | -116/+2 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Fixed the update of items in the priority queue to enable both | Mic Bowman | 2011-04-12 | 3 | -7/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types of property updates to be specified. Not sure if one form of property update should supercede another. But for now the old OpenSim behavior is preserved by sending both. | |||||
| | * | | | | | | | fixed a couple bugs with the property queues | Mic Bowman | 2011-04-12 | 1 | -1/+37 | |
| | | | | | | | | | ||||||
| | * | | | | | | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-12 | 11 | -208/+262 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code. | |||||
| | * | | | | | | | New tokenbucket algorithm. This one provides fair sharing of the queues | Mic Bowman | 2011-04-12 | 4 | -145/+259 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when client and simulator throttles are set. This algorithm also uses pre-defined burst rate of 150% of the sustained rate for each of the throttles. Removed the "state" queue. The state queue is not a Linden queue and appeared to be used just to get kill packets sent. | |||||
| * | | | | | | | | Provide a configuration setting to control whether multiple taken objects ↵ | Justin Clark-Casey (justincc) | 2011-04-18 | 3 | -15/+54 | |
| | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are coalesced to inventory This is the CoalesceMultipleObjectsToInventory setting in [Inventory] in OpenSimDefaults.ini Default is true. | |||||
| * | | | | | | | Mantis #5442: Add admin_save_heightmap | Melanie | 2011-04-17 | 1 | -0/+56 | |
| | | | | | | | | ||||||
| * | | | | | | | More descriptive debug msg for ServiceOSDRequest failures. | Dan Lake | 2011-04-16 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more ↵ | Diva Canto | 2011-04-15 | 2 | -25/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing to make sure HG inventory isn't broken by this (it shouldn't). | |||||
| * | | | | | | | Make remote admin error messages more helpful on windows. | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -88/+73 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, make log messages conform more with convention. | |||||
| * | | | | | | | refactor: separate out code that adds permissions | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -42/+59 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of /home/opensim/lib/develop/BlueWall | BlueWall | 2011-04-15 | 1 | -1/+34 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Thanks Snoopy for a patch that allows setting of perms on items given to new ↵ | BlueWall | 2011-04-15 | 1 | -1/+34 | |
| | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | avatars | |||||
| | * | | | | | | Add ColladaMesh switch | BlueWall | 2011-04-13 | 3 | -4/+26 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'master' of /home/git/repo/OpenSim | BlueWall | 2011-04-13 | 154 | -7522/+3275 | |
| | |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | | Merge branch 'master' of /home/opensim/src/OpenSim/Core | BlueWall | 2011-03-21 | 97 | -1508/+2109 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' of /home/opensim/src/OpenSim/Core | BlueWall | 2011-02-14 | 2 | -14/+8 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Set filter to send proper rotations for root part | BlueWall | 2011-02-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the root prim, alone or in a set, to send it's rotation. This fixes unsitting the avatar on sit-offsest type teleports where the sit target is in the root prim of a linkset. | |||||
| | * | | | | | | | | Revert "Fix unsitting of avatar on linked sets" | BlueWall | 2011-02-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b492f1ce99d27bcf29eb5805564c8778aa4df748. | |||||
| | * | | | | | | | | Fix unsitting of avatar on linked sets | BlueWall | 2011-02-12 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branch 'master' of /home/opensim/src/OpenSim/Core | BlueWall | 2011-02-12 | 59 | -2164/+1164 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of /home/opensim/src/OpenSim/Core | BlueWall | 2011-02-09 | 31 | -163/+1037 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /home/opensim/src/OpenSim/Core | BlueWall | 2011-01-27 | 60 | -699/+898 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Make FireAndForgetWrapper a singleton class | BlueWall | 2011-01-13 | 3 | -5/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made FireAndForgetWrapper a singleton class to allow us to drop dependancy on the BclExtras35 library. BclExtras is broken in Mono 2.8.2 and we used the library in only one function. | |||||
| * | | | | | | | | | | | | minor: remove a small amount of code duplication | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -4/+3 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-04-15 | 3 | -4/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-04-14 | 8 | -53/+20 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Add ColladaMesh switch | BlueWall | 2011-04-14 | 3 | -4/+26 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | refactor: split out some rez code into a separate CreateItemForObject() method | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -143/+159 | |
| | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | get rid of all traces of the now used mock service infrastructure | Justin Clark-Casey (justincc) | 2011-04-15 | 8 | -45/+17 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | remove old code for a mock grid service, which got removed some time back | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -8/+3 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | remove any reference to a mock authentication service since it doesn't exist ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -12/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and we don't use it | |||||
| * | | | | | | | | | | | | remove mock asset service for tests in favour of always using the real one | Justin Clark-Casey (justincc) | 2011-04-15 | 3 | -133/+8 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Remove the mock inventory service for tests and just use the real one all ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 2 | -199/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the time with an in-memory data plugin | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |