Commit Graph

19592 Commits (bf630fb808420c15abc100f11b993b9e6e1113c2)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 58c890df5d Make TestSetPhysicsSinglePrim() actually add the object to the scene in order to test more code paths. 2012-04-22 20:03:34 +01:00
Justin Clark-Casey (justincc) 8205fe79ce Fix bug where setting phantom on a prim would result in a server log message rather than setting phantom.
This was an oversight when removing some race conditions from PhysicsActor setting recently.
Regression tests extended to probe this code path.
Extending regression tests required implementation of a BasicPhysicsPrim (there was none before).  However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing.
2012-04-22 19:51:51 +01:00
Melanie 8df4bd14f5 Merge branch 'master' into careminster 2012-04-22 15:06:06 +01:00
UbitUmarov 26fd1e3a0c fix a bug i added fixing another.... 2012-04-22 03:08:47 +01:00
UbitUmarov 190e7a4334 ubitODE: - don't try to hover underground unless volumedetector (that doesn't colide with it) 2012-04-21 05:16:54 +01:00
Justin Clark-Casey (justincc) ae2b8f7007 Comment out spurious Body != IntPtr.Zero code after disableBody(), since disableBody() sets Body == IntPtr.Zero on all code paths. 2012-04-21 03:42:54 +01:00
Justin Clark-Casey (justincc) f609594595 refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate. 2012-04-21 03:23:51 +01:00
Justin Clark-Casey (justincc) 77a7de87e1 Add test for setting physics in a linkset 2012-04-21 02:45:16 +01:00
Justin Clark-Casey (justincc) d5c724e5b8 Add regression test for prim status when root prim in a new linkset is non-physical 2012-04-21 01:51:57 +01:00
Justin Clark-Casey (justincc) 9ac48b2aff Fix a bug where linking a non-physical prim with a physical prim as root would make the non-physical prim phantom rather than part of the physics object.
On region restart, the whole object would become physical as expected.
Observed behaviour from elsewhere is that all prims in a new linkset should take on the status of the root prim.
Add regression test for this behaviour.
2012-04-21 01:43:09 +01:00
Justin Clark-Casey (justincc) 17bf2a62db Add test for correct physics status on linking two physics objects
Also fixes last build break.
2012-04-21 01:09:42 +01:00
Justin Clark-Casey (justincc) 71900968b2 refactor: extract common setup code in SceneObjectStatusTests 2012-04-21 01:01:24 +01:00
Justin Clark-Casey (justincc) ae789f6c16 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-04-21 00:55:27 +01:00
Justin Clark-Casey (justincc) 06552f217e Add TestSetPhysics() to SOP status tests 2012-04-21 00:54:48 +01:00
Justin Clark-Casey (justincc) 7a574be3fd Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim.
prim_geom == IntPtr.Zero only before a new add prim taint is processed (which is the first taint) or in operations such as scale change which are done in taint or under lock.
Therefore, we can remove these checks which were not consistently applied anyway.
If there is a genuine problem, better to see it quickly in a NullReferenceException than hide the bug.
2012-04-21 00:12:07 +01:00
Justin Clark-Casey (justincc) c8307cdf1e Improve bitmap disposal to do null checks and not to potentially try disposal of uninitialized variables.
This issue doesn't cause the mono 2.10.5 compiler to fail but appears to cause the windows compiler to fail.
Resolves http://opensimulator.org/mantis/view.php?id=5973
2012-04-20 23:35:11 +01:00
Melanie d76d8f3da1 Merge branch 'master' into careminster 2012-04-20 23:32:55 +01:00
Justin Clark-Casey (justincc) 566327a948 If a physical prim is manually moved (e.g. by a user) then set the geometry position as well as the body position
This is necessary to stop the moved prim snapping back to the original position on deselection if moved only once
This resolves http://opensimulator.org/mantis/view.php?id=5966
2012-04-20 23:24:24 +01:00
Melanie 31c5a7241e Merge branch 'master' into careminster 2012-04-20 23:17:29 +01:00
UbitUmarov 3b56c44453 changed seletion code. SOP now knows about parts selection. UI actions are sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects 2012-04-20 18:51:32 +01:00
Melanie 464fb2533f Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
	OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
