Commit Graph

16390 Commits (5751ecde5250484fe8e4b79ef38bfbf441e3dead)

Author SHA1 Message Date
Mic Bowman 6d825d7ea2 Broaden the internal OSD type checks to parse JSON that has
non string values.
2013-02-08 15:46:42 -08:00
Mic Bowman 4d5c04837e Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-08 15:09:13 -08:00
Mic Bowman 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
Justin Clark-Casey (justincc) a08e1b60ec Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-08 21:56:22 +00:00
Justin Clark-Casey (justincc) 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
Mic Bowman 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) e836da5d20 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-08 02:01:17 +00:00
Justin Clark-Casey (justincc) 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
Robert Adams 913965256f BulletSim: Adapt BulletSim to the newer physical properties. Viewer
dialog setting of friction, restitution, ... working.
2013-02-07 17:13:28 -08:00
Robert Adams b545e13184 BulletSim: fix exceptions caused by setting physical properties before the prim body is initialized. 2013-02-07 17:13:27 -08:00
Robert Adams ebb63b55aa BulletSim: add user setting of friction, density and restitution. 2013-02-07 17:13:27 -08:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 9c9b48b29a Stop wrongly create a receiving store already populated with "Hello":"World" in TestJsonReadNotecard() 2013-02-08 00:38:30 +00:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) bef8961578 Extend TestJsonSetValue() regressio ntes tto test against a fake store 2013-02-08 00:04:05 +00:00
Justin Clark-Casey (justincc) be982666fb Extend TestJsonTestPath() regression test with checks against fake values and fake stores 2013-02-08 00:01:06 +00:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Melanie a2dad09172 Actually plumb the new values to physics. 2013-02-07 23:34:47 +00:00
Melanie de53955610 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-02-07 23:23:42 +00:00
Justin Clark-Casey (justincc) 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
Melanie 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
Justin Clark-Casey (justincc) 9e17dc3daa Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-07 23:09:47 +00:00
Justin Clark-Casey (justincc) 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
Melanie 7bf33d333a Plumb the path from the client to the extra physics params and back 2013-02-07 22:25:28 +00:00
Melanie 338b02a8bc Send the new physics params to the viewer build dialog 2013-02-07 21:23:35 +00:00
Melanie 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
Robert Adams 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
Robert Adams af73ea909c Change passed PhysicsParameter value from float to the more general string value 2013-02-07 11:10:14 -08:00
teravus a5c83f7505 Websocket Echo module should not be on by default. 2013-02-07 12:22:03 -05:00
teravus 4bd1794b5a * missing example module.. Oops. 2013-02-07 12:19:54 -05:00
teravus 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
teravus 4867a7cbbf This is the final commit that enables the Websocket handler 2013-02-07 10:27:18 -05:00
Melanie 6504e3d4ce Rename "Bounciness" to "Restitution" 2013-02-07 03:30:02 +00:00
Justin Clark-Casey (justincc) 2c5d24d394 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-07 02:19:53 +00:00
Justin Clark-Casey (justincc) 3657a08844 Add TestJsonWriteReadNotecard() regression test 2013-02-07 02:19:26 +00:00
Mic Bowman 274d376c82 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-06 17:32:57 -08:00
Mic Bowman 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
Justin Clark-Casey (justincc) 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
Dan Lake 7590ebc934 Merge branch 'master' of git://opensimulator.org/git/opensim 2013-02-06 16:45:47 -08:00
Dan Lake 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
Justin Clark-Casey (justincc) c8c5d74c22 minor: add method doc to DAMap.ValidateKey() 2013-02-07 00:22:39 +00:00
Robert Adams 5d523ea493 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-06 16:18:27 -08:00
Justin Clark-Casey (justincc) e2c1e37b07 Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to match Add(string key, OSDMap store) 2013-02-07 00:15:50 +00:00
Robert Adams d2ece00e68 BulletSim: set removing zero width triangles in meshes to be enabled by default. This should fix the invisible barrier in sculptie doorways bug. 2013-02-06 15:59:59 -08:00
Robert Adams 0baa2590be BulletSim: check for completely degenerate meshes (ones with all
triangles having zero width) and output an error rather than
throwing and exception.
2013-02-06 15:52:28 -08:00
Robert Adams 67d92e4e16 BulletSim: remove an exception which occurs if a physics mesh
asset is not found.
2013-02-06 14:00:27 -08:00
Melanie 054a9928a0 Fix a bug I brought in by manually editing a diff file. Terrain is if cource not always at 20m. 2013-02-06 18:13:02 +00:00
Melanie e5beb480ea Partial port of Avination's support for the new physics parameters.
Implements the parameters as properties, the serialization and
database storage (MySQL only). Implements llSetPrimitiveParams for
prim physics shape and the other 4 extra params. Only the prim shape type
"None" is currently functional. No support for the Viewer UI (yet), that
will be ported in due course. Lots more to port, this is a large-ish changeset.
2013-02-06 08:03:04 +00:00
Justin Clark-Casey (justincc) 145e38e5e9 Remove long unused Scene.DumpAssetsToFile boolean. 2013-02-06 02:21:17 +00:00
Justin Clark-Casey (justincc) 2ce8a050e4 Remove very long unused IScriptHost and NullScriptHost 2013-02-06 02:15:54 +00:00
Justin Clark-Casey (justincc) 9ebad38c34 Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region.Framework.dll
I believe this predates the generic system of registering interfaces and is very long unused.
2013-02-06 02:08:44 +00:00
Justin Clark-Casey (justincc) dfe5826f9f Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would return the item ID instead of the asset ID if the identifier was a uuid that matched an inventory item name.
This would practically never happen.
This makes this overloaded version of the function consistent with the other version.
It looks like this accidentally came over in commit c5af16a from Tue Oct 16 12:40:21 2012
However, there's arguably a case for looking for an item name that matches a UUID before assuming that the identifier is already an asset ID.
2013-02-06 01:49:32 +00:00
Justin Clark-Casey (justincc) eddfed3812 Allow JsonReadNotecard() to accept the name of the notecard as well as the asset ID.
Agreed in discussion with cmickeyb.
This is to make this consistent with similar existing LSL/OSSL functions such as llTriggerSound() and osNpcLoadAppearance() that allow an item name or an asset id.
2013-02-06 01:37:22 +00:00
Justin Clark-Casey (justincc) 0d4df99d04 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-06 01:35:25 +00:00
Robert Adams 3646361279 BulletSim: make removing zero width triangles from meshes optional
and, for the moment, default to 'off'.
2013-02-05 17:19:55 -08:00
Justin Clark-Casey (justincc) 5c94346bd7 refactor: Move functions that lookup asset ids from task inventory or pass them through to ScriptUtils class in OpenSim.Region.Framework.dll
Renames functions to better reflect what they do.
This is so that code registering with modInvoke() can reuse this code to provide functions that behave in a consistent manner with existing LSL/OSSL functions.
2013-02-06 01:17:19 +00:00
Robert Adams dce9e323f4 BulletSim: remove degenerate triangles from meshes. This fixes the
invisible barriers in sculptie doorways (Mantis 6529).
Bump up level-of-detail for physical meshes to 32 (the max). This
fixes the invisible barriers that showed up in prim cut arches.
NOTE: the default LOD values are removed from OpenSimDefaults.ini.
   If you don't change your OpenSimDefaults.ini, you will continue
   to see the arch problem.
