Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | give up on a property that old monos do compile, but then smore ok exec | UbitUmarov | 2018-01-09 | 2 | -2/+0 |
| | |||||
* | fall back to a obsolete property since several monos in use (include our ↵ | UbitUmarov | 2018-01-08 | 2 | -2/+2 |
| | | | | own) do not suporte the proper .net4.0 one | ||||
* | a few more xml things | UbitUmarov | 2018-01-05 | 2 | -0/+4 |
| | |||||
* | Refactor archive loading to optionally start script engine after loading. | Robert Adams | 2017-08-14 | 1 | -12/+20 |
| | |||||
* | and add a missing bracket :) | UbitUmarov | 2017-06-26 | 1 | -1/+1 |
| | |||||
* | fix bad english | UbitUmarov | 2017-06-26 | 1 | -1/+1 |
| | |||||
* | a few more changes to iar/oar assets save error/warning to show problems ↵ | UbitUmarov | 2017-06-24 | 1 | -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 ↵ | UbitUmarov | 2017-06-23 | 2 | -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 saves | UbitUmarov | 2017-06-23 | 1 | -1/+16 |
| | |||||
* | several changes to iar/oar assets error reports | UbitUmarov | 2017-06-23 | 3 | -16/+20 |
| | |||||
* | actually iar do it for iar | UbitUmarov | 2017-06-22 | 1 | -1/+1 |
| | |||||
* | show the count of broken assets we now have from gather on iar/oar pre save ↵ | UbitUmarov | 2017-06-22 | 1 | -0/+3 |
| | | | | information | ||||
* | do not try to store on oars temporary or in transit objects ( they may be ↵ | UbitUmarov | 2017-06-21 | 1 | -9/+8 |
| | | | | deleted during the save) | ||||
* | make oar/iar assets writer be done by caller thread like the rest of the | UbitUmarov | 2017-06-21 | 2 | -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 cleanup | Melanie Thielker | 2017-01-05 | 8 | -138/+138 |
| | |||||
* | save oar: simplify confusing successefull assets saving message | UbitUmarov | 2016-09-27 | 1 | -3/+8 |
| | |||||
* | load oar; activate area cliping if bounding-origin option is given. as help says | UbitUmarov | 2016-09-27 | 1 | -2/+12 |
| | |||||
* | workaround potencial memory leak | UbitUmarov | 2016-08-22 | 1 | -0/+2 |
| | |||||
* | remove references to RegionCombinerModule | UbitUmarov | 2016-07-28 | 2 | -15/+1 |
| | |||||
* | Fix Region Max height in boundingSize parameters checking in ↵ | Jak Daniels | 2015-11-27 | 1 | -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 Daniels | 2015-11-22 | 1 | -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 use | UbitUmarov | 2015-11-22 | 1 | -11/+11 |
| | |||||
* | change syncronization method | UbitUmarov | 2015-11-22 | 1 | -76/+65 |
| | |||||
* | revert take the Monitor.wait out of the locks | UbitUmarov | 2015-11-22 | 1 | -17/+16 |
| | |||||
* | coment out merge option on multiregion oar load i added | UbitUmarov | 2015-11-22 | 1 | -1/+1 |
| | |||||
* | take the Monitor.wait out of the locks | UbitUmarov | 2015-11-22 | 1 | -16/+17 |
| | |||||
* | a few more changes on Multiregion control file load | UbitUmarov | 2015-11-22 | 2 | -9/+19 |
| | |||||
* | add a a missing monitor.wait if still not needed, mb in future | UbitUmarov | 2015-11-22 | 1 | -3/+8 |
| | |||||
* | a few changes on Multiregion control file load ; load oar seems far from good | UbitUmarov | 2015-11-22 | 2 | -8/+15 |
| | |||||
* | add Monitor.wait on load | UbitUmarov | 2015-11-22 | 1 | -0/+4 |
| | |||||
* | reduce noise before compare | UbitUmarov | 2015-11-22 | 1 | -2/+13 |
| | |||||
* | add merge option on multioar test | UbitUmarov | 2015-11-22 | 1 | -1/+3 |
| | |||||
* | minor changes | UbitUmarov | 2015-11-22 | 1 | -14/+19 |
| | |||||
* | don't use 'funny' Quaternions | UbitUmarov | 2015-11-22 | 1 | -0/+2 |
| | |||||
* | Changes to Load Oar options and new code to support importing OARs with ↵ | Jak Daniels | 2015-11-22 | 3 | -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 ↵ | UbitUmarov | 2015-11-17 | 1 | -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) | UbitUmarov | 2015-09-02 | 2 | -113/+4 |
| | |||||
* | bad merge? | UbitUmarov | 2015-09-01 | 3 | -7/+126 |
|\ | |||||
| * | try to implement core load oar options | UbitUmarov | 2015-08-24 | 3 | -110/+314 |
| | | |||||
| * | varregion: any conversions of use of Constants.RegionSize converted into | Robert Adams | 2015-03-29 | 1 | -1/+1 |
| | | | | | | | | Util.cs routines to convert region coords to and from world coords or handles. | ||||
| * | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 2 | -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 careminster | Melanie | 2013-11-23 | 1 | -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 PermissionMask | Melanie | 2013-03-24 | 1 | -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 careminster | Melanie | 2013-02-16 | 1 | -0/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 4 | -39/+56 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 3 | -144/+209 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | ||||
| * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 1 | -0/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-01 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-28 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 2 | -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 |