ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-24 19:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,771 Commits 5 Branches 93 Tags
b52f7b920342b7ea3e0294eae054e7520801e339
Commit Graph

354 Commits

Author SHA1 Message Date
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov
58513fab8f save oar: simplify confusing successefull assets saving message 2016-09-27 16:49:55 +01:00
UbitUmarov
f6e77e3935 load oar; activate area cliping if bounding-origin option is given. as help says 2016-09-27 15:24:05 +01:00
UbitUmarov
4f4227d5bb workaround potencial memory leak 2016-08-22 06:23:55 +01:00
UbitUmarov
ec8101a24a remove references to RegionCombinerModule 2016-07-28 00:34:16 +01:00
Jak Daniels
c0e920c1ad Fix Region Max height in boundingSize parameters checking in ArchiverModule.cs to float.MaxValue .. as was changed in ArchiveReadRequest.cs in commit 71f5c2b856 A comparison of consistent 'default' values determines whether boundingBox check is true. 
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
 2015-11-27 00:16:08 +00:00
Jak Daniels
15af6265a1 Fixed some stupid math and checks on --bounding-origin and --bounding-size. 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>
 2015-11-22 17:30:08 +00:00
UbitUmarov
f75d113230 change silly Monitor use 2015-11-22 08:40:55 +00:00
UbitUmarov
ec069edead change syncronization method 2015-11-22 08:31:54 +00:00
UbitUmarov
e28eecd0bf revert take the Monitor.wait out of the locks 2015-11-22 08:08:01 +00:00
UbitUmarov
1de096dffb coment out merge option on multiregion oar load i added 2015-11-22 08:00:58 +00:00
UbitUmarov
5c3f88b64d take the Monitor.wait out of the locks 2015-11-22 07:55:49 +00:00
UbitUmarov
b80cbf5060 a few more changes on Multiregion control file load 2015-11-22 07:18:11 +00:00
UbitUmarov
a6187db2a7 add a a missing monitor.wait if still not needed, mb in future 2015-11-22 05:44:06 +00:00
UbitUmarov
3be340cbf2 a few changes on Multiregion control file load ; load oar seems far from good 2015-11-22 05:42:13 +00:00
UbitUmarov
f6820959b7 add Monitor.wait on load 2015-11-22 04:49:01 +00:00
UbitUmarov
4349bde440 reduce noise before compare 2015-11-22 04:10:26 +00:00
UbitUmarov
6dcbd20cfa add merge option on multioar test 2015-11-22 03:58:07 +00:00
UbitUmarov
71f5c2b856 minor changes 2015-11-22 03:56:48 +00:00
UbitUmarov
541d2ce2cd don't use 'funny' Quaternions 2015-11-22 02:22:48 +00:00
Jak Daniels
0b216c37df Changes to Load Oar options and new code to support importing OARs with different Region sizes to the destination region. 
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
 2015-11-22 01:32:48 +00:00
UbitUmarov
1e87e90915 work around some 'tests' errors: allow sitTargetposition and orientation to be read from OAR on opensim, they are reset at avination, this may cause issues with old sits 2015-11-17 03:42:46 +00:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
UbitUmarov
3829df1059 try to implement core load oar options 2015-08-24 17:05:16 +01:00
Diva Canto
1abbad71b4 Refactored some code that is used in two different dlls related to SOP rewriting. Also added some unit tests that relate to mantis #7514 2015-05-05 20:59:09 -07:00
Robert Adams
07dead7dcb varregion: any conversions of use of Constants.RegionSize converted into 
Util.cs routines to convert region coords to and from world coords or handles.
 2015-03-29 14:25:12 -07:00
Justin Clark-Casey (justincc)
b267c238fb minor: Remove windows build warning about CompressionLevel package ambiguity. 
Relates to http://opensimulator.org/mantis/view.php?id=7442
Thanks Fly-Man-
 2015-03-11 22:53:32 +00:00