2013-02-05 16:56:33 -08:00
Robert Adams 13233da66c BulletSim: add debugging looking for doorway sculpty problems 2013-02-05 16:56:28 -08:00
Robert Adams ad438ee59f BulletSim: rework some parameter setting implementation moving functionality that was in BSScene to BSParam. Remove unused parameters that were passed to the unmanaged code. Update DLLs and SOs for the new param block. 2013-02-05 16:56:23 -08:00
Robert Adams 2b6d226911 BulletSim: correct angular vertical attraction to properly correct an upside down vehicle. 2013-02-05 16:56:17 -08:00
Diva Canto 4cdee3dd3c Changed protection of CreateDefaultAppearanceEntries to protected, so extensions of the UserAccountService can reuse this. 2013-02-05 16:28:25 -08:00
teravus 2104e4d4d4 * the root prim was being given an OffsetPosition in addition to setting the position when creating the root prim. The offset position caused the positioning code to re-move the root prim when you selected it and released it. 2013-02-05 18:46:02 -05:00
teravus 1dc09d8e8f We're not really done here.. but we're getting there. Socket Read is working.. Still have to do Header.ToBytes and compose a websocket frame with a payload. 2013-02-05 18:02:25 -05:00
Melanie 6bce4bc112 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-02-05 20:09:45 +00:00
Melanie 2163bebeb4 Try to fix uploaded mesh rotations - code from Avination code base. 2013-02-05 20:09:02 +00:00
Justin Clark-Casey (justincc) 562067eb16 Fix bug where viewers would not see the "Module command functions not enabled" error if these were disabled and a viewer attempted to call one.
This was not working because the shouter was wrongly signalled as an agent rather than a prim
2013-02-05 02:09:21 +00:00
Justin Clark-Casey (justincc) 1fc9f282fa Merge branch 'dynamic-attributes2' 2013-02-05 00:35:15 +00:00
Justin Clark-Casey (justincc) 1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.6
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
2013-02-05 00:23:17 +00:00
teravus ee4f8ac193 Merge branch 'master' into JSONTCPClient 2013-02-03 08:18:53 -05:00
teravus 8fd99ecab1 Merge branch 'master' of ssh://opensim/var/git/opensim 2013-02-03 08:14:47 -05:00
teravus 6b0310b829 Adds the ability to load more then one IClientNetworkServer thereby allowing additional client network servers at the same time. Use comma separated values in clientstack_plugin in your config. Additional plugins lying around shouldn't be picked up because the loader only loads configured dll assemblies and breaks at the first IClientNetworkServer found in the assembly. (the only new functionality is the ability to specify more in config). Note: The existing functionality also passes in a nini config.. and has a boolean to determine if the client network server should be initialized for a specific scene. 2013-02-03 08:13:52 -05:00
teravus d18fbb98b7 Adds the ability to load more then one IClientNetworkServer thereby allowing additional client stacks. Use comma separated values in clientstack_plugin in your config. 2013-02-03 07:44:45 -05:00
teravus 27a0b3ecbd Commit 1 in of this branch feature. This is one of many... 2013-02-03 06:49:17 -05:00
BlueWall 219a25c985 Merge /home/opensim/src/opensim 2013-02-01 23:14:19 -05:00
BlueWall 0ab68f6c31 Revert "Update assembly version numbers"
This reverts commit 141ad829f4.
2013-02-01 23:13:33 -05:00
BlueWall 840f72f8a8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-01 22:07:08 -05:00
Justin Clark-Casey (justincc) 0d0bfa4dcd minor: change comment about assuming script references are textures in UuidGatherer since this is no longer the behaviour. 2013-02-02 03:02:04 +00:00
BlueWall 57cf89f4a9 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-01 21:58:32 -05:00
BlueWall 141ad829f4 Update assembly version numbers 2013-02-01 21:57:49 -05:00
Justin Clark-Casey (justincc) 9822bb664b Log missing assets on "fcache assets" found. This ignores references found by scanning LSL/notecard files since these are the source of false positives.
This also changes UuidGatherer to reutn an AssetType.Unknown for embedded script/lsl references instead of Texture, since these are often not textures.
This is added to help people in determining when they have missing assets such as textures, etc.
In this case, one wants to run "fcache clear" first.
2013-02-02 02:57:38 +00:00
Justin Clark-Casey (justincc) 2ff301ca11 Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom 2013-02-02 01:34:49 +00:00
Justin Clark-Casey (justincc) 9588328242 Stop exceptions being thrown if GenerateMapTiles = false but no static map tile has been set. Do more informative warn instead. 2013-02-02 00:59:26 +00:00
teravus d8d4e7f236 Sit and Spin reduction. If sitting, slam avatar angular velocity to zero. 2013-02-01 15:42:24 -05:00
Robert Adams 5bb85a14d4 BulletSim: fix problem where editting a physical linkset caused the
child prim physical positions to get out of sync with the view.
More reliably compute the offset of children in a physical linkset.
2013-02-01 11:52:27 -08:00
Robert Adams 75a05c16c5 BulletSim: fix crash caused when linksets were rebuilt. A problem added
when individual child pos/rot changes were implementated a week or so ago.
Remove some passing of inTaintTime flag when it was never false.
2013-01-31 15:56:10 -08:00
Robert Adams ed71c939fc BulletSim: make sure vehicle physical properties are set when going
physical by delaying setting until pre-step time. Change vehicle.Refresh()
to schedule the pre-step setting.
Comments and updating of TODO list.
2013-01-31 15:56:02 -08:00
Robert Adams 371449db2f BulletSim: clean up TargetVelocity implementation by using the default defn in the PhysicsActor base class. 2013-01-31 15:55:53 -08:00
Mic Bowman f984922dfd Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-01-31 14:54:19 -08:00
Mic Bowman 1e0420431f Move the JsonStore regular expressions to static variables to avoid
recompiling on every operation. Added JsonList2Path script function
to simplify array iteration.
2013-01-31 14:53:16 -08:00
Melanie 6a4c8824ea Whitespace fix and removing unneccessary parentheses 2013-01-31 20:46:41 +00:00
Dan Lake b659ccfc80 Merge branch 'master' of git://opensimulator.org/git/opensim 2013-01-31 11:15:22 -08:00
Dan Lake 17440d8a29 Added option for UUID as command parameters. This lets the command handle the UUID parsing and type checking before the command is executed. 2013-01-31 11:14:43 -08:00
BlueWall a8fa8af9fc Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-01-30 23:44:06 -05:00
Jak Daniels fac72d540b Allow use of MaptileStaticUUID in Regions.ini to override the global setting in OpenSim.ini for each region.
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2013-01-30 23:37:02 -05:00
Mic Bowman a0ef3df194 Add JsonTestStore to determine if a JsonStore is associated with
a particular UUID.
2013-01-30 14:45:03 -08:00
teravus 52ea6eadae * This adds a bit more to the previous flying roll effect by adding additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback. 2013-01-30 07:34:48 -05:00
teravus 7c4e0ff03c * Adds a satisfying angular roll when an avatar is flying and turning. (General, not physics). Makes flying not feel as stiff. 2013-01-30 06:22:05 -05:00
Justin Clark-Casey (justincc) d42c7afe3f Add JsonDestroyStore() basic regression test 2013-01-30 05:56:30 +00:00
Justin Clark-Casey (justincc) 5a22efe69c refactor: Make invocations of json store functions from the regression test simpler 2013-01-30 05:49:28 +00:00
Justin Clark-Casey (justincc) addf9ada49 Add regression test for script func JsonRemoveValue() 2013-01-30 05:39:34 +00:00
Justin Clark-Casey (justincc) 5ac84a3793 Fix issue where lsl -> c# generation in co-operative termination mode did not correctly handle single statement versions of for, while and do-while loops.
Add regression tests to validate the fix.
This problem will not affect the default abort termination mode.
2013-01-30 03:52:22 +00:00
Robert Adams a61ecee227 BulletSim: fix physics repositioning when under ground to only happen
for physical objects. Non-physical objects can go anywhere they want.
2013-01-29 17:04:28 -08:00
Justin Clark-Casey (justincc) 39700445f2 minor: change name of json script tests to JsonStoreScriptModuleTests instead of copy/pasted LSL_ApiInventoryTests 2013-01-29 04:36:41 +00:00
Justin Clark-Casey (justincc) ccdf86c737 minor: remove EnableLogging() left over in CoopTerminationTests 2013-01-29 04:35:05 +00:00
Justin Clark-Casey (justincc) e0f4e91d22 Try ignoring json tests if they can't be run due to being on <=.net 3.5 2013-01-29 04:26:47 +00:00
Justin Clark-Casey (justincc) fd34a75cde minor: Tidy up disabled logging on AssetTransactionModule for future use. Make it clear that transaction parameter to HandleUDPUploadRequest is an ID. 2013-01-29 04:03:33 +00:00
Justin Clark-Casey (justincc) 77cd74ded6 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-01-29 03:59:38 +00:00
Justin Clark-Casey (justincc) ca26ff9436 minor: remove some mono compile warnings in XEngine.cs 2013-01-29 03:58:11 +00:00
Robert Adams 47f09ed4c1 BulletSim: enable angular vertical attraction.
Increase terrain collision margin to help vehicles from tunneling
into same.
2013-01-28 17:21:13 -08:00
Robert Adams 531d0429d1 BulletSim: first unit test: vehicle angular attraction 2013-01-28 17:08:34 -08:00
Robert Adams e9aff0a91d BulletSim: do not zero an avatar's standing velocity if it is standing
on a moving object.
Rearrange pre/post action subscription code to put more in locks.
Add meshmerizer params to BulletSimTestUtil scene creation (and fix line endings).
Rebuilt version of DLLs and SOs with cleaned up code and no profiling for sure.
2013-01-28 15:11:50 -08:00
Robert Adams e4c6a19940 BulletSim: rename 'uint' to 'UInt32' to make clear the type that is passed to unmanaged code. 2013-01-28 15:11:20 -08:00
Robert Adams f6380a3ad3 BulletSim: fix the trimming of colliders so only the top 25 are returned. 2013-01-28 09:02:01 -08:00
Robert Adams b546af9ac2 BulletSim: simplify the initialization of some of the parameters.
Disable vertical attraction for vehicles by default (for the moment).
Fix bug where vehicle would go crazy when velocity got above a
   certain speed.
