a82bd5678e
Use an integer when specifying the XWorkItem wait rather than a TimeSpan to avoid a Windows casting issue in SmartThreadPool for large TimeSpans.
...
TimeSpan.Milliseconds is an int64. However, STP casts this to an int (32-bit).
If TimeSpan.MaxValue is given then the casting results in an invalid value for the SDK WaitHandle.WaitAll() call.
This was causing the co-op script termination regression tests to fail on Windows but not Mono 2.10.8 (which is perhaps not strict in the negative values that it accepts).
Solution here is to use the int millisecondsTimeout STP call rather than the TimeSpan one.
This also allows us to more clearly specify Timeout.Infinite rather than TimeSpan.MaxValue
Thanks to Teravus for this spot.
2013-02-12 21:34:12 +00:00
d5b401a478
Revert "Make keyframes use the sim's frame timer"
...
This reverts commit e85a6237bf
2013-02-12 22:20:16 +01:00
058d477ce7
Re-enable subtest for single quoted token in TestJsonSetValueJson()
...
This is in response to the resolution of http://opensimulator.org/mantis/view.php?id=6540
2013-02-12 20:51:36 +00:00
4b8c22ecfa
Adds the parameter for OSD serialization to encode default values. This
...
makes the JsonStore get/set operations symmetric.
2013-02-12 11:10:17 -08:00
d3b2cdc2b4
Fix handling of string values in JsonSetValueJson(). There are
...
some oddities with empty strings: the Json serializer treats them
as default values and does not return them in serialized hashes.
2013-02-11 19:55:10 -08:00
14c064c65d
Revert "Push updates from keyframe directly to the front of the output queue rather"
...
This reverts commit 04235e58e8
2013-02-12 03:15:40 +01:00
2065590232
Revert "Use actual time dilation for unqueued updates"
...
This reverts commit 048e904f05
2013-02-12 03:15:32 +01:00
586def0bcc
Add regression TestJsonSetValueJson()
...
The part to test setting of single leaf-node string tokens is currently commented out.
See http://opensimulator.org/mantis/view.php?id=6540
2013-02-12 01:27:38 +00:00
048e904f05
Use actual time dilation for unqueued updates
2013-02-12 01:13:30 +01:00
04235e58e8
Push updates from keyframe directly to the front of the output queue rather
...
than through the update system.
2013-02-12 01:02:16 +01:00
d55974bcb7
Add regression TestJsonGetValueJson()
2013-02-11 23:47:49 +00:00
6924bd21f4
Add regression TestJsonTestPathJson()
2013-02-11 23:10:07 +00:00
9d001e40e7
Add section to TestJsonGetValue() to test call on a sub-tree
2013-02-11 22:56:43 +00:00
e85a6237bf
Make keyframes use the sim's frame timer
2013-02-11 23:49:05 +01:00
8fcfd82241
Extend TestJsonTestPath() for non-terminating section of path (i.e. one that does not point to a value/leaf)
2013-02-11 22:44:25 +00:00
cbb8d82c7d
Add section to TestJsonSetValue() to test attempted set of value where the penultimate section of path does not exist
2013-02-11 22:28:50 +00:00
c72c189864
Add test to try reading notecard into an invalid path in TestJsonReadNotecard() regression test
2013-02-11 22:16:07 +00:00
e31bc8dc96
Refactor KeyframeMotion to use one timer class per scene
2013-02-11 23:07:04 +01:00
12f732fd3f
Merge branch 'master' into careminster
2013-02-10 20:01:51 +00:00
6f3dcf58b8
Fix code to check for no spawn points. Possibly a merge artefact?
2013-02-10 20:00:39 +00:00
38b476d9d6
Adding contributor to credits: Welcome Allen Kerensky!
2013-02-10 14:17:02 -05:00
7524bd5a7c
Additional ThreadPool worker and IOCP thread startup logic
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2013-02-10 14:14:33 -05:00
adedd70c35
Fix teleport/telehub issue:
...
Fix bug that allowed only login access to regions with mis-configured telehubs. Administrators now have teleport access when there exists a mis-configured telehub in the region. Estate owners are now placed at region center in the absence of spawnpoints instead of being denied access. Grid Gods are unrestricted. All others are denied access to the region until spawnpoints are assigned to the telehub object.
2013-02-10 13:01:33 -05:00
069e587841
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
2013-02-10 00:17:14 +00:00
0a297a0e52
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-08 22:43:56 -08:00
7bb82c8f2e
Make JsonStore path parsing more robust. Should fix the
...
invalid path problem.
2013-02-08 22:43:15 -08:00
745ef40153
Fixed ReadSculptData(): the check whether there are enough bytes to read was incorrect
2013-02-09 02:04:26 +00:00
ae701eccd2
Fixed check for 0 results in GetUserAccounts()
2013-02-09 01:57:36 +00:00
6935bec0ab
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-09 01:11:41 +00:00
a8bc08ebe6
Change TestDestroyStore() and TestJsonRemoveValue() to reflect the fact that the return values have changed.
2013-02-09 01:10:53 +00:00
85b81ff7f2
Added physics parameters support to MSSQL and SQLite (not tested)
2013-02-09 01:03:58 +00:00
4808b8ee38
BulletSim: add parameter to set global contact breaking threshold. Update DLLs and SOs for setting same.
2013-02-08 16:29:52 -08:00
222040f1ec
BulletSim: Change BSCharacter to use new base Density and Friction
...
variables rather than own local varaibles.
2013-02-08 16:29:45 -08:00
1b55a9d81e
BulletSim: fix avatar bobbing or jiggling while stationary flying.
...
Various comments and debugging message mods.
2013-02-08 16:29:40 -08:00
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
Justin Clark-Casey (justincc)