aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* re-enable item.CreatorId check in TestLoadIarV0_1AbsentCreator()Justin Clark-Casey (justincc)2011-03-101-2/+3
|
* For objects loaded from an IAR, make sure the CreatorID points towards the ↵Justin Clark-Casey (justincc)2011-03-101-3/+37
| | | | | | | | | OSP resolved ID if newer CreationData is not present. This should resolve issues where the creator for rezzed objects was being shown as "Unknown user" where previous behaviour was to show the OSP resolved account. This is being done by parsing the serialized objects and updating the CreatorID if no CreationData exists. This operation might be expensive for sculpties where the sculpt texture is inlined with the object data. Will just have to see. This relies on the IAR streaming inventory data before asset data (as is currently the case). Will need to introduce more stringent checks for file order on loading (much like JAR zips must start with the manifest file). This is for IAR loading only. Tests updated to check this behaviour.
* Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make ↵Justin Clark-Casey (justincc)2011-03-091-0/+2
| | | | static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
* Raise maximum iar version that master can load to 1.x, so that it can load ↵Justin Clark-Casey (justincc)2010-12-181-1/+1
| | | | its own iars (oops)
* Fix unit test.Diva Canto2010-11-291-1/+1
|
* Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2010-11-291-5/+6
| | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
* Formatting cleanup.Jeff Ames2010-10-271-4/+4
|
* 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
| | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
* Formatting cleanup.Jeff Ames2010-09-121-9/+9
|
* Move code that allows llGiveInvetory() to move item into appropriate system ↵Justin Clark-Casey (justincc)2010-09-041-2/+1
| | | | | | | folder up from connectors into Scene.Inventory.cs This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors. Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
* minor: reduce log chattiness of "load iar" for IARs with lots of foldersJustin Clark-Casey (justincc)2010-08-271-1/+1
|
* Merge branch 'iar-merge'Justin Clark-Casey (justincc)2010-08-041-49/+61
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
| * Add --merge switch to load iar.Justin Clark-Casey (justincc)2010-06-301-49/+61
| | | | | | | | | | | | When this switch is used, iar folders are merged with existing same-name user inventory folders. This makes it a little easier to back and restore entire individual user inventories, among other things Added unit test to check behaviour
* | improve closing of load/save iar streams in the event of a problemJustin Clark-Casey (justincc)2010-07-141-39/+41
| |
* | uncomment a load iar code line I accidentally commented in the last commitJustin Clark-Casey (justincc)2010-07-121-1/+1
| | | | | | | | hooray for automated tests
* | comment out a lot of the debug log messages when loading an iarJustin Clark-Casey (justincc)2010-07-121-10/+10
|/ | | | | these are very redundant now and cause issues when loading large iars diva, you may want to cherry pick this for 0.7-post-fixes since it only comments out log lines and nothing else
* Fix problem where iar load would duplicate huge number of foldersJustin Clark-Casey (justincc)2010-06-181-3/+3
| | | | | This was http://opensimulator.org/mantis/view.php?id=4770 Extend unit tests to check for this scenario too
* change TestPartExistingIarPath() to check appropriate folder creationJustin Clark-Casey (justincc)2010-06-181-17/+22
| | | | change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable
* in IAR utils, return all folders that match a particular path rather than ↵Justin Clark-Casey (justincc)2010-06-181-5/+8
| | | | just the first one
* create inactive test for iar folders/items merged with existing pathsJustin Clark-Casey (justincc)2010-06-111-34/+0
| | | | add various helper functions for simplifying test readability
* various refactorings on methods to replicate IAR paths to user inventory in ↵Justin Clark-Casey (justincc)2010-06-051-81/+127
| | | | order to improve readability
* refactor: do pathname trimming outside of ReplicateArchivePathToUserInventory()Justin Clark-Casey (justincc)2010-06-041-10/+7
|
* Add ability to load IARs directly from URIsJustin Clark-Casey (justincc)2010-05-281-2/+1
| | | | | | | | So, something like load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar Will load my IAR directly from the web.
* Changed asset CreatorID to a stringJohn Hurliman2010-02-221-1/+1
|
* * Adds CreatorID to asset metadata. This is just the plumbing to support ↵John Hurliman2010-02-221-1/+1
| | | | CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
* OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.Diva Canto2010-01-111-1/+1
|
* * OMG! All but one references to UserProfileCacheService have been rerouted!Diva Canto2010-01-101-7/+7
| | | | | * HG is seriously broken here * Compiles. Untested.
* Less refs to UserProfileCacheService. Compiles but likely doesn't run.Diva Canto2010-01-091-1/+1
|
* Formatting cleanup. Add copyright headers.Jeff Ames2010-01-041-2/+2
|
* 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
| | | | | | | | stream can be closed.
* | Fix a bounds exception I came across in IAR restoreMelanie2009-12-231-0/+5
|/
* Resolve issue where an iar load fails to preserve original item creatorsJustin Clark-Casey (justincc)2009-11-261-0/+8
| | | | | See http://opensimulator.org/mantis/view.php?id=4394 This change preserves the uuid when a profile is found rather than the ospa
* Make load/save iar slightly better in the face of io failures by always ↵Justin Clark-Casey (justincc)2009-11-241-31/+37
| | | | attempting to close the streams
* Formatting cleanup.Jeff Ames2009-11-231-3/+3
|
* minor: A further minor tweak to reduce iar load logging verbosityJustin Clark-Casey (justincc)2009-11-131-2/+2
|
* Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2009-11-091-3/+4
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-11-051-2/+11
| |\
| * | Changing the AssetBase constructors to avoid initializing assets with an ↵John Hurliman2009-11-051-3/+4
| | | | | | | | | | | | unknown asset type, and log an error if it ever does happen
* | | refactor out iar escapingJustin Clark-Casey (justincc)2009-11-091-8/+1
| | |
* | | minor: correct slightly over-enthusiastic load iar logging messageJustin Clark-Casey (justincc)2009-11-091-2/+1
| | |
* | | fix load iar regression accidentally introduced in last commitJustin Clark-Casey (justincc)2009-11-091-1/+1
| | |
* | | minor: tweak load iar messages to be slightly less verboseJustin Clark-Casey (justincc)2009-11-091-4/+5
| | |
* | | minor: provide updates on number of assets loaded while executing "load iar"Justin Clark-Casey (justincc)2009-11-091-2/+9
| | |
* | | refactor: break actual item load in iar into separate methodJustin Clark-Casey (justincc)2009-11-091-28/+46
| | |
* | | minor: remove some old commented out load iar codeJustin Clark-Casey (justincc)2009-11-091-30/+0
| |/ |/|
* | * Escape / character when saving items and folders in an iar so that the ↵Justin Clark-Casey (justincc)2009-11-051-2/+11
|/ | | | loader doesn't barf
* Formatting cleanup.Jeff Ames2009-10-011-6/+6
|
* Remove bug where iar created folders could not be deleted after relogJustin Clark-Casey (justincc)2009-09-111-2/+6
| | | | New folders need to be created with AssetType.Unknown rather than AssetType.Folder!