aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * When setting up default iar for testing, use iar archiving code rather than c...Justin Clark-Casey (justincc)2011-03-103-13/+17
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-105-602/+661
|\ \ | |/
| * 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-093-3/+0
| * Split out path tests from InventoryArchiveTests. Factor common code into tes...Justin Clark-Casey (justincc)2011-03-093-531/+562
| * Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make sta...Justin Clark-Casey (justincc)2011-03-092-50/+17
| * Make -m shortcut option for --merge on load iar specific. Correct some log m...Justin Clark-Casey (justincc)2011-03-081-7/+7
| * Construct test load iar only once and reuse for each test, rather than recrea...Justin Clark-Casey (justincc)2011-03-051-8/+18
* | Fix merge issuesMelanie2011-02-071-6/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-0/+10
|\ \ | |/
| * Addresses mantis #5360: CreatorData was being written as long as it wasn't nu...Diva Canto2011-02-031-0/+2
| * Added a -v|verbose option to save iar.Diva Canto2011-01-082-1/+9
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-202-9/+7
|\ \ | |/
| * uncomment "load iar" help lines which added the --merge optionJustin Clark-Casey (justincc)2010-12-181-5/+3
| * minor: add [-p|--profile=<url>] to usage line that pops up if save iar consol...Justin Clark-Casey (justincc)2010-12-181-3/+3
| * Raise maximum iar version that master can load to 1.x, so that it can load it...Justin Clark-Casey (justincc)2010-12-181-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-123-77/+92
|\ \ | |/
| * Remove the restriction that you have to be logged in when loading/saving iarsJustin Clark-Casey (justincc)2010-12-112-72/+70
| * If we're saving an IAR with --profile information, then label this a version ...Justin Clark-Casey (justincc)2010-12-111-5/+22
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-034-43/+78
|\ \ | |/
| * Fix unit test.Diva Canto2010-11-293-9/+16
| * Preservation of creator information now also working in IARs. Cleaned up usag...Diva Canto2010-11-294-35/+63
* | Fix the inventory transfer module to not cause duplicated text IMsMelanie2010-11-051-3/+6
* | Fix avatar to avatar inventory gives across serversMelanie2010-11-041-8/+50
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-22/+0
|\ \ | |/
| * minor: remove some old commented out codeJustin Clark-Casey (justincc)2010-10-301-22/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-272-6/+6
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-10-272-6/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-232-7/+48
|\ \ | |/
| * print IAR version number on console when savingJustin Clark-Casey (justincc)2010-10-221-2/+6
| * Implement guard against trying to load incompatible version IARsJustin Clark-Casey (justincc)2010-10-221-2/+19
| * start parsing iar control fileJustin Clark-Casey (justincc)2010-10-221-1/+19
| * write IAR control file first in the archive rather than lastJustin Clark-Casey (justincc)2010-10-221-4/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-2/+4
|\ \ | |/
| * Stop the InventoryTransferModule logging every IM notification it receives, e...Justin Clark-Casey (justincc)2010-10-191-3/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-135-56/+56
|\ \ | |/