aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver (follow)
Commit message (Collapse)AuthorAgeFilesLines
* give up on a property that old monos do compile, but then smore ok execUbitUmarov2018-01-092-2/+0
|
* fall back to a obsolete property since several monos in use (include our ↵UbitUmarov2018-01-082-2/+2
| | | | own) do not suporte the proper .net4.0 one
* a few more xml thingsUbitUmarov2018-01-052-0/+4
|
* Refactor archive loading to optionally start script engine after loading.Robert Adams2017-08-141-12/+20
|
* and add a missing bracket :)UbitUmarov2017-06-261-1/+1
|
* fix bad englishUbitUmarov2017-06-261-1/+1
|
* a few more changes to iar/oar assets save error/warning to show problems ↵UbitUmarov2017-06-241-9/+15
| | | | known to be asset errors
* code actually has no ideia if a id is a asset or not and does try to handle ↵UbitUmarov2017-06-232-9/+9
| | | | all as assets, it really can't report errors. Change messages to make more clear they are only warnings and may mean nothing at all
* do the same on OAR savesUbitUmarov2017-06-231-1/+16
|
* several changes to iar/oar assets error reportsUbitUmarov2017-06-233-16/+20
|
* actually iar do it for iarUbitUmarov2017-06-221-1/+1
|
* show the count of broken assets we now have from gather on iar/oar pre save ↵UbitUmarov2017-06-221-0/+3
| | | | information
* do not try to store on oars temporary or in transit objects ( they may be ↵UbitUmarov2017-06-211-9/+8
| | | | deleted during the save)
* make oar/iar assets writer be done by caller thread like the rest of theUbitUmarov2017-06-212-172/+48
| | | | | | oar/iar save. This may look more painfull but should reduce errors and threads fights. Fill lucky i just don't stop the entire simulation during this
* Massive tab and trailing space cleanupMelanie Thielker2017-01-058-138/+138
|
* save oar: simplify confusing successefull assets saving messageUbitUmarov2016-09-271-3/+8
|
* load oar; activate area cliping if bounding-origin option is given. as help saysUbitUmarov2016-09-271-2/+12
|
* workaround potencial memory leakUbitUmarov2016-08-221-0/+2
|
* remove references to RegionCombinerModuleUbitUmarov2016-07-282-15/+1
|
* Fix Region Max height in boundingSize parameters checking in ↵Jak Daniels2015-11-271-2/+2
| | | | | | ArchiverModule.cs to float.MaxValue .. as was changed in ArchiveReadRequest.cs in commit 71f5c2b856aeab2b535094804f15317d5dc544e1 A comparison of consistent 'default' values determines whether boundingBox check is true. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* Fixed some stupid math and checks on --bounding-origin and --bounding-size. ↵Jak Daniels2015-11-221-20/+9
| | | | | | Bounding origin can of course be negative if it needs to be as we're taking stuff from the (possibly rotated) source region. Bounding size must always be >=0 and <= destination region size. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* change silly Monitor useUbitUmarov2015-11-221-11/+11
|
* change syncronization methodUbitUmarov2015-11-221-76/+65
|
* revert take the Monitor.wait out of the locksUbitUmarov2015-11-221-17/+16
|
* coment out merge option on multiregion oar load i addedUbitUmarov2015-11-221-1/+1
|
* take the Monitor.wait out of the locksUbitUmarov2015-11-221-16/+17
|
* a few more changes on Multiregion control file loadUbitUmarov2015-11-222-9/+19
|
* add a a missing monitor.wait if still not needed, mb in futureUbitUmarov2015-11-221-3/+8
|
* a few changes on Multiregion control file load ; load oar seems far from goodUbitUmarov2015-11-222-8/+15
|
* add Monitor.wait on loadUbitUmarov2015-11-221-0/+4
|
* reduce noise before compareUbitUmarov2015-11-221-2/+13
|
* add merge option on multioar testUbitUmarov2015-11-221-1/+3
|
* minor changesUbitUmarov2015-11-221-14/+19
|
* don't use 'funny' QuaternionsUbitUmarov2015-11-221-0/+2
|
* Changes to Load Oar options and new code to support importing OARs with ↵Jak Daniels2015-11-223-48/+262
| | | | | | different Region sizes to the destination region. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* work around some 'tests' errors: allow sitTargetposition and orientation to ↵UbitUmarov2015-11-171-1/+2
| | | | be read from OAR on opensim, they are reset at avination, this may cause issues with old sits
* seems to compile ( tests comented out)UbitUmarov2015-09-022-113/+4
|
* bad merge?UbitUmarov2015-09-013-7/+126
|\
| * try to implement core load oar optionsUbitUmarov2015-08-243-110/+314
| |
| * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-291-1/+1
| | | | | | | | Util.cs routines to convert region coords to and from world coords or handles.
| * Merge branch 'master' into careminsterMelanie2014-01-282-12/+11
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| * \ Merge branch 'master' into careminsterMelanie2013-11-231-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-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"
| * | | Merge branch 'master' into careminsterMelanie2013-02-161-0/+2
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-01-044-39/+56
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-253-144/+209
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-131-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-011-2/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-281-0/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-262-8/+12
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs