Commit Graph

23128 Commits (c341664c1b8ccf3bd7b81795b900b971a15ff318)

Author SHA1 Message Date
Mic Bowman 708c3f8b86 Make path parsing more robust in the JsonStore. 2013-02-12 23:21:49 -08:00
Melanie d0c5e0990b Merge branch 'master' into careminster 2013-02-13 01:54:06 +00:00
Melanie d652de1d0e Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-02-13 01:53:29 +00:00
Melanie 43fecdcc12 Merge branch 'master' into careminster 2013-02-13 01:53:00 +00:00
Melanie c2bfdaa026 Make the sim features module register it's interface so it can be used 2013-02-13 01:52:25 +00:00
Justin Clark-Casey (justincc) 5557b523fd Add more sub-tests to TestJsonSetValue for paths containing []{} without {} delineation.
As expected, values are not set and the set call returns FALSE (0).
As a reminder, these tests are not currently running on jenkins continuous integration as the functionality is only available on .net 4 (mono 2.8 and later).
2013-02-13 01:38:33 +00:00
Justin Clark-Casey (justincc) b1a165a39a Extend JsonTestSetValue() with tests for escaping brackets, periods and unbalanced braces from paths
The sub-tests that are commented out are currently those which fail unexpectedly based on my understanding of the path syntax
2013-02-13 01:25:30 +00:00
Justin Clark-Casey (justincc) 70e641c708 Add test for array as root element in TestJsonCreateStore() 2013-02-13 00:51:45 +00:00
Justin Clark-Casey (justincc) 3e9f3c0383 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-13 00:34:08 +00:00
Justin Clark-Casey (justincc) 4b797f2ead Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arrays 2013-02-13 00:12:20 +00:00
Robert Adams 0194a3d890 BulletSim: fix density since the simulator/viewer track density in a
funny unit that is 100 times real density (default 1000).
Fix avatar drifting slowly when stationary flying.
Fix for physical prims getting corrected for being under terrain when it was
just its geometric center that was below terrain.
Add PreUpdatePropertyAction allowing plugable modifiction of phys
parameters returned from Bullet.
Fix an exception setting GravityMultiplier on initialization.
Update DLLs and SOs for good measure (no functional change).
2013-02-12 15:52:10 -08:00
Robert Adams fb903ff490 BulletSim: More work on center-of-mass. Remove linksetinfo and rely on simulator to update info. 2013-02-12 15:52:08 -08:00
Melanie 467e8d56b5 Merge branch 'master' into careminster 2013-02-12 23:21:26 +00:00
Justin Clark-Casey (justincc) 992ef9e971 Extend TestJsonCreateStore() with a one key input and an input with raw number values 2013-02-12 23:00:24 +00:00
Diva Canto aaa80d11a8 Replaced Ionic.Zip.dll with a new one that fixes a bug in it. DotNetZip (from which Ionic.Zip.dll is derived) is now a fork in opensim-libs, forked from 1.9.1.8 and added that simple bug fix. 2013-02-12 14:47:26 -08:00
Justin Clark-Casey (justincc) 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
Melanie d5b401a478 Revert "Make keyframes use the sim's frame timer"
This reverts commit e85a6237bf.
2013-02-12 22:20:16 +01:00
Justin Clark-Casey (justincc) 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
Mic Bowman 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
Mic Bowman 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
Melanie 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
Melanie 2065590232 Revert "Use actual time dilation for unqueued updates"
This reverts commit 048e904f05.
2013-02-12 03:15:32 +01:00
Justin Clark-Casey (justincc) 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
Melanie 048e904f05 Use actual time dilation for unqueued updates 2013-02-12 01:13:30 +01:00
Melanie 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
Justin Clark-Casey (justincc) d55974bcb7 Add regression TestJsonGetValueJson() 2013-02-11 23:47:49 +00:00
Justin Clark-Casey (justincc) 6924bd21f4 Add regression TestJsonTestPathJson() 2013-02-11 23:10:07 +00:00
Justin Clark-Casey (justincc) 9d001e40e7 Add section to TestJsonGetValue() to test call on a sub-tree 2013-02-11 22:56:43 +00:00
Melanie e85a6237bf Make keyframes use the sim's frame timer 2013-02-11 23:49:05 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) c72c189864 Add test to try reading notecard into an invalid path in TestJsonReadNotecard() regression test 2013-02-11 22:16:07 +00:00
Melanie e31bc8dc96 Refactor KeyframeMotion to use one timer class per scene 2013-02-11 23:07:04 +01:00
Melanie 12f732fd3f Merge branch 'master' into careminster 2013-02-10 20:01:51 +00:00
Melanie 6f3dcf58b8 Fix code to check for no spawn points. Possibly a merge artefact? 2013-02-10 20:00:39 +00:00
BlueWall 38b476d9d6 Adding contributor to credits: Welcome Allen Kerensky! 2013-02-10 14:17:02 -05:00
Allen Kerensky 7524bd5a7c Additional ThreadPool worker and IOCP thread startup logic
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2013-02-10 14:14:33 -05:00
BlueWall 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
Melanie 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
Mic Bowman 0a297a0e52 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-08 22:43:56 -08:00
Mic Bowman 7bb82c8f2e Make JsonStore path parsing more robust. Should fix the
invalid path problem.
2013-02-08 22:43:15 -08:00
Oren Hurvitz 745ef40153 Fixed ReadSculptData(): the check whether there are enough bytes to read was incorrect 2013-02-09 02:04:26 +00:00
Oren Hurvitz ae701eccd2 Fixed check for 0 results in GetUserAccounts() 2013-02-09 01:57:36 +00:00
Justin Clark-Casey (justincc) 6935bec0ab Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-09 01:11:41 +00:00
Justin Clark-Casey (justincc) a8bc08ebe6 Change TestDestroyStore() and TestJsonRemoveValue() to reflect the fact that the return values have changed. 2013-02-09 01:10:53 +00:00
Oren Hurvitz 85b81ff7f2 Added physics parameters support to MSSQL and SQLite (not tested) 2013-02-09 01:03:58 +00:00
Robert Adams 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
Robert Adams 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
Robert Adams 1b55a9d81e BulletSim: fix avatar bobbing or jiggling while stationary flying.
Various comments and debugging message mods.
2013-02-08 16:29:40 -08:00
Robert Adams 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