Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Add regression TestGetArrayLength() | Justin Clark-Casey (justincc) | 2013-02-14 | 1 | -0/+33 | |
| | | | ||||||
| * | | Add regression TestJsonGetPathType() | Justin Clark-Casey (justincc) | 2013-02-14 | 1 | -0/+47 | |
| | | | ||||||
| * | | Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and ↵ | Justin Clark-Casey (justincc) | 2013-02-14 | 2 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | Make new JsonStore script constants separated with underscores, to be ↵ | Justin Clark-Casey (justincc) | 2013-02-14 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | consistent with existing LSL/OSSL, etc script constants. Agreed with cmickeyb | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-14 | 3 | -13/+153 | |
|\ \ \ | |/ / | ||||||
| * | | Adds a couple requested functions to the JsonStore script | Mic Bowman | 2013-02-13 | 3 | -1/+147 | |
| | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | Make path parsing more robust in the JsonStore. | Mic Bowman | 2013-02-12 | 1 | -12/+6 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-13 | 1 | -15/+218 | |
|\ \ \ | |/ / | ||||||
| * | | Add more sub-tests to TestJsonSetValue for paths containing []{} without {} ↵ | Justin Clark-Casey (justincc) | 2013-02-13 | 1 | -5/+86 | |
| | | | | | | | | | | | | | | | | | | | | | 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). | |||||
| * | | Extend JsonTestSetValue() with tests for escaping brackets, periods and ↵ | Justin Clark-Casey (justincc) | 2013-02-13 | 1 | -2/+71 | |
| | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | Add test for array as root element in TestJsonCreateStore() | Justin Clark-Casey (justincc) | 2013-02-13 | 1 | -0/+9 | |
| | | | ||||||
| * | | Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arrays | Justin Clark-Casey (justincc) | 2013-02-13 | 1 | -13/+57 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-12 | 3 | -40/+259 | |
|\ \ \ | |/ / | ||||||
| * | | Extend TestJsonCreateStore() with a one key input and an input with raw ↵ | Justin Clark-Casey (justincc) | 2013-02-12 | 1 | -2/+20 | |
| | | | | | | | | | | | | number values | |||||
| * | | Re-enable subtest for single quoted token in TestJsonSetValueJson() | Justin Clark-Casey (justincc) | 2013-02-12 | 1 | -9/+9 | |
| | | | | | | | | | | | | This is in response to the resolution of http://opensimulator.org/mantis/view.php?id=6540 | |||||
| * | | Adds the parameter for OSD serialization to encode default values. This | Mic Bowman | 2013-02-12 | 2 | -5/+8 | |
| | | | | | | | | | | | | makes the JsonStore get/set operations symmetric. | |||||
| * | | Fix handling of string values in JsonSetValueJson(). There are | Mic Bowman | 2013-02-11 | 1 | -1/+31 | |
| | | | | | | | | | | | | | | | some oddities with empty strings: the Json serializer treats them as default values and does not return them in serialized hashes. | |||||
| * | | Add regression TestJsonSetValueJson() | Justin Clark-Casey (justincc) | 2013-02-12 | 1 | -0/+58 | |
| | | | | | | | | | | | | | | | The part to test setting of single leaf-node string tokens is currently commented out. See http://opensimulator.org/mantis/view.php?id=6540 | |||||
| * | | Add regression TestJsonGetValueJson() | Justin Clark-Casey (justincc) | 2013-02-11 | 1 | -0/+33 | |
| | | | ||||||
| * | | Add regression TestJsonTestPathJson() | Justin Clark-Casey (justincc) | 2013-02-11 | 1 | -0/+32 | |
| | | | ||||||
| * | | Add section to TestJsonGetValue() to test call on a sub-tree | Justin Clark-Casey (justincc) | 2013-02-11 | 1 | -9/+21 | |
| | | | ||||||
| * | | Extend TestJsonTestPath() for non-terminating section of path (i.e. one that ↵ | Justin Clark-Casey (justincc) | 2013-02-11 | 1 | -8/+20 | |
| | | | | | | | | | | | | does not point to a value/leaf) | |||||
| * | | Add section to TestJsonSetValue() to test attempted set of value where the ↵ | Justin Clark-Casey (justincc) | 2013-02-11 | 1 | -8/+23 | |
| | | | | | | | | | | | | penultimate section of path does not exist | |||||
| * | | Add test to try reading notecard into an invalid path in ↵ | Justin Clark-Casey (justincc) | 2013-02-11 | 1 | -7/+13 | |
| | | | | | | | | | | | | TestJsonReadNotecard() regression test | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-10 | 4 | -28/+261 | |
|\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2013-02-08 | 2 | -5/+173 | |
| |\ \ | ||||||
| | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-09 | 3 | -4/+266 | |
| | |\ \ | ||||||
| | | * | | BulletSim: fix avatar bobbing or jiggling while stationary flying. | Robert Adams | 2013-02-08 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | Various comments and debugging message mods. | |||||
| | | * | | BulletSim: add initial instance of the ExtendedPhysics region module which ↵ | Robert Adams | 2013-02-08 | 1 | -0/+163 | |
| | | | | | | | | | | | | | | | | | | | | adds new LSL commands for extended physics functions. Uses the modInvoke system. Disabled by default. | |||||
| | * | | | Change TestDestroyStore() and TestJsonRemoveValue() to reflect the fact that ↵ | Justin Clark-Casey (justincc) | 2013-02-09 | 1 | -5/+2 | |
| | | | | | | | | | | | | | | | | | | | | the return values have changed. | |||||
| * | | | | Make JsonStore path parsing more robust. Should fix the | Mic Bowman | 2013-02-08 | 2 | -21/+59 | |
| | |/ / | |/| | | | | | | | | | | invalid path problem. | |||||
| * | | | Broaden the internal OSD type checks to parse JSON that has | Mic Bowman | 2013-02-08 | 1 | -2/+29 | |
| | | | | | | | | | | | | | | | | non string values. | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2013-02-08 | 4 | -24/+150 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||||
| * | | | Adds size limits to JsonStore. Adds a separate configuration | Mic Bowman | 2013-02-08 | 2 | -2/+66 | |
| |/ / | | | | | | | | | | variable to enable binding to dynamic attributes. | |||||
| * | | Fix the return values for JsonDestroyStore, JsonRemoveValue, and JsonSetValue. | Mic Bowman | 2013-02-08 | 3 | -10/+17 | |
| | | | | | | | | | | | | Fix the link message status when reading a notecard. | |||||
| * | | Refine TestJsonReadNotecard() and use / instead of . to separate paths. | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -15/+46 | |
| | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | Extend TestJsonReadNotecard() for reads to non-root locations and fake stores. | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -9/+33 | |
| | | | | | | | | | | | | 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. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-08 | 1 | -10/+98 | |
|\ \ \ | |/ / | ||||||
| * | | Stop wrongly create a receiving store already populated with "Hello":"World" ↵ | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -1/+3 | |
| | | | | | | | | | | | | in TestJsonReadNotecard() | |||||
| * | | Extend TestJsonWriteNotecard() regression test for cases with fake paths and ↵ | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -8/+61 | |
| | | | | | | | | | | | | | | | | | | fake stores. Also separates out TestJsonWriteReadNotecard() into separate write and read tests | |||||
| * | | Extend TestJsonSetValue() regressio ntes tto test against a fake store | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -0/+5 | |
| | | | ||||||
| * | | Extend TestJsonTestPath() regression test with checks against fake values ↵ | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -0/+8 | |
| | | | | | | | | | | | | and fake stores | |||||
| * | | Add tests for removing fake values/from fake store in TestJsonRemoveValue() | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -0/+11 | |
| | | | | | | | | | | | | Again, need to check if returning true for removing a value that doesn't exist is most appropriate. | |||||
| * | | Add testing for getting non-existing values and values from a non-existing ↵ | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -1/+10 | |
| | | | | | | | | | | | | datastore to TestJsonGetValue() | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 3 | -15/+29 | |
|\ \ \ | |/ / | ||||||
| * | | Add TestJsonDestoreStoreNotExists() | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | This still returns true even if we ask to destroy a store that does not exist. Need to check that this is more appropriate behaviour. | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-07 | 5 | -15/+249 | |
| |\ \ | ||||||
| | * | | Plumb the path from the client to the extra physics params and back | Melanie | 2013-02-07 | 2 | -0/+10 | |
| | | | | ||||||
| * | | | Fix a recent regression in e17392a where JsonSetValue() stopped working ↵ | Justin Clark-Casey (justincc) | 2013-02-07 | 3 | -15/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably other functions as well). Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten. This was actually picked up by the TestJsonSetValue() regression test failing But this isn't being run on jenkins due to the .net version issue. This commit also puts the full stack trace in logged messages and makes these error level messages instead of info | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 2 | -14/+179 | |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: bin/HttpServer_OpenSim.dll |