aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Close streams immediately when we finish using themOren Hurvitz2014-08-021-9/+10
|
* new version of patch to add default-user switch new version :qw :wq updated ↵Matt Lehmann2014-05-061-0/+2
| | | | version of default user switch for load oar :q :q
* updated version of default user switch for load oar :q :qMatt Lehmann2014-05-061-5/+17
|
* Fixed: the parcel flag "Allow Scripts from Group" should only check if the ↵Oren Hurvitz2014-04-201-5/+9
| | | | | | parcel has a Group set; it doesn't have to be *deeded* to the group Also some cleanup of the use of Group ID's (with no change to functionality).
* Removed default timeout when starting scripts after Load OAROren Hurvitz2014-03-281-2/+2
|
* In Load OAR, correctly restore group-owned objectsOren Hurvitz2014-03-241-3/+3
| | | | Resolves http://opensimulator.org/mantis/view.php?id=6943
* In Load OAR: Zero isn't a valid Group IDOren Hurvitz2014-03-241-4/+2
| | | | Resolves http://opensimulator.org/mantis/view.php?id=6943
* During Load OAR, fix the User and Group ID's in objects that are embedded in ↵Oren Hurvitz2014-03-241-53/+77
| | | | | | assets (previously only rezzed objects were fixed) Resolves http://opensimulator.org/mantis/view.php?id=6942
* Fix displacement and location operations on legacy trees and grass inRobert Adams2014-02-151-1/+1
| | | | | the 'load oar' and 'scene' commands. Before they were ignored but the code now relies on the SOG.IsAttachment function for attachmentness.
* Add "--no-objects" parameter to 'load oar'.Robert Adams2014-02-021-1/+4
|
* Change new 'load oar' parameters to be hyphenated to be consistant withRobert Adams2014-02-021-3/+3
| | | | | existing parameters. ('--forceterrain' becomes '--force-terrain'). The old forms have been kept for downward compatiblity.
* Implement terrain merging in TerrainChannel.Robert Adams2014-02-021-16/+24
| | | | | | Modify archiver to use terrain merging when loading oars. This makes displacement AND rotation properly work on terrain when loading oars. Especially useful when loading legacy region oars into large varregions.
* varregion: remove --noterrain and --noparcel parameters in 'load oar'.Robert Adams2014-01-191-9/+46
| | | | | | | | | | | Add --forceterrain and --forceparcel to 'load oar'. In order to not change the operation of --merge (which does an object merge and suppresses terrain and parcel information loading), added the --force* parameters to be used when loading multiple oars to build up a varregion. Added --rotation and --rotationcenter parameters to 'load oar' which apply a rotation to the loaded oar objects before displacing. The rotation is in degrees (pos or neg) and the center defaults to "<128, 128, 0>".
* varregion: add --noterrain and --noparcel to 'load oar'.Robert Adams2014-01-191-10/+22
| | | | | --noterrain suppresses the loading of the terrain from the oar. --noparcels suppresses the loading of parcel information from the oar.
* varregion: add --displacement parameter to 'load oar'.Robert Adams2014-01-191-2/+20
| | | | | | | | | Adds displacment to all objects and terrain loaded from the oar. As an example, if you have a 512x512 region and an old 256x256 oar, doing load oar --displacement "<128,128,0>" oarFile.oar will load the object (and terrain) into the middle of the 512x512 region. If displacement is not specified, 'load oar' works like it always has. If you have a 5
* refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-2/+2
| | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* Changed locks to prevent deadlocks (especially during multi-region Load OAR)Oren Hurvitz2013-01-021-15/+27
|
* Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)2012-11-241-13/+17
| | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
* minor: Add some currently commented out debug log lines for investigating ↵Justin Clark-Casey (justincc)2012-11-231-0/+5
| | | | issues resolving group IDs for land parcels on OAR loading where groups do not exist
* Fix a few minor issues in ArchiveReadRequest logging.Justin Clark-Casey (justincc)2012-10-191-2/+2
|
* Support multi-region OAR filesOren Hurvitz2012-09-141-83/+282
| | | | Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
* When loading an OAR, validate any group UUIDs and properly reconstruct ↵Justin Clark-Casey (justincc)2012-08-201-1/+62
| | | | | | | | | | parcel access lists. If a group UUID is present that is not on this simulator then the object or parcel is no longer group owned. This is a change from previous behaviour where such invalid UUIDs were kept. This is an adaptation of patch 0002 from http://opensimulator.org/mantis/view.php?id=6105 by Oren Hurvitz of Kitely. My adaptations are formatting only, apart from the notices about parcel owner IDs not being saved since this has now been fixed. Thanks Oren.
* Route OAR SOG loading through the common ↵Justin Clark-Casey (justincc)2012-05-161-2/+1
| | | | | | SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG(). Remove buggy Xml2ToSOG().
* Fix issue where loading OARs could sometimes result in link numbers being ↵Justin Clark-Casey (justincc)2012-05-151-1/+3
| | | | | | | | | | reordered. This was because the parts in scene objects were sometimes not serialized in link order. This is perfectly fine since the parts still have the right link numbers, but an extra fix to adjust for this had not been done in the SerialiserModule methods that OAR loading used. Add regression test for same. Addresses http://opensimulator.org/mantis/view.php?id=5948, http://opensimulator.org/mantis/view.php?id=5749
* Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-141-1/+24
|
* Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-121-24/+1
| | | | | | | | | This reverts commit b0b7b45b943dd94546bcfcf5d3bb871cfe35b507. Sorry BlueWall, I wanted to discuss an aspect of the data storage but I couldn't assign bugs in 'patch included' state to myself until I changed mantis just now and I forgot to mention it on irc. I wouldn't normally revert but thinks get tricky when it comes to data formats. Essentially, I would like to see the Yaw, Pitch and Distance values as separate XML entities (as used in other aspects such as vectors, quaternions) rather than as a . delimited string We can discuss this more with Oren in opensimulator.org/mantis/view.php?id=6008
* Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-101-1/+24
| | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* Revert "Better error handling if Load OAR or Save OAR fail"Justin Clark-Casey (justincc)2012-05-071-16/+4
| | | | | | This reverts commit 65c88b2ff4e2616fa5c1d4c5e75298ed1eb1c0d8. Yet again I accidentally committed something whilst evaluating it.
* Better error handling if Load OAR or Save OAR failOren Hurvitz2012-05-071-4/+16
|
* Add experimental --publish option to "save oar" so that OARs reloaded to the ↵Justin Clark-Casey (justincc)2012-01-281-8/+8
| | | | same grid don't have the publisher as owner.
* Add a check to see if an asset exists before recreating it whileMic Bowman2012-01-101-0/+6
| | | | | | loading an archive. This does add an extra roundtrip to the asset server if loading new assets but it protects against overwriting (and potentially corrupting) existing assets.
* Comment out the part of the load oar code that zeroes out prim sit target ↵Justin Clark-Casey (justincc)2011-09-091-2/+2
| | | | | | | orientations and positions. The warning about these causing problems is very old and may no longer apply. Hopes to fix http://opensimulator.org/mantis/view.php?id=5680
* Save the sun's position in OARsOren Hurvitz2011-06-101-0/+3
|
* When loading an OAR that doesn't have parcels, create a default parcelOren Hurvitz2011-05-141-4/+7
|
* Add regression test to check that OARs start with the control file.Justin Clark-Casey (justincc)2011-04-181-1/+8
|
* Refactor: Break out LoadObjects() and LoadParcels() from a longer methodJustin Clark-Casey (justincc)2011-01-271-28/+44
|
* When an oar is loaded, do not create a default parcel before loading the ↵Justin Clark-Casey (justincc)2011-01-271-1/+1
| | | | | | | | parcels from the OAR. The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one. Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
* Show local IDs in "land show" output.Justin Clark-Casey (justincc)2011-01-271-0/+5
| | | | Also properly insert region name in "land clear" command
* Fix OAR parcel loading so that old parcels are replaced by the new instead ↵Justin Clark-Casey (justincc)2011-01-271-0/+4
| | | | | | of merged. The --merge switch will still merge the old and new land parcelling.
* Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-211-3/+7
| | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255).
* Global creator information working on MySQL DB and on load/save OARs. ↵Diva Canto2010-11-211-2/+19
| | | | | | | Creator name properly shown on the viewer as first.last @authority. New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
* Fix unit tests and save problemsJustin Clark-Casey (justincc)2010-11-201-1/+1
| | | | | | (note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly). Firstly, if you can save a version 1.0 OAR then you can load it too. Secondly, closing the save stream even on success before assets/objects are saved is a bad idea
* Implement guard against trying to load incompatible version IARsJustin Clark-Casey (justincc)2010-10-221-1/+1
|
* start parsing iar control fileJustin Clark-Casey (justincc)2010-10-221-1/+1
| | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
* slightly simplify oar control file loading codeJustin Clark-Casey (justincc)2010-10-221-10/+3
|
* Drop max oar loading version back to 0 from 1Justin Clark-Casey (justincc)2010-10-161-1/+1
|
* change --old-guids switch on the save oar command line to --version=<x>Justin Clark-Casey (justincc)2010-10-161-1/+1
| | | | | | if x is 0, then an old version 0.3 archive is saved. If it is anything else or missing, then a version 1.0 archive is saved version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier also add various informational notices about what version we've saving/loading
* Have OpenSim throw a strop if it tries to load an OAR with a major version ↵Justin Clark-Casey (justincc)2010-10-161-0/+22
| | | | that is too high for it to handle
* Changed SceneObjectGroup to store parts with the fast and thread-safe ↵John Hurliman2010-09-161-5/+1
| | | | MapAndArray collection
* Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-281-28/+29
|