aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-03-2114-44/+124
|\
| * Upgrade SQLite:BlueWall2011-03-183-0/+1
| * Thanks Kevin Cozens for a patch that:BlueWall2011-03-175-10/+10
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-03-161-1/+1
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-03-156-38/+133
| | |\
| | * | Hello, World!BlueWall2011-03-151-1/+1
| * | | minor: bring comment into line with code realityJustin Clark-Casey (justincc)2011-03-161-1/+1
| | |/ | |/|
| * | Fix a bug in T015_LargeSceneObjects() where the large scene object was stored...Justin Clark-Casey (justincc)2011-03-141-2/+3
| * | when retrieving a sog in database tests, don't bother adding the scene since ...Justin Clark-Casey (justincc)2011-03-141-14/+1
| * | Add method doc to T015_LargeSceneObjects() and slightly clean up formatting.Justin Clark-Casey (justincc)2011-03-141-3/+6
| * | Add current method output to all persistence level tests so that we can track...Justin Clark-Casey (justincc)2011-03-144-11/+99
| * | When setting media on a prim values, use generic object permissions instead o...Justin Clark-Casey (justincc)2011-03-141-2/+2
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-03-141-5/+21
| |\ \
| | * | Up the timeout on slow requests to 3000 to stop console spam. Make sureMelanie2011-03-141-5/+21
| | |/
| * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-03-121-1/+1
| |/
* | Don't send a windlight profile to clients if windlight is not set forMelanie2011-03-211-2/+2
* | Revert "Switch Vivox voice module to https"Melanie2011-03-181-11/+11
* | Switch Vivox voice module to httpsMelanie2011-03-181-11/+11
* | Prevent god users from being stopped logging into a regionMelanie2011-03-161-0/+8
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-148-210/+284
|\ \ | |/
| * factor inventory file loading into its own methodJustin Clark-Casey (justincc)2011-03-121-57/+80
| * factor out iar asset load code into its own methodJustin Clark-Casey (justincc)2011-03-121-29/+40
| * refactor: make boolean load indicators on load iars instance fieldsJustin Clark-Casey (justincc)2011-03-121-8/+11
| * introduce iar load checks which make sure archive.xml comes first, then inven...Justin Clark-Casey (justincc)2011-03-121-1/+32
| * Update/simplify test running instructionsJustin Clark-Casey (justincc)2011-03-111-74/+7
| * Change how map blocks are encoded to make map searchMic Bowman2011-03-101-2/+4
| * Add test for simple case where creator account with appropriate uuid exists o...Justin Clark-Casey (justincc)2011-03-101-0/+32
| * refactor: rename test user account fieldsJustin Clark-Casey (justincc)2011-03-103-35/+35
| * factor out common scene setup code in InventoryArchiveTestCaseJustin Clark-Casey (justincc)2011-03-102-41/+33
| * extend TestLoadIarV0_1AbsentCreator() to check serialized object CreatorId as...Justin Clark-Casey (justincc)2011-03-101-0/+6
| * re-enable item.CreatorId check in TestLoadIarV0_1AbsentCreator()Justin Clark-Casey (justincc)2011-03-102-5/+6
| * For objects loaded from an IAR, make sure the CreatorID points towards the OS...Justin Clark-Casey (justincc)2011-03-103-10/+48
| * in AssetHelpers.CreateAsset(), create objects using the 'original' xml format...Justin Clark-Casey (justincc)2011-03-101-1/+1
| * When setting up default iar for testing, use iar archiving code rather than c...Justin Clark-Casey (justincc)2011-03-103-13/+17
* | Up the timeout on slow requests to 3000 to stop console spam. Make sureMelanie2011-03-141-5/+21
* | Change avatar picker search to work properly when two name parts are usedMelanie2011-03-121-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-1058-845/+1011
|\ \ | |/
| * Change existing users load iar test so that it fulfills it's original intenti...Justin Clark-Casey (justincc)2011-03-102-11/+15
| * Split the inventory path testing parts of TestLoadIarV0_1ExistingUsers() into...Justin Clark-Casey (justincc)2011-03-102-23/+46
| * Make the item created in the default test iar an object rather than a scriptJustin Clark-Casey (justincc)2011-03-091-2/+27
| * minor: change the order of some default iar setup in test caseJustin Clark-Casey (justincc)2011-03-091-5/+7
| * Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.Justin Clark-Casey (justincc)2011-03-0935-86/+5
| * Add log messages on teleport failure to better pin down the cause.Justin Clark-Casey (justincc)2011-03-093-6/+19
| * Update MySql.Data.dll to version 6.3.6.Justin Clark-Casey (justincc)2011-03-091-0/+0
| * Split out path tests from InventoryArchiveTests. Factor common code into tes...Justin Clark-Casey (justincc)2011-03-093-531/+562
| * remove inventory service preserving code from SceneSetupHelpers tooJustin Clark-Casey (justincc)2011-03-091-37/+10
| * Simplify SceneSetupHelpers class by removing all code which was originally pr...Justin Clark-Casey (justincc)2011-03-091-53/+40
| * Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make sta...Justin Clark-Casey (justincc)2011-03-095-68/+89
| * Make -m shortcut option for --merge on load iar specific. Correct some log m...Justin Clark-Casey (justincc)2011-03-081-7/+7
| * Pull up Assembly of the MySQL classes as a protected property, so that it can...Diva Canto2011-03-086-11/+39