d92eb80373
BulletSim: add initial instance of the ExtendedPhysics region module which adds new LSL commands for extended physics functions. Uses the modInvoke system. Disabled by default.
2013-02-08 16:29:35 -08:00
1b203601f4
BulletSim: include the linkage to the layered prim implementation. Separate layers for physical (vs simulator) location displacement and linksets.
2013-02-08 16:29:29 -08:00
2fd184e350
BulletSim: reclass BSPrim into layers so linkset and physical world displacement is implemented as overlay classes rather than if statements scattered about.
2013-02-08 16:29:24 -08:00
6d825d7ea2
Broaden the internal OSD type checks to parse JSON that has
...
non string values.
2013-02-08 15:46:42 -08:00
12971e73d4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
2013-02-08 23:29:47 +00:00
4d5c04837e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-08 15:09:13 -08:00
e93defd0ca
Adds size limits to JsonStore. Adds a separate configuration
...
variable to enable binding to dynamic attributes.
2013-02-08 15:07:43 -08:00
a08e1b60ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-08 21:56:22 +00:00
b08977ea7d
Don't allow exceptions to propogate from FlotsamAssetCache which may occur when deleting expired files or stamping the region status file.
...
Changes various error level log lines to warn since these are not fatal to the operation of OpenSimulator
2013-02-08 21:21:20 +00:00
2b5eba9c74
Fix the return values for JsonDestroyStore, JsonRemoveValue, and JsonSetValue.
...
Fix the link message status when reading a notecard.
2013-02-08 12:00:16 -08:00
c2bf91c5e3
If a component of a coalesced object fails to deserialization, do not add a null where the object should be.
...
This prevents a later load IAR failure.
This code is currently only used by IAR loading.
2013-02-08 02:45:30 +00:00
221a90e3a1
On IAR loading, if loading of a coaleseced item entirely fails, then continue with the IAR load rather than failing completely.
2013-02-08 02:34:13 +00:00
e836da5d20
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-08 02:01:17 +00:00
42f724f380
Refine TestJsonReadNotecard() and use / instead of . to separate paths.
...
An attack of the stupid meant that I was using / as a path separator.
Fixing this makes the tests behave better, though still with some questions.
Also, I imagine / shouldn't really put data in the root as that's not a valid identifier.
This commit also fix the / mistake in other tests those this does not affect their outcomes.
2013-02-08 01:59:27 +00:00
913965256f
BulletSim: Adapt BulletSim to the newer physical properties. Viewer
...
dialog setting of friction, restitution, ... working.
2013-02-07 17:13:28 -08:00
b545e13184
BulletSim: fix exceptions caused by setting physical properties before the prim body is initialized.
2013-02-07 17:13:27 -08:00
ebb63b55aa
BulletSim: add user setting of friction, density and restitution.
2013-02-07 17:13:27 -08:00
528f23beab
Extend TestJsonReadNotecard() for reads to non-root locations and fake stores.
...
Assertions for loading to non-root paths are currently commented out because this doesn't seem to be working. Will be raising mantis to resolve.
2013-02-08 01:02:25 +00:00
8a2604f17e
Merge branch 'master' into careminster
2013-02-08 00:48:37 +00:00
9c9b48b29a
Stop wrongly create a receiving store already populated with "Hello":"World" in TestJsonReadNotecard()
2013-02-08 00:38:30 +00:00
24bfdbfb80
Extend TestJsonWriteNotecard() regression test for cases with fake paths and fake stores.
...
Also separates out TestJsonWriteReadNotecard() into separate write and read tests
2013-02-08 00:36:20 +00:00
bef8961578
Extend TestJsonSetValue() regressio ntes tto test against a fake store
2013-02-08 00:04:05 +00:00
be982666fb
Extend TestJsonTestPath() regression test with checks against fake values and fake stores
2013-02-08 00:01:06 +00:00
75f1e04315
Add tests for removing fake values/from fake store in TestJsonRemoveValue()
...
Again, need to check if returning true for removing a value that doesn't exist is most appropriate.
2013-02-07 23:58:19 +00:00
715d6f2da1
Add testing for getting non-existing values and values from a non-existing datastore to TestJsonGetValue()
2013-02-07 23:52:28 +00:00
8008938550
Actually plumb the new values to physics.
2013-02-07 23:36:23 +00:00
86ded35afa
Merge branch 'master' into careminster
2013-02-07 23:35:30 +00:00
a2dad09172
Actually plumb the new values to physics.
2013-02-07 23:34:47 +00:00
ef86a9be45
Merge branch 'master' into careminster
2013-02-07 23:23:53 +00:00
de53955610
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-02-07 23:23:42 +00:00
2e86978b60
Add TestJsonDestoreStoreNotExists()
...
This still returns true even if we ask to destroy a store that does not exist.
Need to check that this is more appropriate behaviour.
2013-02-07 23:30:03 +00:00
114f06c9af
Merge branch 'master' into careminster
2013-02-07 23:23:16 +00:00
22675e6b14
Add some more code from Avination. This changes physics actor stuff around
...
to work with the new params. Not actually plumbed just yet.
2013-02-07 23:22:00 +00:00
9e17dc3daa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-07 23:09:47 +00:00
c135c3224f
Fix a recent regression in e17392a where JsonSetValue() stopped working (probably other functions as well).
...
Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten.
This was actually picked up by the TestJsonSetValue() regression test failing
But this isn't being run on jenkins due to the .net version issue.
This commit also puts the full stack trace in logged messages and makes these error level messages instead of info
2013-02-07 23:08:19 +00:00
f20c134f1a
Merge branch 'master' into careminster
2013-02-07 22:26:22 +00:00
7bf33d333a
Plumb the path from the client to the extra physics params and back
2013-02-07 22:25:28 +00:00
8b78b9429d
Merge branch 'avination' into careminster
2013-02-07 21:26:55 +00:00
bbda7b94b3
Rename Bounciness to Restitution
2013-02-07 21:25:55 +00:00
338b02a8bc
Send the new physics params to the viewer build dialog
2013-02-07 21:23:35 +00:00
765b0e4382
Rename "Bounce" to "Restitution" in PhysicsActor as well. It appears these
...
values are not even used.
2013-02-07 22:20:17 +01:00
bb210aa2c0
Merge branch 'master' into careminster
2013-02-07 21:06:20 +00:00
9089757ea2
Revert "Add plumbing for physics properties to get to the physics engine."
...
This reverts commit c658fa1c0d
2013-02-07 21:05:58 +00:00
45f5a6a6db
Merge branch 'master' into careminster
...
Conflicts:
bin/HttpServer_OpenSim.dll
2013-02-07 20:51:51 +00:00
c658fa1c0d
Add plumbing for physics properties to get to the physics engine.
...
Addition of entries to PhysicsActor and setting code in SceneObjectPart.
2013-02-07 11:10:15 -08:00
af73ea909c
Change passed PhysicsParameter value from float to the more general string value
2013-02-07 11:10:14 -08:00
a5c83f7505
Websocket Echo module should not be on by default.
2013-02-07 12:22:03 -05:00
4bd1794b5a
* missing example module.. Oops.
2013-02-07 12:19:54 -05:00
94a5232d3a
* Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
2013-02-07 10:50:17 -05:00
4867a7cbbf
This is the final commit that enables the Websocket handler
2013-02-07 10:27:18 -05:00
Robert Adams