2013-01-27 12:50:07 -08:00
Robert Adams 26d4596080 BulletSim: reinstate the supression of rotational velocity for vehicles 2013-01-27 12:50:07 -08:00
Robert Adams a345a2feb7 BulletSim: add framework for BulletSim unit tests. No tests yet. 2013-01-27 12:50:06 -08:00
Robert Adams 05adf4b30f BulletSim: disable center-of-mass computation because it does not work yet 2013-01-27 12:50:06 -08:00
Robert Adams 80f0a978db BulletSim: fix compile error from last commit 2013-01-27 12:50:06 -08:00
Robert Adams 36f401d850 BulletSim: parameterize the value for gravity reduction for ground vehicles on the ground. Set defaults for vehicle factors to one. Debug logging changes. 2013-01-27 12:50:05 -08:00
Robert Adams ddef8f16e5 BulletSim: first attempt at reporting top colliders 2013-01-27 12:50:05 -08:00
Robert Adams dd08e1fba6 BulletSim: parameterize several vehicle debugging values: physical linear and angular force factors now default to less than 1 (0.2) vehicle friction and restitution now default to low values 2013-01-27 12:50:05 -08:00
Robert Adams c44a8e9f92 BulletSim: finish the post step event for physical object actions. Modify vehicle to use post step event for logging. 2013-01-27 12:50:04 -08:00
Melanie 776cc33541 Prevent items being destroyed by rename operations. Renaming of a wearable also
sends an asset transaciton but it is empty. So we can't ignore name data
when a transaction is present and can't treat every transaction as valid.

