aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-011-2/+2
|\
| * Comment out checks not to overwrite existing IAR/OAR files for now on "save i...Justin Clark-Casey (justincc)2012-11-011-2/+2
* | Merge branch 'master' into careminsterMelanie2012-10-283-15/+30
|\ \ | |/
| * minor: Fix verbose IAR save message to make it a bit clearer that item data i...Justin Clark-Casey (justincc)2012-10-271-1/+1
| * Fix "save iar" hanging permanently if the asset request phase times out.Justin Clark-Casey (justincc)2012-10-263-14/+29
* | Merge branch 'master' into careminsterMelanie2012-10-262-77/+81
|\ \ | |/
| * Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations sin...Justin Clark-Casey (justincc)2012-10-261-77/+77
| * Get "save oar" and "save iar" to tell you in a more friendly manner if the fi...Justin Clark-Casey (justincc)2012-10-241-0/+4
* | Merge branch 'master' into careminsterMelanie2012-10-071-0/+42
|\ \ | |/
| * On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-061-0/+42
* | Merge branch 'master' into careminsterMelanie2012-10-031-0/+39
|\ \ | |/
| * Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
* | Merge branch 'master' into careminsterMelanie2012-08-291-32/+32
|\ \ | |/
| * Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where folder...Justin Clark-Casey (justincc)2012-08-291-32/+32
* | Merge branch 'avination' into careminsterMelanie2012-07-291-0/+3
|\ \
| * | Allow load and save of IAR without a password. The password must still beMelanie2012-07-241-0/+3
* | | Merge branch 'master' into careminsterMelanie2012-07-191-2/+3
|\ \ \ | |/ / |/| / | |/
| * Fix regression where llGiveInventory() had stopped asking non-owner receivers...Justin Clark-Casey (justincc)2012-07-171-1/+3
* | Merge branch 'master' into careminsterMelanie2012-06-281-2/+3
|\ \ | |/
| * Fix issue in InventoryArchiveTestCase where it didn't call down to OpenSimTes...Justin Clark-Casey (justincc)2012-06-271-1/+2
| * Automatically disable log4net before each regression test so that logging is ...Justin Clark-Casey (justincc)2012-06-271-1/+1
* | Merge branch 'master' into careminsterMelanie2012-04-271-1/+4
|\ \ | |/
| * Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-271-1/+4
* | Merge branch 'master' into careminsterMelanie2012-04-273-9/+9
|\ \ | |/
| * Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-273-9/+9
* | Merge branch 'master' into careminsterMelanie2012-04-142-82/+129
|\ \ | |/
| * Added ability to exclude inventory items or folders when saving IAR files.Kevin Cozens2012-04-132-84/+128
* | Merge branch 'master' into careminsterMelanie2012-03-181-8/+8
|\ \ | |/
| * Clean up "save iar" helpJustin Clark-Casey (justincc)2012-03-171-8/+8
* | Allow RLV to redirect received folders to #RLV folderMelanie2012-03-111-0/+33
* | Merge branch 'master' into careminsterMelanie2012-03-111-2/+3
|\ \ | |/
| * minor: In IAR save, log when we start adding the control file rather than say...Justin Clark-Casey (justincc)2012-03-101-2/+3
* | Merge branch 'master' into careminsterMelanie2012-03-081-2/+2
|\ \ | |/
| * Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-081-2/+2
* | Merge branch 'master' into careminsterMelanie2012-02-251-3/+0
|\ \ | |/
| * Remove EXPERIMENTAL tags from load iar/save iar commands.Justin Clark-Casey (justincc)2012-02-251-3/+0
* | Merge branch 'master' into careminsterMelanie2012-02-042-6/+6
|\ \ | |/
| * Changed save oar and save iar parameter -p|--profile to -h|--home, including ...Snoopy Pfeffer2012-02-032-6/+6
| * Corrected console help texts for "save iar"Snoopy Pfeffer2012-02-031-2/+2
* | Merge branch 'master' into careminsterMelanie2012-01-261-2/+2
|\ \ | |/
| * Update save oar and save iar help responses to reflect new -h|--homenebadon2012-01-251-2/+2
* | 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
|\ \ | |/