aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Make the IteratingUuidGatherer the only UuidGatherer.Justin Clark-Casey (justincc)2015-01-081-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.
* refactor: Move methods to start a monitored thread, start work in its own ↵Justin Clark-Casey (justincc)2014-11-253-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
* refactor: consistently put all test classes in the OpenSim.Tests.Common ↵Justin Clark-Casey (justincc)2014-11-251-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
* Modifications to previous IAR commits to bring them more inline with ↵AliciaRaven2014-09-231-9/+9
| | | | existing OpenSim code conventions. Also include new IAR save switch in console help print out.
* For monitoring purposes, start non-timeout tasks (which do not currently use ↵Justin Clark-Casey (justincc)2014-09-053-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).
* Close streams immediately when we finish using themOren Hurvitz2014-07-212-13/+15
|
* When saving an OAR in "Publish" mode, also discard Group informationOren Hurvitz2014-05-261-1/+2
|
* 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-062-6/+42
|
* 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
|
* Run slow operations in a separate thread, instead of using FireAndForget ↵Oren Hurvitz2014-03-252-4/+4
| | | | | | (which has a 1-minute timeout) Resolves http://opensimulator.org/mantis/view.php?id=6945
* 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-022-1/+7
|
* Really add the old parameter names to load oar to keep downward compatibiliyRobert Adams2014-02-021-0/+2
|
* Change new 'load oar' parameters to be hyphenated to be consistant withRobert Adams2014-02-022-10/+10
| | | | | existing parameters. ('--forceterrain' becomes '--force-terrain'). The old forms have been kept for downward compatiblity.
* Implement terrain merging in TerrainChannel.Robert Adams2014-02-022-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.
* clear land tainting when tested. Then testing, pass scene to LandObject as ↵Robert Adams2014-01-281-1/+1
| | | | now needed to get region size
* Merge branch 'master' into varregionRobert Adams2014-01-212-12/+11
|\
| * Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-202-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'.
* | varregion: remove --noterrain and --noparcel parameters in 'load oar'.Robert Adams2014-01-192-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>".
* | varregion: add --noterrain and --noparcel to 'load oar'.Robert Adams2014-01-193-24/+54
| | | | | | | | | | --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-193-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
* | varregion: many more updates removing the constant RegionSize and replacingRobert Adams2013-12-261-1/+1
| | | | | | | | with a passed region size. This time in the map code and grid services code.
* | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.Robert Adams2013-12-142-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.
* | Merge branch 'master' into varregionRobert Adams2013-11-151-2/+2
|\ \ | |/
| * 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
* | VarRegion: change RegionInfo storage of region coordinates from regionRobert Adams2013-09-282-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.
* Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-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"
* Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-161-0/+2
|
* Changed locks to prevent deadlocks (especially during multi-region Load OAR)Oren Hurvitz2013-01-021-15/+27
|
* If Save OAR/IAR times-out while waiting for assets then notify the caller ↵Oren Hurvitz2013-01-023-24/+29
| | | | that the operation failed
* In ArchiverTests, use the local instantiated SceneManager rather than ↵Justin Clark-Casey (justincc)2012-11-241-20/+7
| | | | potentially cross-contaminating tests by relying on the static SceneManager.Instance
* Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)2012-11-243-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.
* 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
* Another 10 modules' directives moved from .addin.xmlDiva Canto2012-11-121-0/+2
|
* Comment out checks not to overwrite existing IAR/OAR files for now on "save ↵Justin Clark-Casey (justincc)2012-11-011-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
* Fix "save iar" hanging permanently if the asset request phase times out.Justin Clark-Casey (justincc)2012-10-261-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.
* Fixed saving non-square multi-region OARsOren Hurvitz2012-10-261-1/+1
|
* Get "save oar" and "save iar" to tell you in a more friendly manner if the ↵Justin Clark-Casey (justincc)2012-10-241-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.
* Fix a few minor issues in ArchiveReadRequest logging.Justin Clark-Casey (justincc)2012-10-191-2/+2
|
* Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-301-1/+0
| | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
* Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-301-0/+1
| | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
* Correctly override and call base OpenSimTestCase.SetUp() method in ↵Justin Clark-Casey (justincc)2012-09-191-1/+4
| | | | | | GridConnectorsTests and ArchiverTests. Remove unrelated compile warning from AttachmentsModuleTests.
* Added unit tests for multi-region OARsOren Hurvitz2012-09-141-58/+326
|
* Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the ↵Justin Clark-Casey (justincc)2012-09-143-9/+9
| | | | | | | multi-OAR patch there is now only one class that handles this operation. Adapation of 0004-Renamed-ArchiveWriteRequestPreparation-to-ArchiveWri.patch in http://opensimulator.org/mantis/view.php?id=6105 since that did not directly apply
* Support multi-region OAR filesOren Hurvitz2012-09-148-395/+1057
| | | | 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.
generated by cgit v1.1 at 2024-09-19 23:23:24 +0000