aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver (unfollow)
Commit message (Collapse)AuthorFilesLines
2015-09-02seems to compile ( tests comented out)UbitUmarov2-113/+4
2015-08-24try to implement core load oar optionsUbitUmarov3-110/+314
2015-05-05Refactored some code that is used in two different dlls related to SOP ↵Diva Canto1-1/+1
rewriting. Also added some unit tests that relate to mantis #7514
2015-03-29varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams1-1/+1
Util.cs routines to convert region coords to and from world coords or handles.
2015-03-11minor: Remove windows build warning about CompressionLevel package ambiguity.Justin Clark-Casey (justincc)1-0/+1
Relates to http://opensimulator.org/mantis/view.php?id=7442 Thanks Fly-Man-
2015-01-08Make the IteratingUuidGatherer the only UuidGatherer.Justin Clark-Casey (justincc)1-5/+5
This UUID gatherer provides a superset of the previous gatherer's functionality as it also allows the caller to control gathering iterations for load purposes.
2014-11-25refactor: Move methods to start a monitored thread, start work in its own ↵Justin Clark-Casey (justincc)3-5/+5
thread and run work in the jobengine from Watchdog to a WorkManager class. This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management. Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget. Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
2014-11-25refactor: consistently put all test classes in the OpenSim.Tests.Common ↵Justin Clark-Casey (justincc)1-1/+0
package rather than some in OpenSim.Tests.Common.Mock the separate mock package was not useful and was just another using line to always add
2014-09-23Modifications to previous IAR commits to bring them more inline with ↵AliciaRaven1-9/+9
existing OpenSim code conventions. Also include new IAR save switch in console help print out.
2014-09-05For monitoring purposes, start non-timeout tasks (which do not currently use ↵Justin Clark-Casey (justincc)3-5/+8
a threadpool) via Watchdog.RunInThread() rather than Util.RunThreadNoTimeout() The functionality is the same but this allow us to monitor such tasks via "show threads" and abort them for test purposes, etc. Also extends thread names to provide more info (e.g. SendInitialDataToClient says what client the task is for).
2014-07-21Close streams immediately when we finish using themOren Hurvitz2-13/+15
2014-05-26When saving an OAR in "Publish" mode, also discard Group informationOren Hurvitz1-1/+2
2014-05-06new version of patch to add default-user switch new version :qw :wq updated ↵Matt Lehmann1-0/+2
version of default user switch for load oar :q :q
2014-05-06updated version of default user switch for load oar :q :qMatt Lehmann2-6/+42
2014-04-20Fixed: the parcel flag "Allow Scripts from Group" should only check if the ↵Oren Hurvitz1-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).
2014-03-28Removed default timeout when starting scripts after Load OAROren Hurvitz1-2/+2
2014-03-25Run slow operations in a separate thread, instead of using FireAndForget ↵Oren Hurvitz2-4/+4
(which has a 1-minute timeout) Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-24In Load OAR, correctly restore group-owned objectsOren Hurvitz1-3/+3
Resolves http://opensimulator.org/mantis/view.php?id=6943
2014-03-24In Load OAR: Zero isn't a valid Group IDOren Hurvitz1-4/+2
Resolves http://opensimulator.org/mantis/view.php?id=6943
2014-03-24During Load OAR, fix the User and Group ID's in objects that are embedded in ↵Oren Hurvitz1-53/+77
assets (previously only rezzed objects were fixed) Resolves http://opensimulator.org/mantis/view.php?id=6942
2014-02-15Fix displacement and location operations on legacy trees and grass inRobert Adams1-1/+1
the 'load oar' and 'scene' commands. Before they were ignored but the code now relies on the SOG.IsAttachment function for attachmentness.
2014-02-02Add "--no-objects" parameter to 'load oar'.Robert Adams2-1/+7
2014-02-02Really add the old parameter names to load oar to keep downward compatibiliyRobert Adams1-0/+2
2014-02-02Change new 'load oar' parameters to be hyphenated to be consistant withRobert Adams2-10/+10
existing parameters. ('--forceterrain' becomes '--force-terrain'). The old forms have been kept for downward compatiblity.
2014-02-02Implement terrain merging in TerrainChannel.Robert Adams2-22/+49
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.
2014-01-28clear land tainting when tested. Then testing, pass scene to LandObject as ↵Robert Adams1-1/+1
now needed to get region size
2014-01-20Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2-12/+11
"Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
2014-01-19varregion: remove --noterrain and --noparcel parameters in 'load oar'.Robert Adams2-17/+66
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>".
2014-01-19varregion: add --noterrain and --noparcel to 'load oar'.Robert Adams3-24/+54
--noterrain suppresses the loading of the terrain from the oar. --noparcels suppresses the loading of parcel information from the oar.
2014-01-19varregion: add --displacement parameter to 'load oar'.Robert Adams3-12/+46
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
2013-12-26varregion: many more updates removing the constant RegionSize and replacingRobert Adams1-1/+1
with a passed region size. This time in the map code and grid services code.
2013-12-14varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.Robert Adams2-5/+5
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z. This keeps the downward compatibility and follows the scheme of 'region' and 'world' location naming that is happening in the Util module.
2013-11-15refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)1-2/+2
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
2013-09-28VarRegion: change RegionInfo storage of region coordinates from regionRobert Adams2-5/+5
count number to integer world coordinates. Added new methods RegionWorldLoc[XY]. Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim. Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability of external region management packages.
2013-09-25VarRegion: change RegionInfo storage of region coordinates from regionRobert Adams2-5/+5
count number to integer world coordinates. Added new methods RegionWorldLoc[XY]. Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim. Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability of external region management packages.
2013-03-26Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie1-0/+1
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-24Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie1-0/+1
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-02-16Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)1-0/+2
2013-01-02Changed locks to prevent deadlocks (especially during multi-region Load OAR)Oren Hurvitz1-15/+27
2013-01-02If Save OAR/IAR times-out while waiting for assets then notify the caller ↵Oren Hurvitz3-24/+29
that the operation failed
2012-11-24In ArchiverTests, use the local instantiated SceneManager rather than ↵Justin Clark-Casey (justincc)1-20/+7
potentially cross-contaminating tests by relying on the static SceneManager.Instance
2012-11-24Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)3-140/+213
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.
2012-11-23minor: Add some currently commented out debug log lines for investigating ↵Justin Clark-Casey (justincc)1-0/+5
issues resolving group IDs for land parcels on OAR loading where groups do not exist
2012-11-15Revert "Merge master into teravuswork", it should have been avination, not ↵teravus9-1755/+751
master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
2012-11-12Another 10 modules' directives moved from .addin.xmlDiva Canto1-0/+2
2012-11-01Comment out checks not to overwrite existing IAR/OAR files for now on "save ↵Justin Clark-Casey (justincc)1-2/+4
iar/oar" since this causes problems for some backup systems. Needs more thought, maybe an explicit --force/--overwrite switch Comments on http://opensimulator.org/mantis/view.php?id=6389
2012-10-26Fix "save iar" hanging permanently if the asset request phase times out.Justin Clark-Casey (justincc)1-0/+4
Unlike "save oar", this was happening on the same thread as the original request. The timeout happens on another so the original thread is never aborted. On "save oar" this leaves the thread hanging (still bad) but on "save iar" it left the console thread hanging. Temporary fix is to make "save iar" do asset request on a separate thread, like "save oar". Longer term fix will be to restructure asset save to use a ManualResetEvent rather than a separate timeout timer.
2012-10-26Fixed saving non-square multi-region OARsOren Hurvitz1-1/+1
2012-10-24Get "save oar" and "save iar" to tell you in a more friendly manner if the ↵Justin Clark-Casey (justincc)1-7/+11
filename to save already exists, rather than exception throwing. Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
2012-10-19Fix a few minor issues in ArchiveReadRequest logging.Justin Clark-Casey (justincc)1-2/+2