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
6aa876a83b
Rename Bounciness to Restitution
2013-02-07 03:40:48 +00:00
b64460e541
Merge branch 'master' into careminster
2013-02-07 03:30:44 +00:00
6504e3d4ce
Rename "Bounciness" to "Restitution"
2013-02-07 03:30:02 +00:00
529489e73a
Merge branch 'master' into careminster
2013-02-07 03:20:16 +00:00
2c5d24d394
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-07 02:19:53 +00:00
3657a08844
Add TestJsonWriteReadNotecard() regression test
2013-02-07 02:19:26 +00:00
375114bea3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-02-07 01:40:11 +00:00
274d376c82
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-06 17:32:57 -08:00
e17392acbb
Enables script access to the per object dynamic attributes through the JsonStore
...
script functions. Adds JsonAttachObjectStore to associate a store identifier with
an object (scripts can only access the store in their host object, this could be
extended but isn't necessary for now).
Note this opens a method to the DAMap OSDMap. This will be removed later, but
greatly simplifies the code for now.
The JsonStore and these scripts are disabled by default.
2013-02-06 17:29:17 -08:00
a4b22f3882
Merge branch 'master' into careminster
2013-02-07 01:25:50 +00:00
4d1758985f
Make json store tests operate on a single thread to ensure we don't run into any race related test failures in the future.
2013-02-07 00:54:09 +00:00
7590ebc934
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-02-06 16:45:47 -08:00
df37738ce7
WebStats will now use actual logfile as specified in OpenSim.exe.config rather than hardcoded ./OpenSim.log. This allows for rotating logs and other file appender types
2013-02-06 16:44:59 -08:00
c8c5d74c22
minor: add method doc to DAMap.ValidateKey()
2013-02-07 00:22:39 +00:00
5d523ea493
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-06 16:18:27 -08:00
Robert Adams