aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver (unfollow)
Commit message (Collapse)AuthorFilesLines
2012-01-10Add a check to see if an asset exists before recreating it whileMic Bowman1-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.
2011-10-19Change wording on asset requests.Justin Clark-Casey (justincc)1-2/+2
Not all 'notified missing' assets are a problem. Some are invalid references which happen to be buried in other text.
2011-09-12When creating an OAR, optionally exclude objects according to their permissionsOren Hurvitz2-3/+104
2011-09-09Comment out the part of the load oar code that zeroes out prim sit target ↵Justin Clark-Casey (justincc)2-2/+8
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
2011-08-06rename TestHelper => TestHelpers for consistencyJustin Clark-Casey (justincc)1-5/+5
2011-08-06rename test SceneSetupHelpers -> SceneHelpers for consistencyJustin Clark-Casey (justincc)1-4/+4
2011-06-14tweak messages. Make verbose inventory item save message give the item name ↵Justin Clark-Casey (justincc)1-2/+2
as well as item id and asset id
2011-06-10Save the sun's position in OARsOren Hurvitz2-0/+5
2011-05-27Make sure culture is en-US when saving archive related xml.Justin Clark-Casey (justincc)1-0/+4
This might resolve http://opensimulator.org/mantis/view.php?id=5475
2011-05-26Add --noassets option for "save iar"Justin Clark-Casey (justincc)1-1/+1
Like "save oar", this saves an iar without assets This can be useful for backup when you know the required assets will still be present (e.g. you're backing up the assets db separately). This also bumps the iar format version to 0.3 and 1.2 respectively. 0.3 is backward compatible with previous opensim versions 1.2 is used if the --profile switch is specified. It is only compatible with 0.7.1 presently.
2011-05-26Bump OAR file format version up to 0.7 for this development cycle.Justin Clark-Casey (justincc)1-2/+2
This adds a <assets_included>true|false</assets_included> element to the oar control file, though this is not used on reloading at this time. This addition is backward compatible with previous opensim releases
2011-05-26Add a --noassets option to "save oar".Justin Clark-Casey (justincc)3-37/+143
This switch stops any assets being saved in the oar. This can be useful if you're using OAR to backup regions and you know you'll always have the original asset database available.
2011-05-21Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just ↵Justin Clark-Casey (justincc)1-1/+0
OpenSim.Tests.Common instead
2011-05-14When loading an OAR that doesn't have parcels, create a default parcelOren Hurvitz2-4/+9
2011-04-18bump oar version number to 0.6.Justin Clark-Casey (justincc)1-1/+1
This commit contains no data changes - the version bump is to establish a version at which the control file must come first in the archive.
2011-04-18Add regression test to check that OARs start with the control file.Justin Clark-Casey (justincc)2-9/+18
2011-03-09Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.Justin Clark-Casey (justincc)1-1/+0
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-01-27Refactor: Break out LoadObjects() and LoadParcels() from a longer methodJustin Clark-Casey (justincc)1-28/+44
2011-01-27When an oar is loaded, do not create a default parcel before loading the ↵Justin Clark-Casey (justincc)1-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).
2011-01-27Show local IDs in "land show" output.Justin Clark-Casey (justincc)1-0/+5
Also properly insert region name in "land clear" command
2011-01-27Fix OAR parcel loading so that old parcels are replaced by the new instead ↵Justin Clark-Casey (justincc)1-0/+4
of merged. The --merge switch will still merge the old and new land parcelling.
2011-01-08Added more debug messages under the -verbose option.Diva Canto1-2/+6
2010-12-11Drop current OAR version back to 0.5 since these are currently now ↵Justin Clark-Casey (justincc)3-35/+34
compatible with older OpenSim versions again. Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this.
2010-11-29Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2-7/+30
usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
2010-11-23Fix: Allow use of parameters without specifying a file path with command ↵Marck1-1/+1
"save oar"
2010-11-21Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto1-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).
2010-11-21Global creator information working on MySQL DB and on load/save OARs. ↵Diva Canto2-2/+20
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.
2010-11-20Knock V0_2 decals off archive tests since they're misleadingJustin Clark-Casey (justincc)1-8/+8
2010-11-20Fix unit tests and save problemsJustin Clark-Casey (justincc)3-3/+4
(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
2010-11-20correct build break. for some reason, xbuild didn't rebuild test dllsJustin Clark-Casey (justincc)1-2/+2
2010-11-20Bump oar version to 1.0 from 0.5Justin Clark-Casey (justincc)1-83/+119
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved Also closes save stream properly in the event of an error Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line e.g. save oar --version=0 oars/test.oar
2010-11-02Old deserialization can't deal with commas in flag fields. Making use of ↵Diva Canto2-16/+10
-version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
2010-10-27Formatting cleanup.Jeff Ames1-3/+3
2010-10-22Implement guard against trying to load incompatible version IARsJustin Clark-Casey (justincc)1-1/+1
2010-10-22start parsing iar control fileJustin Clark-Casey (justincc)1-1/+1
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22slightly simplify oar control file loading codeJustin Clark-Casey (justincc)1-10/+3
2010-10-22write IAR control file first in the archive rather than lastJustin Clark-Casey (justincc)1-1/+2
2010-10-22Implement guard against trying to load incompatible version IARsJustin Clark-Casey (justincc)1-1/+1
2010-10-22start parsing iar control fileJustin Clark-Casey (justincc)1-1/+1
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22slightly simplify oar control file loading codeJustin Clark-Casey (justincc)1-10/+3
2010-10-22write IAR control file first in the archive rather than lastJustin Clark-Casey (justincc)1-1/+2
2010-10-22minor: add some text to the oar abort messages on assets timeout to make it ↵Justin Clark-Casey (justincc)1-1/+1
clear that the oar will not be usable
2010-10-16Drop max oar loading version back to 0 from 1Justin Clark-Casey (justincc)1-1/+1
2010-10-16Rip out version option since it turns out that the changed object ↵Justin Clark-Casey (justincc)2-7/+11
serialization format can actually be loaded by older OpenSims after all This bumps the OAR version to 0.4 instead, signalling some change but with backwards compatability... for now.
2010-10-16change --old-guids switch on the save oar command line to --version=<x>Justin Clark-Casey (justincc)5-9/+31
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
2010-10-16Have OpenSim throw a strop if it tries to load an OAR with a major version ↵Justin Clark-Casey (justincc)2-1/+23
that is too high for it to handle
2010-10-16save oar control file first rather than in the middle so that it's the first ↵Justin Clark-Casey (justincc)3-38/+41
thing we come accross on load this exposes a weekness with using tar where we don't control the order in which files are loaded. can't be helped for now
2010-10-15Made OARs use the new serialization procedure. (TPs/crossings still on the ↵Diva Canto3-14/+25
old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>.
2010-09-16Changed SceneObjectGroup to store parts with the fast and thread-safe ↵John Hurliman1-5/+1
MapAndArray collection
2010-09-12Formatting cleanup.Jeff Ames1-4/+4