2012-04-20 16:48:43 +01:00
UbitUmarov 2c7f035925 ubitODE: - Change triangles used in terrain height estimation 2012-04-20 04:49:23 +01:00
Justin Clark-Casey (justincc) 75f117484b Always dispose of existing opened bitmap from file in SaveFile(), instead of simply dropping the reference if the existing file didn't contain a bitmap of the same size. 2012-04-20 03:57:22 +01:00
Justin Clark-Casey (justincc) cba64ebc79 Explicitly dispose of bitmaps opened from files in GenericSystemDrawing and JPEG.cs 2012-04-20 03:46:33 +01:00
Justin Clark-Casey (justincc) 4ac2f839bd Remember to dispose of the bitmap opened from a file in GatekeeperServiceConnector.GetMapImage() 2012-04-20 03:32:38 +01:00
Garmin Kawaguichi 63cda3a6d0 concerns GenericSystemDrawing.cs
in OpenSim\Region\CoreModules\World\Terrain\FileLoaders\GenericSystemDrawing.cs
Ln 67
Apply Justin's solution

Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com>
2012-04-20 03:26:02 +01:00
UbitUmarov ec6347f987 ubitODE - again avatar/terrain collision. Reduce new viewers interpolators efects reporting null velocity and aceleration when stopped near the right position, where they can still have instantanius large values that can get magnified by interpolators, specially using diferent timing estimation. 2012-04-20 03:17:36 +01:00
Justin Clark-Casey (justincc) f3dda2d85d Add more exception detail to Exception and IOException throws in BaseHttpServer.HandleRequest() 2012-04-20 03:12:25 +01:00
Justin Clark-Casey (justincc) 2b98e2f106 Stop teleports from dropping tall avatars through or embedding them in the floor when lured by short avatars.
This involves giving the ceiling of the Z-component in a lure rather than the floor.
Ideally we would give the exact float compensating for relative avatar height but it looks like that isn't possible with the parcel id format used in lures
2012-04-20 02:50:36 +01:00
Melanie 65b3e13010 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-04-20 00:17:14 +01:00
UbitUmarov aeb5aed5b7 changed - VolumeDetect and phantom setting interaction. Script VD(true) forces phantom ON. UI phantom off turns off VD. Other transitions should only change specific parameter. This is not as current SL. - Fixed volumedetect prims being wrongly removed from physics. 2012-04-19 23:01:22 +01:00
UbitUmarov 9b02e1cf4a Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-04-19 01:52:23 +01:00
Melanie beb7b8d189 Fix a logic error in app domain creation 2012-04-18 23:23:37 +01:00
Melanie c2be894330 Fx up estate settings 2012-04-18 23:23:01 +01:00
Melanie 411bd0574d Allow setting a specific target velocity on TeleportWithMomentum 2012-04-18 22:16:59 +02:00
Melanie 525b7593e8 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-04-18 20:09:52 +01:00
Melanie 7a255efdb2 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2012-04-18 20:07:32 +01:00
Melanie ea73a03553 Don't re-add the assembly resolver for each script if not creating the appdomain 2012-04-18 20:01:41 +01:00
Melanie 5936e0c376 Allow scripts in attachments owned by the NPC to control the NPC 2012-04-18 19:51:27 +02:00
UbitUmarov 08714a0d38 ubitODE still retouching character pid 2012-04-18 03:59:38 +01:00
UbitUmarov 7f42069295 ubitODE - retouch character PIDs 2012-04-18 03:02:28 +01:00
Justin Clark-Casey (justincc) c85f9d681a On "show part" command, show link number.
This replaces the Parts count which was rather pointless for a prim (it was either 1 if a child or the number of parts if the root).
This information is still avaliable on the "show object" command.
2012-04-18 00:39:39 +01:00
Melanie fc9f244a7d Merge branch 'master' into careminster 2012-04-18 00:28:33 +01:00
Justin Clark-Casey (justincc) b430c0162c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-04-18 00:00:09 +01:00
Justin Clark-Casey (justincc) 859646ef5c minor: Add some method doc. Add warnings since calling SOG link/delink methods directly rather than through Scene may allow race conditions. 2012-04-17 23:54:51 +01:00
Melanie 0fe0b2ceec Prevent objects rezzed in sim from being seen as attachments and becoming uneditable or crashers. (Foxtail of death) 2012-04-17 23:39:41 +02:00
Mic Bowman 84891930aa clean up some more logging spam in the jsonstore modules 2012-04-17 14:23:43 -07:00
Mic Bowman 4db518b9a3 Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization.
Cut down on the logging spam.
2012-04-17 14:15:17 -07:00
Mic Bowman 2d45ba47ac add configuration for jsonstore module, disabled by default 2012-04-17 13:55:00 -07:00
Mic Bowman 5ff2bda587 This commit adds a new optional region module, JsonStore, that provides structured
storage (dictionaries and arrays of string values) for scripts and region modules.
In addition, there are operations on the storage that enable "real" distributed
computation between scripts through operations similar to those of a tuple space.
Scripts can share task queues, implement shared locks or semaphores, etc.

The structured store is limited to the current region and is not currently
persisted. However, script operations are defined to initialize a store from a notecard
and to serialize the store to a notecard.

Documentation will be posted to the opensim wiki soon.
2012-04-17 13:45:27 -07:00