Conflicts:

	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2013-01-27 01:07:37 +00:00
Justin Clark-Casey (justincc) b0cff35d96 Fix issue where the "set terrain texture" console command did not tell the viewers that textures had updated (hence they did not display the changes).
Addresses http://opensimulator.org/mantis/view.php?id=6513
2013-01-26 04:27:01 +00:00
Justin Clark-Casey (justincc) 53833babf9 Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so that these can be triggered by future code (not yet implemented).
Also hooks up moving_start and moving_end script events, eliminating itemID on XEngine EventManager methods since this is completely unused.
An adaptation of the patch in http://opensimulator.org/mantis/view.php?id=6515
Thanks Garmin Kawaguichi and Signpost Marv.
2013-01-26 03:57:51 +00:00
Justin Clark-Casey (justincc) 8ea112a5b2 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-01-26 02:58:10 +00:00
Talun ceabb1b49a Mantis 6343: Turn a prim to flexy to OFF don't work llSetPrimParams
Correction so that scripts can turn Flexi off as well as on.
2013-01-26 02:55:24 +00:00
teravus 5128ae7b86 * This adds llVolumeDetect functionality to the C# implementation of BulletSim. 2013-01-25 20:15:37 -05:00
Justin Clark-Casey (justincc) c3fb114461 minor: Fix full scene part console report to show proper Light* names rather than all wrongly FlexiDrag 2013-01-26 00:31:50 +00:00
Justin Clark-Casey (justincc) d6d6618f62 minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to disable any enabled logging from previous tests 2013-01-26 00:28:45 +00:00
Justin Clark-Casey (justincc) 7a139f8e53 Remove the accidental PrimShapes column that I added back to the SQLite region store 2013-01-25 04:35:06 +00:00
Justin Clark-Casey (justincc) 7789415148 Fix tests by adding DynAttrs add column commands to RegionStore.migrations (these were originally in 021_RegionStore.sql which I might have forgotton to add 2 years ago). 2013-01-25 04:22:32 +00:00
Oren Hurvitz 6daf559fb6 Added unit tests for Dynamic Attributes 2013-01-25 04:03:30 +00:00
Oren Hurvitz 23f0610f0c Disabled DAExampleModule 2013-01-25 04:03:28 +00:00
Oren Hurvitz af6a7cf95d Added DynAttrs to the serialized XML format of prims. When copying prims, use deep copy for DynAttrs. 2013-01-25 04:03:26 +00:00
Oren Hurvitz 86802bcf93 Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic attributes 2013-01-25 04:03:24 +00:00
Oren Hurvitz fdec05a15e Stopped storing dynamic attributes in the PrimShape 2013-01-25 04:03:20 +00:00
Oren Hurvitz 8b4441d940 Changed DAMap to be the container of "data stores", which are OSDMaps. Store names must have at least 4 characters. 2013-01-25 04:03:18 +00:00
Oren Hurvitz 918b062866 Added missing DynAttrs references in MySQL 2013-01-25 04:03:15 +00:00
Justin Clark-Casey (justincc) 1650846df3 Lock DAMap rather than encapsulated OSDMap
This allows external lockers to preserve atomicity of dynamic attribute changes
2013-01-25 04:03:13 +00:00
Justin Clark-Casey (justincc) a6d9c26365 Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting from it
This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
2013-01-25 04:03:11 +00:00
Justin Clark-Casey (justincc) a3e1e6dd61 Implement dynamic attribute persistence on mysql and mssql
mssql is untested
2013-01-25 04:03:09 +00:00
Justin Clark-Casey (justincc) d3095e2649 Add DAExampleModule to demonstrate dynamic attributes
This module demonstrates that we can add an arbitrary persisted value to SOP without any changes to core code.
Every time the object is moved, the move record is updated and the users in the scene alerted
The number of moves is persisted over server restarts in sqlite
2013-01-25 04:03:07 +00:00
Justin Clark-Casey (justincc) 1bd0b06ec1 Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLite 2013-01-25 04:03:04 +00:00
Justin Clark-Casey (justincc) d977bb77cb Disable json tests for now - I see this is failing on jenkins because mono 2.4.3 doesn't have Funcs >5 params, though mono 2.6 onwards does.
Standardize logging in JsonStoreScriptModule and some minor code formatting.
2013-01-25 03:19:56 +00:00
Justin Clark-Casey (justincc) 614d4eda3e See if getting the registering JsonReadNotecard with MethodInfo works around an apparent issue with registering methods with more than 5 parameters on mono 2.4.3 2013-01-25 03:02:08 +00:00
Justin Clark-Casey (justincc) 4f52acaa83 Increase logging by enabling during test setup rather than during individual tests of for JsonStore 2013-01-25 02:32:38 +00:00
Justin Clark-Casey (justincc) 8c68451856 Enable logging in new json store tests to find out why they fail on jenkins but not locally. 2013-01-25 02:22:24 +00:00
Justin Clark-Casey (justincc) 844e60da0f Add JsonTestPath() regression test 2013-01-25 02:12:28 +00:00
Justin Clark-Casey (justincc) f32361d595 Add regression test for JsonSetValue() 2013-01-25 02:08:33 +00:00
Justin Clark-Casey (justincc) b914fb98c4 minor: remove mono compiler warning in SceneCommandsModule 2013-01-25 01:56:41 +00:00
Justin Clark-Casey (justincc) ba369c5cfe Add basic JsonGetValue() regression test. 2013-01-25 01:55:27 +00:00
Justin Clark-Casey (justincc) f557d7e828 Add basic JsonCreateStore() regression test 2013-01-25 01:48:31 +00:00
Robert Adams 6a5d088197 BulletSim: reduce the force of gravity on ground vehicles when they
are on the ground. Makes them a little more stable.
2013-01-24 16:26:04 -08:00
Robert Adams a2a32fc844 BulletSim: reduce the zeroing threshold for rotational velocity.
Sometimes settling of a vehicle from gravity introduces small
velocities that need to be kept.
2013-01-24 14:36:00 -08:00
Robert Adams 591faac3ac BulletSim: disable CCD (continuious collision detection) and
contact processing threshold since the first didn't solve tunneling
problems but used resources and the latter caused instabilities.
2013-01-24 14:35:42 -08:00
Robert Adams 2cf29c87bc BulletSim: zero motion on an object that we pop up because it is
below terrain. If the position is being corrected because it is out
of bounds, all other movement rules are out the window.
2013-01-24 14:35:23 -08:00
Robert Adams 3ecfddd791 BulletSim: remove exception that can happen when setting physics parameters from the console. 2013-01-24 14:35:05 -08:00
Talun 71f7bfc2ff Mantis 6508 llHTTPResponse body is incorrectly interpreted by IE
This patch html escapes responses going to IE so that they cannot be
interpreted as HTML if the response type is "text/plain". This has no
effect if the reponse type has been set to "text/html" by
osSetContentType