Justin Clark-Casey (justincc)
08606ae409 Make the IteratingUuidGatherer the only UuidGatherer. 
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.
 2015-01-08 20:21:40 +00:00
Justin Clark-Casey (justincc)
86367d7219 refactor: Move methods to start a monitored thread, start work in its own 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-25 23:56:32 +00:00
Justin Clark-Casey (justincc)
fc878a33ed refactor: consistently put all test classes in the OpenSim.Tests.Common 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-11-25 23:21:37 +00:00
AliciaRaven
1e22091193 Modifications to previous IAR commits to bring them more inline with existing OpenSim code conventions. Also include new IAR save switch in console help print out. 2014-09-23 00:04:59 +01:00
Justin Clark-Casey (justincc)
41f2f3132b For monitoring purposes, start non-timeout tasks (which do not currently use 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-09-05 23:20:59 +01:00
Oren Hurvitz
99ac770abb Close streams immediately when we finish using them 2014-07-21 08:30:03 +01:00
Oren Hurvitz
33cc847c4a When saving an OAR in "Publish" mode, also discard Group information 2014-05-26 15:33:13 +01:00
Matt Lehmann
9e83b43009 new version of patch to add default-user switch new version :qw :wq updated version of default user switch for load oar :q :q 2014-05-06 18:48:59 +01:00
Matt Lehmann
8b3c2f7d0c updated version of default user switch for load oar :q :q 2014-05-06 18:48:42 +01:00
Oren Hurvitz
a780e01a54 Fixed: the parcel flag "Allow Scripts from Group" should only check if the 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-04-20 06:23:35 +01:00
Oren Hurvitz
6557eba235 Removed default timeout when starting scripts after Load OAR 2014-03-28 13:04:19 +03:00
Oren Hurvitz
e131e73652 Run slow operations in a separate thread, instead of using FireAndForget (which has a 1-minute timeout) 
Resolves http://opensimulator.org/mantis/view.php?id=6945
 2014-03-25 08:01:55 +01:00
Oren Hurvitz
1a32b35279 In Load OAR, correctly restore group-owned objects 
Resolves http://opensimulator.org/mantis/view.php?id=6943
 2014-03-24 18:18:23 +01:00
Oren Hurvitz
305f5110c6 In Load OAR: Zero isn't a valid Group ID 
Resolves http://opensimulator.org/mantis/view.php?id=6943
 2014-03-24 18:18:08 +01:00
Oren Hurvitz
35078e03e5 During Load OAR, fix the User and Group ID's in objects that are embedded in assets (previously only rezzed objects were fixed) 
Resolves http://opensimulator.org/mantis/view.php?id=6942
 2014-03-24 18:17:59 +01:00
Robert Adams
79200ed270 Fix displacement and location operations on legacy trees and grass in 
the 'load oar' and 'scene' commands. Before they  were ignored but the
code now relies on the SOG.IsAttachment function for attachmentness.
 2014-02-15 17:10:20 -08:00
Robert Adams
41b6602a77 Add "--no-objects" parameter to 'load oar'. 2014-02-02 22:16:01 -08:00
Robert Adams
8c6a0cb44a Really add the old parameter names to load oar to keep downward compatibiliy 2014-02-02 17:18:08 -08:00
Robert Adams
2a4dd34616 Change new 'load oar' parameters to be hyphenated to be consistant with 
existing parameters. ('--forceterrain' becomes '--force-terrain').
The old forms have been kept for downward compatiblity.
 2014-02-02 12:21:18 -08:00
Robert Adams
9c97fb8e12 Implement terrain merging in TerrainChannel. 
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-02-02 11:17:49 -08:00
Robert Adams
0c3493f619 clear land tainting when tested. Then testing, pass scene to LandObject as now needed to get region size 2014-01-28 16:25:01 -08:00
Melanie
c6e9db5866 Merge branch 'master' into careminster 
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
 2014-01-28 21:02:20 +00:00