Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-04-18 | 10 | -394/+505 | |
| |\ | ||||||
| * | | Provide a configuration setting to control whether multiple taken objects are... | Justin Clark-Casey (justincc) | 2011-04-18 | 2 | -15/+47 | |
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-18 | 10 | -381/+506 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge branch 'master' into test-merge0418 | Mic Bowman | 2011-04-18 | 14 | -340/+398 | |
| |\ \ | | |/ | ||||||
| * | | Remove the call to remove tokens from the parent. Under heavy load | Mic Bowman | 2011-04-15 | 2 | -5/+14 | |
| * | | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-14 | 1 | -1/+5 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'testmerge' into queuetest | Mic Bowman | 2011-04-13 | 30 | -81/+723 | |
| |\ \ \ | ||||||
| | * | | | 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 | 2 | -7/+16 | |
| | * | | | 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 | 7 | -177/+235 | |
| | * | | | New tokenbucket algorithm. This one provides fair sharing of the queues | Mic Bowman | 2011-04-13 | 4 | -145/+259 | |
| * | | | | Merge branch 'master' of /home/git/repo/OpenSim into queuetest | BlueWall | 2011-04-13 | 4 | -29/+82 | |
| |\ \ \ \ | ||||||
| | * | | | | Add ColladaMesh switch | BlueWall | 2011-04-13 | 2 | -3/+21 | |
| * | | | | | 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 | 2 | -7/+16 | |
| * | | | | | 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 | 7 | -177/+235 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-12 | 7 | -177/+235 | |
| * | | | | | | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-12 | 4 | -23/+54 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | New tokenbucket algorithm. This one provides fair sharing of the queues | Mic Bowman | 2011-04-11 | 4 | -145/+259 | |
* | | | | | | | Fix up client implementations | Melanie | 2011-04-17 | 4 | -4/+4 | |
* | | | | | | | Correct the delegate for classified deletes | Melanie | 2011-04-17 | 1 | -1/+2 | |
* | | | | | | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie | 2011-04-17 | 45 | -131/+882 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 45 | -131/+882 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| | * | | | | | | Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more tes... | Diva Canto | 2011-04-15 | 2 | -25/+12 | |
| | * | | | | | | refactor: separate out code that adds permissions | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -42/+59 | |
| | * | | | | | | 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 | 2 | -3/+21 | |
| | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-04-14 | 7 | -15/+15 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | | Add ColladaMesh switch | BlueWall | 2011-04-14 | 2 | -3/+21 | |
| | * | | | | | | | | 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 | 7 | -15/+15 | |
| | |/ / / / / / | ||||||
| | * | | | | | | remove mock asset service for tests in favour of always using the real one | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -1/+3 | |
| | * | | | | | | extend TestLoadCoalesecedItem() to check loaded object ids and positions | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -1/+7 | |
| | * | | | | | | Make all the objects in a coalescence reappears after being loaded from an IA... | Justin Clark-Casey (justincc) | 2011-04-15 | 5 | -32/+90 | |
| | * | | | | | | implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet. | Justin Clark-Casey (justincc) | 2011-04-14 | 2 | -4/+48 | |
| | * | | | | | | simplify InventoryArchiveTestCase setup | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -18/+2 | |
| | * | | | | | | simplify TestSaveItemToIarV0_1() | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -18/+2 | |
| | * | | | | | | simplify TestRezObject() | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -17/+1 | |
| | * | | | | | | Make scene object parts created by the test utils unit sized. | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -3/+1 | |
| | * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | * | | | | | Comment out the warning if the prioritizer runs without a fully | Mic Bowman | 2011-04-13 | 1 | -1/+5 | |
| | | | |_|_|/ | | | |/| | | | ||||||
| | * | | | | | simplify coalesced object tests by using existing scene object set up utils | Justin Clark-Casey (justincc) | 2011-04-14 | 2 | -41/+20 | |
| | |/ / / / | ||||||
| | * | | | | Use common coalesced serialization code for both tests and the InventoryAcces... | Justin Clark-Casey (justincc) | 2011-04-13 | 1 | -54/+13 | |
| | * | | | | Adjust the quanterions used in the rez coalsced object tests to get sensible ... | Justin Clark-Casey (justincc) | 2011-04-13 | 3 | -5/+24 | |
| | * | | | | refactor: move code to obtain the coalescence size and object offsets into Co... | Justin Clark-Casey (justincc) | 2011-04-13 | 3 | -16/+39 | |
| | * | | | | Fix bug where rezzing coalesced objects would give all objects the same name ... | Justin Clark-Casey (justincc) | 2011-04-13 | 2 | -7/+11 | |
| | * | | | | Add coalesced scene objects class and serializer. This is currently only use... | Justin Clark-Casey (justincc) | 2011-04-13 | 7 | -9/+374 | |
| | * | | | | factor out some test code into the SetUp() | Justin Clark-Casey (justincc) | 2011-04-13 | 1 | -14/+15 |