Signed-off-by: nebadon <michael@osgrid.org>
2013-01-24 14:48:20 -07:00
Robert Adams 427ab219b8 Add JSONification of WebStats module. Adds a '?json' query parameter
to the fetch URL to return the data in JSON format. Also adds a simple
'sim.html' that uses JavaScript to display the JSON data. Not pretty
but an example.
2013-01-24 10:44:57 -08:00
teravus d5b950633d * Added in the manifold point dept on collision desc. In BulletSim engine BulletXNA. 2013-01-24 07:36:24 -05:00
teravus ba9d6b7337 * Repairs the Object updates, Collision updates, and Child Prim methods making the bulletXNA engine work again.
* The only thing that had an issue was when creating a new RigidBody, BulletXNA didn't know the type SimMotionState and the upcast type is unknown in the constructor.   Therefore, I had to update the IMotionState with a new method 'SetBody'.    All of the duplicated type information has been removed and BulletXNA is not relying on any non-standard types external to the library.
2013-01-24 07:11:32 -05:00
teravus 878df52515 * This makes the non-physics llCastRay 'better'. It's not 'correctly working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray. 2013-01-23 21:58:51 -05:00
Justin Clark-Casey (justincc) f7feed4d44 Remove unnecessary System.Linq reference from Compiler.cs
Hopefully will fix windows build via compile.bat
2013-01-24 01:11:04 +00:00
Justin Clark-Casey (justincc) b775761104 Disable the not very useful infinite recursion co-op termination tests for now as they appear to cause failures with testing in jenkins.
These tests are not very useful anyway as they never actually get a chance to try termination before the script runs out of stack
2013-01-24 00:31:42 +00:00
Justin Clark-Casey (justincc) 957cea59a0 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-01-24 00:24:13 +00:00
Justin Clark-Casey (justincc) 1a610f30d8 Fix mono 2.4.3 build break by using CreateInstanceAndUnwrap 9 method call deprecated in later .net versions 2013-01-24 00:23:12 +00:00
Robert Adams 5b334079e0 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-01-23 16:23:11 -08:00
Robert Adams 1c3d84fe03 BulletSim: pass up and report the real collision penetration. 2013-01-23 16:20:44 -08:00
Justin Clark-Casey (justincc) 55c6753b13 Merge branch 'master' into cooptermination 2013-01-24 00:03:44 +00:00
Justin Clark-Casey (justincc) 8a22ac3f94 Pass narrower WaitHandle rather than EventWaitHandle as co-op termination wait handle to script APIs.
APIs don't need to reference any methods on EventWaitHandle
2013-01-23 23:38:08 +00:00
Justin Clark-Casey (justincc) 72dd3633ee Improve logging by making it clearer which script is failing if an assembly fails to load.
Moves the noise co-op start/stop debug log messages to only display if xengine debug level >= 1
Logs which stop strategy is being used (abort or co-op)
Adjusts some other logging to remove not very useful stuff
2013-01-23 23:34:15 +00:00
Robert Adams a7b810ddee BulletSim: remove setting of vehicle InterpolationRotationalVelocity.
This doesn't seem to help the vehicle stability.
Rename vehicle internal variables adding a "V" or "W" so it is clear
when coordinates are vehicle or world relative.
2013-01-23 14:25:42 -08:00
Robert Adams 13182904da BulletSim: small change to center-of-mass computation left out last commit 2013-01-23 14:25:30 -08:00
Robert Adams a5e9c665f0 BulletSim: center-of-gravity linkset changes. Not working yet.
Conflicts:

	OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
