aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (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-1814-425/+537
| |\
| * | 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-1814-412/+538
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into test-merge0418Mic Bowman2011-04-1822-801/+626
| |\ \ | | |/
| * | 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-1349-540/+1074
| |\ \ \
| | * | | remove packet monitoring debugging codeMic Bowman2011-04-131-116/+2
| | * | | Fixed the update of items in the priority queue to enable bothMic Bowman2011-04-133-7/+21
| | * | | 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-1311-208/+262
| | * | | 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-135-32/+85
| |\ \ \ \
| * | | | | remove packet monitoring debugging codeMic Bowman2011-04-121-116/+2
| * | | | | Fixed the update of items in the priority queue to enable bothMic Bowman2011-04-123-7/+21
| * | | | | fixed a couple bugs with the property queuesMic Bowman2011-04-121-1/+37
| * | | | | Merge branch 'test-select' into queuetestMic Bowman2011-04-1211-208/+262
| |\ \ \ \ \
| | * | | | | First pass at moving object property requests into a queue similarMic Bowman2011-04-1211-208/+262
| * | | | | | Merge branch 'master' into queuetestMic Bowman2011-04-126-26/+68
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | New tokenbucket algorithm. This one provides fair sharing of the queuesMic Bowman2011-04-114-145/+259
* | | | | | | Fix up client implementationsMelanie2011-04-177-7/+7
* | | | | | | Correct the delegate for classified deletesMelanie2011-04-172-2/+4
* | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-171-0/+56
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Mantis #5442: Add admin_save_heightmapMelanie2011-04-171-0/+56
* | | | | | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2011-04-1771-1067/+1411
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-1771-1067/+1411
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | More descriptive debug msg for ServiceOSDRequest failures.Dan Lake2011-04-161-2/+2
| | * | | | | | Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more tes...Diva Canto2011-04-152-25/+12
| | * | | | | | Make remote admin error messages more helpful on windows.Justin Clark-Casey (justincc)2011-04-151-88/+73
| | * | | | | | refactor: separate out code that adds permissionsJustin Clark-Casey (justincc)2011-04-151-42/+59
| | * | | | | | Merge branch 'master' of /home/opensim/lib/develop/BlueWallBlueWall2011-04-151-1/+34
| | |\ \ \ \ \ \
| | | * | | | | | Thanks Snoopy for a patch that allows setting of perms on items given to new ...BlueWall2011-04-151-1/+34
| | | | |_|/ / / | | | |/| | | |
| | | * | | | | Add ColladaMesh switchBlueWall2011-04-132-3/+21
| | * | | | | | 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-148-53/+20
| | | |\ \ \ \ \ \
| | | * | | | | | | 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-158-45/+17
| | * | | | | | | remove old code for a mock grid service, which got removed some time backJustin Clark-Casey (justincc)2011-04-151-8/+3
| | |/ / / / / /
| | * | | | | | remove any reference to a mock authentication service since it doesn't exist ...Justin Clark-Casey (justincc)2011-04-151-12/+7
| | * | | | | | remove mock asset service for tests in favour of always using the real oneJustin Clark-Casey (justincc)2011-04-153-133/+8
| | * | | | | | Remove the mock inventory service for tests and just use the real one all the...Justin Clark-Casey (justincc)2011-04-152-199/+6
| | * | | | | | 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-1510-39/+134
| | * | | | | | implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet.Justin Clark-Casey (justincc)2011-04-143-6/+64
| | * | | | | | simplify InventoryArchiveTestCase setupJustin Clark-Casey (justincc)2011-04-141-18/+2
| | * | | | | | simplify TestSaveItemToIarV0_1()Justin Clark-Casey (justincc)2011-04-141-18/+2
generated by cgit v1.1 at 2024-12-25 18:36:44 +0000