aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-111-2/+0
| | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
* Comment out accidentally left in log line that was printing out the control ↵Justin Clark-Casey (justincc)2012-05-241-3/+3
| | | | file on OAR save
* Add size of region to OAR control file. Megaregions (sw root OARs when ↵Justin Clark-Casey (justincc)2012-05-191-14/+24
| | | | | | saved) will have a size larger than 256x256 Not yet read. Do not rely on this information yet, it may change.
* Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ↵Justin Clark-Casey (justincc)2012-05-191-1/+1
| | | | | | more than one megaregion in a simulator, separated by water. Rename IsRootRegion() to IsRootForMegaregion()
* Add is_megaregion flag into oar control file. Not currently read - for ↵Justin Clark-Casey (justincc)2012-05-192-41/+74
| | | | | | | | future use. Please do not rely on this remaining here. An adaptation of part of Garmin's patch from http://opensimulator.org/mantis/view.php?id=5975, thanks! Flag only written if the SW corner OAR is saved - this is the only one that captures object data presently (though not land or terrain data). This adds an IRegionCombinerModule interface and the necessary methods on RegionCombinerModule
* 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-152-1/+56
| | | | | | | | | | 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-143-2/+29
|
* Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-123-29/+2
| | | | | | | | | 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-103-2/+29
| | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* Revert "Better error handling if Load OAR or Save OAR fail"Justin Clark-Casey (justincc)2012-05-073-32/+6
| | | | | | 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-073-6/+32
|
* Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-271-1/+4
| | | | DotNetZip provides much better compression than standard .NET.
* Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-271-3/+3
| | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
* When creating an OAR, objects where the user is the Creator are always ↵Oren Hurvitz2012-04-261-2/+7
| | | | | | included, regardless of their permissions. The purpose of the permission checks is to prevent the unauthorized copying of assets, but users can always copy assets that they created.
* Fix bug where setting phantom on a prim would result in a server log message ↵Justin Clark-Casey (justincc)2012-04-221-2/+2
| | | | | | | | rather than setting phantom. This was an oversight when removing some race conditions from PhysicsActor setting recently. Regression tests extended to probe this code path. Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing.
* Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate ↵Justin Clark-Casey (justincc)2012-03-101-1/+1
| | | | | | thread. This was previous behaviour anyway.
* minor: rearrange some save oar messages so they say what they're about to do ↵Justin Clark-Casey (justincc)2012-03-101-8/+7
| | | | rather than what they've just done.
* On OAR saving, try fetch assets serially rather than firing all the requests ↵Justin Clark-Casey (justincc)2012-03-102-9/+18
| | | | | | | at the asset service at once. This may (or may not) improve reliability for http://opensimulator.org/mantis/view.php?id=5898 Quick tests show that save time is the same.
* Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵Snoopy Pfeffer2012-02-031-2/+2
| | | | corresponding RemoteAdmin parameter
* Add experimental --publish option to "save oar" so that OARs reloaded to the ↵Justin Clark-Casey (justincc)2012-01-284-14/+89
| | | | same grid don't have the publisher as owner.
* Add basic request and send image regression tests for LLImageManagerJustin Clark-Casey (justincc)2012-01-191-1/+1
|
* RegionReady:BlueWall2012-01-181-0/+2
| | | | Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon.
* Update RegionReadyModuleBlueWall2012-01-131-1/+9
| | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
* HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-121-2/+6
| | | | location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
* 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.
* Change wording on asset requests.Justin Clark-Casey (justincc)2011-10-191-2/+2
| | | | Not all 'notified missing' assets are a problem. Some are invalid references which happen to be buried in other text.
* When creating an OAR, optionally exclude objects according to their permissionsOren Hurvitz2011-09-122-3/+104
|
* Comment out the part of the load oar code that zeroes out prim sit target ↵Justin Clark-Casey (justincc)2011-09-092-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
* rename TestHelper => TestHelpers for consistencyJustin Clark-Casey (justincc)2011-08-061-5/+5
|
* rename test SceneSetupHelpers -> SceneHelpers for consistencyJustin Clark-Casey (justincc)2011-08-061-4/+4
|
* tweak messages. Make verbose inventory item save message give the item name ↵Justin Clark-Casey (justincc)2011-06-141-2/+2
| | | | as well as item id and asset id
* Save the sun's position in OARsOren Hurvitz2011-06-102-0/+5
|
* Make sure culture is en-US when saving archive related xml.Justin Clark-Casey (justincc)2011-05-271-0/+4
| | | | This might resolve http://opensimulator.org/mantis/view.php?id=5475
* Add --noassets option for "save iar"Justin Clark-Casey (justincc)2011-05-261-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.
* Bump OAR file format version up to 0.7 for this development cycle.Justin Clark-Casey (justincc)2011-05-261-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
* Add a --noassets option to "save oar".Justin Clark-Casey (justincc)2011-05-263-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.
* Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just ↵Justin Clark-Casey (justincc)2011-05-211-1/+0
| | | | OpenSim.Tests.Common instead
* When loading an OAR that doesn't have parcels, create a default parcelOren Hurvitz2011-05-142-4/+9
|
* bump oar version number to 0.6.Justin Clark-Casey (justincc)2011-04-181-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.
* Add regression test to check that OARs start with the control file.Justin Clark-Casey (justincc)2011-04-182-9/+18
|
* Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.Justin Clark-Casey (justincc)2011-03-091-1/+0
| | | | This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
* 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 more debug messages under the -verbose option.Diva Canto2011-01-081-2/+6
|
* Drop current OAR version back to 0.5 since these are currently now ↵Justin Clark-Casey (justincc)2010-12-113-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.
* Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2010-11-292-7/+30
| | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
* Fix: Allow use of parameters without specifying a file path with command ↵Marck2010-11-231-1/+1
| | | | "save oar"