aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-06-073-112/+182
|\
| * various refactorings on methods to replicate IAR paths to user inventory in o...Justin Clark-Casey (justincc)2010-06-052-82/+128
| * refactor: do pathname trimming outside of ReplicateArchivePathToUserInventory()Justin Clark-Casey (justincc)2010-06-042-11/+8
| * add ability for load iar/save iar to take in arbitrary optionsJustin Clark-Casey (justincc)2010-06-041-20/+47
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-042-252/+225
|\ \ | |/
| * bring TestLoadIarV0_1AbsentUsers() back onlineJustin Clark-Casey (justincc)2010-06-041-63/+56
| * bring TestIarV0_1WithEscapedChars() back onlineJustin Clark-Casey (justincc)2010-06-041-89/+72
| * bring test TestLoadIarV0_1ExistingUsers() back onlineJustin Clark-Casey (justincc)2010-06-041-81/+76
| * remove pointless mock user account service since the real one can now be easi...Justin Clark-Casey (justincc)2010-06-041-1/+1
| * get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAu...Justin Clark-Casey (justincc)2010-06-042-3/+5
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-284-166/+154
|\ \ | |/
| * get TestSaveIarV0_1() uncommented but not running as a test yet since I didn'...Justin Clark-Casey (justincc)2010-05-281-106/+99
| * restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to w...Justin Clark-Casey (justincc)2010-05-281-51/+37
| * fission UserAccountService.HandleCreateUser() into two methods, one which han...Justin Clark-Casey (justincc)2010-05-281-52/+50
| * Add ability to load IARs directly from URIsJustin Clark-Casey (justincc)2010-05-282-6/+18
| * refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHe...Justin Clark-Casey (justincc)2010-05-281-1/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-302-2/+3
|\ \ | |/
| * May fix mantis #4613Diva Canto2010-03-271-1/+2
| * Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene...Dan Lake2010-03-191-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-181-2/+2
|\ \ | |/
| * * UuidGatherer now tracks asset types for assets it discovers. The asset type...John Hurliman2010-03-151-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-035-546/+635
|\ \ | |/
| * Changed asset CreatorID to a stringJohn Hurliman2010-02-221-1/+1
| * Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i...John Hurliman2010-02-221-6/+60
| |\
| | * Merge branch 'master' into presence-refactorMelanie2010-02-221-6/+60
| | |\
| | | * Formatting cleanup.Jeff Ames2010-02-221-4/+4
| | | * forestall bug reports about the Command error: System.EntryPointNotFoundExcep...Justin Clark-Casey (justincc)2010-02-191-6/+60
| | | * Revert "Updates all IRegionModules to the new style region modules."Melanie2010-01-292-77/+21
| * | | * Adds CreatorID to asset metadata. This is just the plumbing to support Crea...John Hurliman2010-02-221-1/+1
| |/ /
| * | OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.Diva Canto2010-01-115-5/+5
| * | * Starting to clean the house...Diva Canto2010-01-101-1/+1
| * | * OMG! All but one references to UserProfileCacheService have been rerouted!Diva Canto2010-01-104-518/+525
| * | Less refs to UserProfileCacheService. Compiles but likely doesn't run.Diva Canto2010-01-092-2/+2
| * | * Finished SimulationServiceConnectorDiva Canto2010-01-071-1/+1
| * | Merge branch 'master' into presence-refactorMelanie2010-01-042-5/+5
| |\ \
| * | | Change FriendsModule, InstantMessageModule, MessageTransferModule, MuteListMo...Melanie2009-12-281-14/+42
* | | | Revert "Updates all IRegionModules to the new style region modules."Melanie2010-01-292-77/+21
* | | | Merge branch 'master' into careminsterMelanie2010-01-262-21/+77
|\ \ \ \ | | |_|/ | |/| |
| * | | Updates all IRegionModules to the new style region modules.Revolution2010-01-232-21/+77
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2010-01-032-5/+5
|\ \ \ | |/ /
| * | Formatting cleanup. Add copyright headers.Jeff Ames2010-01-042-5/+5
| |/
* | Merge branch 'master' into careminsterMelanie2009-12-231-1/+12
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-231-1/+7
| |\
| | * Added Close() to Inventory/Archiver/InventoryArchiveReadRequest, so that the ...Diva Canto2009-12-221-1/+7
| * | Fix a bounds exception I came across in IAR restoreMelanie2009-12-231-0/+5
| |/
* | Merge branch 'master' into careminsterMelanie2009-11-263-2/+17
|\ \ | |/
| * Resolve issue where an iar load fails to preserve original item creatorsJustin Clark-Casey (justincc)2009-11-263-2/+17
* | Merge branch 'master' into careminsterMelanie2009-11-253-65/+79
|\ \ | |/
| * Make load/save iar slightly better in the face of io failures by always attem...Justin Clark-Casey (justincc)2009-11-242-63/+77
| * minor: remove experimental tags from load iar and save iar commandsJustin Clark-Casey (justincc)2009-11-241-2/+2