26dca1adc3
Convert JsonTestPath() use in json regression tests to JsonGetPathType() instead
2013-02-19 23:53:57 +00:00
036d73c52a
This should fix the build fail. Fingers crossed.
2013-02-19 07:55:20 -08:00
fc89987656
Previous build failed. Checking in a dummy change to see if the fail persists.
2013-02-19 07:30:55 -08:00
9380d01976
First commit of Diva Groups. The Data bits went to OpenSim.Data core, the rest to Addons.Groups.dll.
2013-02-19 07:26:40 -08:00
46e182dbf5
Offline IM: moved the Data and MySQL bits to the corresponding places in core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that.
2013-02-19 06:37:20 -08:00
9e460f2af8
One more sql statement on migration #2 for offline im, to really clean up things.
2013-02-18 19:54:18 -08:00
4e846d55a8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-18 16:06:01 -08:00
5e709b087c
Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll
2013-02-18 15:44:00 -08:00
050ef1dc4e
minor: Rename regression test method TestGetArrayLength() -> JsonTestGetArrayLength() to match others
2013-02-18 22:59:29 +00:00
8c0b9080a4
Fix an issue where the viewer would request the seed cap before
...
there was a handler for it.
2013-02-18 21:09:14 +01:00
8b1b8a3921
I need these for OfflineIM and Groups.
2013-02-18 12:08:05 -08:00
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
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
885b45b112
BulletSim: rework parameter setting for different types of values
...
(like vectors or quaternions).
2013-02-17 20:13:48 -08:00
13fe3546c3
Correctly remove https:// URLs from the http server.
2013-02-17 17:43:32 +01:00
6560d80fa8
* Fix walking to <NaN, NaN, NaN> via autopilot.
2013-02-16 22:54:37 -05:00
e549c2922a
BulletSim: fix physical object appearing to slowly float off when
...
they stop moving.
2013-02-16 19:28:38 -08:00
3108d18ffb
Fix shape parameters sent for meshes tosupport the full number of faces
2013-02-16 05:44:41 +00:00
192e1e7cf0
Merge branch 'master' into careminster
2013-02-16 05:37:12 +00:00
4be35df5fa
Fix shape parameters sent for meshes tosupport the full number of faces
2013-02-16 05:09:27 +01:00
7d7736dc73
Separate IAR tests into separate files for load/save/loadpath tests
2013-02-16 01:57:42 +00:00
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
84de7e55e9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-16 00:27:16 +00:00
e9cc22fea4
Add regression test TestSaveNonRootFolderToIar
2013-02-16 00:26:21 +00:00
ea8c5ba707
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-15 21:42:16 +00:00
e09467b30d
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-02-14 20:06:22 -08:00
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
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
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
0b2608d8f4
Comment out regression TestJsonTestPath and TestJsonTestPathJson as these will go away soon
2013-02-15 00:32:20 +00:00
30a60d661f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-15 00:28:00 +00:00
cc40517863
Add regression TestJsonList2Path()
2013-02-15 00:27:30 +00:00
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
c22276a169
* gracefully handle a Situation where a double close is called on the WebSocket handler
2013-02-14 18:43:53 -05:00
13d4f6f747
Add regression TestGetArrayLength()
2013-02-14 21:34:57 +00:00
6fe771f27e
Add regression TestJsonGetPathType()
2013-02-14 21:31:34 +00:00
0ad07eb44d
minor: remove some mono compiler warnings
2013-02-14 21:29:35 +00:00
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
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
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
945bf9808c
Merge branch 'master' into careminster
2013-02-14 09:12:31 +00:00
a5a56a8755
Merge branch 'avination' into careminster
2013-02-14 09:12:27 +00:00
ef662fc959
Add an event and some logic to allow customizing Simulator Features by avatar
2013-02-14 09:11:57 +00:00
d5cd9308d5
Merge branch 'avination' into careminster
2013-02-14 07:45:30 +00:00
9d55a2298d
Merge branch 'master' into careminster
2013-02-14 07:45:23 +00:00
32c4e1a850
Add an event and some logic to allow customizing Simulator Features by avatar
2013-02-14 08:40:15 +01:00
4c7df6a147
Small fix to sim features module
2013-02-14 07:17:27 +01:00
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
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
708c3f8b86
Make path parsing more robust in the JsonStore.
2013-02-12 23:21:49 -08:00
Justin Clark-Casey (justincc)