Commit Graph

22903 Commits (ee18db027c67d3ea9b905f4d07bd5a2ec8fdf65f)

Author SHA1 Message Date
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
Robert Adams 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
Robert Adams 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
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
Melanie 12971e73d4 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
2013-02-08 23:29:47 +00: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
Melanie 8a2604f17e Merge branch 'master' into careminster 2013-02-08 00:48:37 +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 8008938550 Actually plumb the new values to physics. 2013-02-07 23:36:23 +00:00