2013-01-23 14:25:18 -08:00
Robert Adams c1371ab786 BulletSim: working on COM 2013-01-23 14:25:06 -08:00
Robert Adams 775fd6f8cc BulletSim: fix build break introduced by previous commit 2013-01-23 14:24:54 -08:00
Robert Adams a0d460e6bf BulletSim: remove the unused RestoreBodyDependencies used by linksets
and vehicles and clean up code by removing their kludgyness.
2013-01-23 14:24:42 -08:00
Melanie c1795ed399 Add the Avination physics raycast glue so Core Physics can implement raycast 2013-01-23 21:03:24 +00:00
Melanie 6a2b673fca Remove the return value from llGiveMoney and add llTransferLindenDollars. Also
make llGiveMoney async so the script thread is not held up waiting for comms
to an external server.
2013-01-23 19:45:36 +00:00
BlueWall 2841ed05cf Merge branch 'master' of /home/opensim/var/repo/opensim 2013-01-23 08:16:18 -05:00
BlueWall 1776986dc3 Add additional return status
Adding additional return status for JsonRpcMethod. Now returns true/false
2013-01-23 08:14:21 -05:00
Justin Clark-Casey (justincc) cf168194e5 If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then continue to generate C# that is functionality identical to historical generation
This is to eliminate disruption until co-op termination has been well-tested.
In non co-op mode, XEngine will continue to load DLLs of the existing Script class and the new XEngineScript class.
Moving to co-op mode still requires existing script DLL deletion to force recompilation, either manually or by setting DeleteScriptsOnStartup = true for one run.
This change also means that scripts which fail to initialize do not still show up as running scripts.
2013-01-23 02:36:43 +00:00
Robert Adams 80b1e32bfa BulletSim: Tweeks to vehicle motion.
Pass through old angular velocity making for smoother transitions.
Remove some old kludges for angular motion (damping and rotvel suppression).
2013-01-21 23:43:24 -08:00
Justin Clark-Casey (justincc) 9a4914e58c Add co-op termination regression test for infinite recursive manual call on event function.
Such code would normally terminate quickly with a stack overflow exception anyway.
2013-01-22 02:32:40 +00:00
Justin Clark-Casey (justincc) 0727784186 Set script delay factor to 0 in co-op termination tests
This is to ensure loops aren't actually terminating from a wait on an LSL function.
This was not the case with any of the existing tests.
2013-01-22 02:26:04 +00:00
Justin Clark-Casey (justincc) 679dc811dd Add regression test for co-op termination on infinite user function call regression.
Such a script would probably run out of stack pretty quickly anyway.
2013-01-22 02:22:58 +00:00
Justin Clark-Casey (justincc) b93e8020e2 Add regression test for co-op stop of an infinite jump loop
Also fixes bug in do-while test
Improves detection of failure due to invalid script in test
Sets up xengine anew for each test rather than once for the while testsuite to improve isolation between tests.
Stop listening for chat after the first 'script is running' chat is received to reduce test run time.
2013-01-22 02:16:10 +00:00
Justin Clark-Casey (justincc) cf0b5e4f27 Add do-while co-op termination test
Minor changes to scripts in other tests.
2013-01-22 01:53:10 +00:00
Justin Clark-Casey (justincc) fbdfe43d75 Add single and comound while loop co-op termination test 2013-01-22 01:40:18 +00:00
Justin Clark-Casey (justincc) c6ba27d096 Fix bug in generating termination checks in compound statement for loop.
Add regression test for this case.
2013-01-22 01:23:10 +00:00
Justin Clark-Casey (justincc) a558f9797d factor out common code in existing co-op termination regression tests 2013-01-22 01:13:45 +00:00
Justin Clark-Casey (justincc) 419f8e0f76 Increase WaitForEventCompletionOnScriptStop to 120 secs to show that the co-op setting is active in its regression tests. 2013-01-22 01:08:24 +00:00
Justin Clark-Casey (justincc) 1730de14a4 minor: comment out Console.WriteLine debugging message in XEngine 2013-01-22 01:00:53 +00:00
Justin Clark-Casey (justincc) cd446c32d6 Add regression test TestStopOnLongForLoop() 2013-01-22 00:59:46 +00:00
Justin Clark-Casey (justincc) 49d674c74d refactor: rename XEngineTest to more descriptive XEngineBasicTests 2013-01-22 00:35:56 +00:00
Robert Adams 471c477863 BulletSim: allow changing position and rotation of a child of a linkset
without rebuilding the whole compound shape. Should make vehicles move
smoother.
2013-01-21 15:58:22 -08:00