Commit Graph

19105 Commits (80c19b7cac52a57fd04966169c657400aeee3de8)

Author SHA1 Message Date
Diva Canto 4e846d55a8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-18 16:06:01 -08:00
Diva Canto 5e709b087c Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll 2013-02-18 15:44:00 -08:00
Justin Clark-Casey (justincc) 050ef1dc4e minor: Rename regression test method TestGetArrayLength() -> JsonTestGetArrayLength() to match others 2013-02-18 22:59:29 +00:00
Diva Canto 8b1b8a3921 I need these for OfflineIM and Groups. 2013-02-18 12:08:05 -08:00
Robert Adams 26421294f6 BulletSim: experimental lock axis code using constraints. Not enabled
by default. Like more debugging is needed.
2013-02-17 20:13:50 -08:00
Robert Adams 1d7276235a BulletSim: add calls for creating all the different Bullet constraint types.
Updated the DLLs and SOs and code for BulletXNA to create the types.
All the detailed control calls are not all in place yet.
2013-02-17 20:13:49 -08:00
Robert Adams 885b45b112 BulletSim: rework parameter setting for different types of values
(like vectors or quaternions).
2013-02-17 20:13:48 -08:00
teravus 6560d80fa8 * Fix walking to <NaN, NaN, NaN> via autopilot. 2013-02-16 22:54:37 -05:00
Robert Adams e549c2922a BulletSim: fix physical object appearing to slowly float off when
they stop moving.
2013-02-16 19:28:38 -08:00
Melanie 3108d18ffb Fix shape parameters sent for meshes tosupport the full number of faces 2013-02-16 05:44:41 +00:00
Justin Clark-Casey (justincc) 7d7736dc73 Separate IAR tests into separate files for load/save/loadpath tests 2013-02-16 01:57:42 +00:00
Justin Clark-Casey (justincc) d54d31807a Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.
Really "My Inventory" is just the name of the root, it isn't a folder in its own right.
This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /*
/* will still work and this is a special case just for the root
If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/*
Added a regression test for this case.
2013-02-16 00:50:52 +00:00
Justin Clark-Casey (justincc) 84de7e55e9 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-16 00:27:16 +00:00
Justin Clark-Casey (justincc) e9cc22fea4 Add regression test TestSaveNonRootFolderToIar 2013-02-16 00:26:21 +00:00
Dan Lake e09467b30d Merge branch 'master' of git://opensimulator.org/git/opensim 2013-02-14 20:06:22 -08:00
Dan Lake afeb5d4917 Use SortedDictionary in StatsManager instead of regular Dictionary so stats will interate and print in a defined order 2013-02-14 20:05:42 -08:00
Justin Clark-Casey (justincc) 8d5fe5c222 Enable one sub-test in TestJsonSetValue() which now works (using identifier with embedded .).
Need to look further at other still commented tests.
Still need to check coverage against some of Mic's scripts.
2013-02-15 01:00:49 +00:00
Justin Clark-Casey (justincc) 61f18d15e1 Rename JsonSetValueJson() -> JsonSetJson() and JsonGetValueJson() -> JsonGetJson()
This is because JsonGetJson() is getting json from anywhere in the structure, not just values.
Equally, JsonSetJson() is setting any type of json, not just json which represents a value.
Agreed with cmickeyb
2013-02-15 00:38:07 +00:00
Justin Clark-Casey (justincc) 0b2608d8f4 Comment out regression TestJsonTestPath and TestJsonTestPathJson as these will go away soon 2013-02-15 00:32:20 +00:00
Justin Clark-Casey (justincc) 30a60d661f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-15 00:28:00 +00:00
Justin Clark-Casey (justincc) cc40517863 Add regression TestJsonList2Path() 2013-02-15 00:27:30 +00:00
teravus 71862f34b6 * Handle null check on configs in module startup so that the the code can be run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement... 2013-02-14 18:52:11 -05:00
teravus c22276a169 * gracefully handle a Situation where a double close is called on the WebSocket handler 2013-02-14 18:43:53 -05:00
Justin Clark-Casey (justincc) 13d4f6f747 Add regression TestGetArrayLength() 2013-02-14 21:34:57 +00:00
Justin Clark-Casey (justincc) 6fe771f27e Add regression TestJsonGetPathType() 2013-02-14 21:31:34 +00:00
Justin Clark-Casey (justincc) 0ad07eb44d minor: remove some mono compiler warnings 2013-02-14 21:29:35 +00:00
Justin Clark-Casey (justincc) edb99dcc19 Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and JsonArrayLength() -> JsonGetArrayLength()
This is for consistentency with the verb:noun naming approach existing json script functions and other script functions.
Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions.
As agreed with cmickeyb
2013-02-14 21:11:58 +00:00
Justin Clark-Casey (justincc) a52dfd43b6 Make new JsonStore script constants separated with underscores, to be consistent with existing LSL/OSSL, etc script constants.
Agreed with cmickeyb
2013-02-14 21:03:07 +00:00
Robert Adams 5920abbf8d Add EventManager events triggered when a SOP is added or removed
from the physical scene. Invocations added in SceneObjectPart.
2013-02-14 09:48:11 -08:00
Melanie ef662fc959 Add an event and some logic to allow customizing Simulator Features by avatar 2013-02-14 09:11:57 +00:00
Justin Clark-Casey (justincc) 69d0e168fb Fix a very unlikely-to-occur NullReferenceException race condition in llPushObject() where the code assumed that the physics actor it null-checked would still be null when it invoked a method on it 2013-02-14 00:20:23 +00:00
Mic Bowman bcb172301d Adds a couple requested functions to the JsonStore script
interface. JsonPathType returns the type of node pointed to by the
path and deprecates the functionality of both JsonTestPath
functions. JsonArrayLength returns the length of an array node.
2013-02-13 07:14:04 -08:00
Mic Bowman 708c3f8b86 Make path parsing more robust in the JsonStore. 2013-02-12 23:21:49 -08:00
Melanie d652de1d0e Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-02-13 01:53:29 +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
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
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
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
Justin Clark-Casey (justincc) d55974bcb7 Add regression TestJsonGetValueJson() 2013-02-11 23:47:49 +00:00