aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-121-1/+4
|\
| * If deserializing a scene object fails during IAR load then ignore the object ...Justin Clark-Casey (justincc)2012-01-111-1/+4
* | Fix intersim object give messagesMelanie2011-12-071-0/+6
* | Fix up intersim give messagingMelanie2011-12-071-1/+41
* | Fix task inventory givingMelanie2011-12-071-23/+6
* | Remove harmless merge artefactMelanie2011-12-061-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-10-271-12/+18
|\ \ | |/
| * Comment out inventory folder bulk update code on InventoryAccepted message in...Justin Clark-Casey (justincc)2011-10-271-12/+18
* | Resolve merge commits, stage 1Tom2011-09-044-39/+49
|\ \ | |/
| * If the user receiving an inventory folder has left the scene by the time the ...Justin Clark-Casey (justincc)2011-09-011-5/+4
| * Thanks Neil Canham for fixing bulk inventory updates, no sending BulkInventor...Snoopy Pfeffer2011-08-221-1/+12
| * rename TestHelper => TestHelpers for consistencyJustin Clark-Casey (justincc)2011-08-062-14/+14
| * rename test SceneSetupHelpers -> SceneHelpers for consistencyJustin Clark-Casey (justincc)2011-08-063-20/+20
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-201-1/+6
|\ \ | |/
| * tweak messages. Make verbose inventory item save message give the item name ...Justin Clark-Casey (justincc)2011-06-141-1/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-092-28/+62
|\ \ | |/
| * Fix give inventory tests to use different users rather than (accidentally) th...Justin Clark-Casey (justincc)2011-06-041-4/+15
| * insert an InventoryArchiveUtils.FindItemsByPath() to return multiple items ra...Justin Clark-Casey (justincc)2011-06-042-11/+37
| * create TestGetInventoryItem()Justin Clark-Casey (justincc)2011-06-041-13/+7
| * When saving an iar, don't chase down link asset IDs (since these points to ot...Justin Clark-Casey (justincc)2011-05-271-1/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-273-18/+145
|\ \ | |/
| * Add --noassets option for "save iar"Justin Clark-Casey (justincc)2011-05-263-18/+145
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-223-22/+19
|\ \ | |/
| * Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Te...Justin Clark-Casey (justincc)2011-05-213-3/+0
| * rename UserInventoryTestsUtils -> UserInventoryHelpers for consistencyJustin Clark-Casey (justincc)2011-05-211-4/+4
| * rename UserProfileTestUtils to UserAccountHelpers to be consistent with other...Justin Clark-Casey (justincc)2011-05-213-15/+15
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-213-9/+51
|\ \ | |/
| * Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future co...Justin Clark-Casey (justincc)2011-04-181-0/+6
| * bump default IAR version to 0.2 and 1.1 for the --profile version.Justin Clark-Casey (justincc)2011-04-181-2/+2
| * Add regression test to check that OARs start with the control file.Justin Clark-Casey (justincc)2011-04-181-0/+3
| * add test to ensure that an IAR starts with the control fileJustin Clark-Casey (justincc)2011-04-182-11/+39
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-174-56/+95
|\ \ | |/
| * get rid of all traces of the now used mock service infrastructureJustin Clark-Casey (justincc)2011-04-153-9/+9
| * 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-153-26/+47
| * 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
| * suspend check that IAR control file is loaded for nowJustin Clark-Casey (justincc)2011-03-311-1/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-144-132/+269
|\ \ | |/
| * 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
| * 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-102-8/+42