aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-09-125-56/+56
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-053-6/+5
|\ \ | |/
| * Move code that allows llGiveInvetory() to move item into appropriate system f...Justin Clark-Casey (justincc)2010-09-041-2/+1
| * Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)Justin Clark-Casey (justincc)2010-09-041-3/+3
| * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2010-09-031-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-304-51/+102
|\ \ | |/
| * very minor log message and var name tweaking for iar savingJustin Clark-Casey (justincc)2010-08-282-5/+8
| * Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-281-1/+1
| * minor: reduce log chattiness of "load iar" for IARs with lots of foldersJustin Clark-Casey (justincc)2010-08-271-1/+1
| * allow inventory path specified in "load iar" to start with a / (e.g. /Objects...Justin Clark-Casey (justincc)2010-08-272-1/+33
| * refactor: Make IAR tests set up standard iar for loadingJustin Clark-Casey (justincc)2010-08-271-44/+60
| * minor: change log message from info to debugJustin Clark-Casey (justincc)2010-08-261-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-231-8/+3
|\ \ | |/
| * Remove various warnings and improve logging messages. No functional changes.Justin Clark-Casey (justincc)2010-08-231-10/+7
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-181-7/+8
|\ \ | |/
| * refactor: remove Scene.SetRootAgentScene() in favour of existing event with s...Justin Clark-Casey (justincc)2010-08-131-7/+8
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-071-1/+1
|\ \ | |/
| * Remove old test classes that don't actually test anything not done elsewhereJustin Clark-Casey (justincc)2010-08-071-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-063-80/+134
|\ \ | |/
| * Merge branch 'iar-merge'Justin Clark-Casey (justincc)2010-08-043-80/+134
| |\
| | * Add --merge switch to load iar.Justin Clark-Casey (justincc)2010-06-303-83/+137
* | | Cost Reduction : Removing verbose message....sacha2010-08-041-1/+1
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-204-157/+213
|\ \ \ | |/ /
| * | improve closing of load/save iar streams in the event of a problemJustin Clark-Casey (justincc)2010-07-144-157/+213
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-142-6/+128
|\ \ \ | |/ /
| * | Fix obvious bug in XInventoryService.GetFolderItems() which was preventing th...Justin Clark-Casey (justincc)2010-07-142-6/+128