aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into test-merge0418Mic Bowman2011-04-1822-801/+626
|\
| * Mantis #5442: Add admin_save_heightmapMelanie2011-04-171-0/+56
| * 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
| * | 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-153-4/+26
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-04-148-53/+20
| | |\ \
| | * | | Add ColladaMesh switchBlueWall2011-04-143-4/+26
| * | | | 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
| * | 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-142-5/+3
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-141-1/+5
| |\ \
| * | | simplify coalesced object tests by using existing scene object set up utilsJustin Clark-Casey (justincc)2011-04-142-41/+20
* | | | 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
|\ \ \ \ | | |/ / | |/| |
| * | | Comment out the warning if the prioritizer runs without a fullyMic Bowman2011-04-131-1/+5
| |/ /
* | | Merge branch 'testmerge' into queuetestMic Bowman2011-04-1350-541/+1075
|\ \ \
| * | | 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
| |/ /
| * | 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
| * | Add coalesced scene objects class and serializer. This is currently only use...Justin Clark-Casey (justincc)2011-04-138-9/+389
| * | factor out some test code into the SetUp()Justin Clark-Casey (justincc)2011-04-131-14/+15
| * | Add a regression test for rezzing a single object into a scene from user inve...Justin Clark-Casey (justincc)2011-04-134-1/+146
| * | force mesh proxy for simple box prims with path cutdahlia2011-04-122-0/+6
| * | Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open...Diva Canto2011-04-1230-472/+338
| * | Implemented terrain save-tile command. Does the opposite of load-tile. For no...Diva Canto2011-04-127-0/+132
| * | Bug fix in object serialization -- sculpt data was wrong.Diva Canto2011-04-121-1/+1
* | | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu...Mic Bowman2011-04-133-4/+26
|\ \ \
| * \ \ Merge branch 'master' of /home/git/repo/OpenSim into queuetestBlueWall2011-04-137-43/+99
| |\ \ \ | | | |/ | | |/|
| | * | Add ColladaMesh switchBlueWall2011-04-133-4/+26
generated by cgit v1.1 at 2024-10-30 15:35:32 +0000