aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-04-182-17/+49
|\
| * Fix bug where objects were being coalesced in the wrong positions.Justin Clark-Casey (justincc)2011-04-181-2/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-1810-394/+505
| |\
| * | Provide a configuration setting to control whether multiple taken objects are...Justin Clark-Casey (justincc)2011-04-182-15/+47
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-1810-381/+506
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into test-merge0418Mic Bowman2011-04-1814-340/+398
| |\ \ | | |/
| * | Remove the call to remove tokens from the parent. Under heavy loadMic Bowman2011-04-152-5/+14
| * | Merge branch 'master' into queuetestMic Bowman2011-04-141-1/+5
| |\ \
| * \ \ Merge branch 'testmerge' into queuetestMic Bowman2011-04-1330-81/+723
| |\ \ \
| | * | | remove packet monitoring debugging codeMic Bowman2011-04-131-116/+2
| | * | | Fixed the update of items in the priority queue to enable bothMic Bowman2011-04-132-7/+16
| | * | | fixed a couple bugs with the property queuesMic Bowman2011-04-131-1/+37
| | * | | First pass at moving object property requests into a queue similarMic Bowman2011-04-137-177/+235
| | * | | New tokenbucket algorithm. This one provides fair sharing of the queuesMic Bowman2011-04-134-145/+259
| * | | | Merge branch 'master' of /home/git/repo/OpenSim into queuetestBlueWall2011-04-134-29/+82
| |\ \ \ \
| | * | | | Add ColladaMesh switchBlueWall2011-04-132-3/+21
| * | | | | remove packet monitoring debugging codeMic Bowman2011-04-121-116/+2
| * | | | | Fixed the update of items in the priority queue to enable bothMic Bowman2011-04-122-7/+16
| * | | | | fixed a couple bugs with the property queuesMic Bowman2011-04-121-1/+37
| * | | | | Merge branch 'test-select' into queuetestMic Bowman2011-04-127-177/+235
| |\ \ \ \ \
| | * | | | | First pass at moving object property requests into a queue similarMic Bowman2011-04-127-177/+235
| * | | | | | Merge branch 'master' into queuetestMic Bowman2011-04-124-23/+54
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | New tokenbucket algorithm. This one provides fair sharing of the queuesMic Bowman2011-04-114-145/+259
* | | | | | | Fix up client implementationsMelanie2011-04-174-4/+4
* | | | | | | Correct the delegate for classified deletesMelanie2011-04-171-1/+2
* | | | | | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2011-04-1745-131/+882
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-1745-131/+882
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more tes...Diva Canto2011-04-152-25/+12
| | * | | | | | refactor: separate out code that adds permissionsJustin Clark-Casey (justincc)2011-04-151-42/+59
| | * | | | | | minor: remove a small amount of code duplicationJustin Clark-Casey (justincc)2011-04-151-4/+3
| | * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-152-3/+21
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-04-147-15/+15
| | | |\ \ \ \ \ \
| | | * | | | | | | Add ColladaMesh switchBlueWall2011-04-142-3/+21
| | * | | | | | | | refactor: split out some rez code into a separate CreateItemForObject() methodJustin Clark-Casey (justincc)2011-04-151-143/+159
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | get rid of all traces of the now used mock service infrastructureJustin Clark-Casey (justincc)2011-04-157-15/+15
| | |/ / / / / /
| | * | | | | | remove mock asset service for tests in favour of always using the real oneJustin Clark-Casey (justincc)2011-04-151-1/+3
| | * | | | | | extend TestLoadCoalesecedItem() to check loaded object ids and positionsJustin Clark-Casey (justincc)2011-04-151-1/+7
| | * | | | | | Make all the objects in a coalescence reappears after being loaded from an IA...Justin Clark-Casey (justincc)2011-04-155-32/+90
| | * | | | | | implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet.Justin Clark-Casey (justincc)2011-04-142-4/+48
| | * | | | | | simplify InventoryArchiveTestCase setupJustin Clark-Casey (justincc)2011-04-141-18/+2
| | * | | | | | simplify TestSaveItemToIarV0_1()Justin Clark-Casey (justincc)2011-04-141-18/+2
| | * | | | | | simplify TestRezObject()Justin Clark-Casey (justincc)2011-04-141-17/+1
| | * | | | | | Make scene object parts created by the test utils unit sized.Justin Clark-Casey (justincc)2011-04-141-3/+1
| | * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-141-1/+5
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Comment out the warning if the prioritizer runs without a fullyMic Bowman2011-04-131-1/+5
| | | | |_|_|/ | | | |/| | |
| | * | | | | simplify coalesced object tests by using existing scene object set up utilsJustin Clark-Casey (justincc)2011-04-142-41/+20
| | |/ / / /
| | * | | | Use common coalesced serialization code for both tests and the InventoryAcces...Justin Clark-Casey (justincc)2011-04-131-54/+13
| | * | | | Adjust the quanterions used in the rez coalsced object tests to get sensible ...Justin Clark-Casey (justincc)2011-04-133-5/+24
| | * | | | refactor: move code to obtain the coalescence size and object offsets into Co...Justin Clark-Casey (justincc)2011-04-133-16/+39
| | * | | | Fix bug where rezzing coalesced objects would give all objects the same name ...Justin Clark-Casey (justincc)2011-04-132-7/+11
generated by cgit v1.1 at 2025-01-14 08:26:04 +0000