aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2014-01-281-2/+2
|\
| * Materials module: a) Store materials as assets; b) Finalized it (removed the ...Oren Hurvitz2014-01-201-2/+2
* | Merge branch 'master' into careminsterMelanie2013-11-231-2/+2
|\ \ | |/
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-2/+2
* | Merge branch 'master' into careminsterMelanie2013-10-041-3/+15
|\ \ | |/
| * minor: Recomment out log message uncommented in previous cbdfe969Justin Clark-Casey (justincc)2013-09-211-4/+4
| * When giving items between avatars in different simulators, only add the item ...Oren Hurvitz2013-09-211-9/+44
* | Merge branch 'master' into careminsterMelanie2013-09-011-1/+1
|\ \ | |/
| * Fix a printing of exception error in InventoryArchiveModule that onlyRobert Adams2013-08-231-1/+1
* | Merge branch 'master' into careminsterMelanie2013-07-184-23/+27
|\ \ | |/
| * Changed a few bits in Inventory/Archiver/InventoryArchiveReadRequest.cs to be...Diva Canto2013-07-054-23/+27
* | Merge branch 'master' into careminsterMelanie2013-04-302-86/+464
|\ \ | |/
| * Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression testsJustin Clark-Casey (justincc)2013-04-292-5/+198
| * Add regression test for inventory item give, reject and subsequent trash fold...Justin Clark-Casey (justincc)2013-04-291-0/+256
| * Add regression test for offer, accept and subsequent receiver delete of an it...Justin Clark-Casey (justincc)2013-04-291-80/+3
| * Fix bug where an agent that declined an inventory offer and subsequently empt...Justin Clark-Casey (justincc)2013-04-291-2/+8
* | Merge branch 'master' into careminsterMelanie2013-02-166-271/+435
|\ \ | |/
| * Separate IAR tests into separate files for load/save/loadpath testsJustin Clark-Casey (justincc)2013-02-163-245/+198
| * Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.Justin Clark-Casey (justincc)2013-02-162-1/+60
| * Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-165-27/+179
* | Merge branch 'master' into careminsterMelanie2013-02-081-0/+18
|\ \ | |/
| * On IAR loading, if loading of a coaleseced item entirely fails, then continue...Justin Clark-Casey (justincc)2013-02-081-0/+18
* | Merge branch 'master' into careminsterMelanie2013-01-041-2/+8
|\ \ | |/
| * If Save OAR/IAR times-out while waiting for assets then notify the caller tha...Oren Hurvitz2013-01-021-2/+8
* | Merge branch 'master' into careminsterMelanie2012-12-091-70/+68
|\ \ | |/
| * Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message t...Justin Clark-Casey (justincc)2012-12-081-70/+68
* | Merge branch 'master' into careminsterMelanie2012-11-172-5/+4
|\ \ | |/
| * Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-172-5/+4
* | Merge branch 'master' into careminsterMelanie2012-11-131-0/+2
|\ \ | |/
| * Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-131-0/+2
* | Merge branch 'master' into careminsterMelanie2012-11-131-67/+70
|\ \ | |/
| * Disable code to get server-side to move given items to a destination folder o...Justin Clark-Casey (justincc)2012-11-131-67/+70
* | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
|\ \ | |/
| * Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-121-1/+1
* | Merge branch 'master' into careminsterMelanie2012-11-121-1/+1
|\ \ | |/
| * Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-121-1/+1
* | Merge branch 'master' into careminsterMelanie2012-11-111-8/+31
|\ \ | |/
| * One more module converted: InventoryArchiverModule.Diva Canto2012-11-111-8/+31
* | Merge branch 'master' into careminsterMelanie2012-11-041-9/+12
|\ \ | |/
| * Prevent IMs being sent to prims when avies decline inventory offers from them.Diva Canto2012-11-041-9/+12
* | 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
generated by cgit v1.1 at 2024-09-14 05:25:14 +0000