Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | 1 | -1/+60 | |
| |\ | ||||||
| * | | 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 | 1 | -1/+60 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-07 | 3 | -13/+95 | |
| |\ \ | | |/ | ||||||
| * | | Add TestJsonWriteReadNotecard() regression test | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -1/+44 | |
| | | | ||||||
| * | | Make json store tests operate on a single thread to ensure we don't run into ↵ | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -0/+16 | |
| | | | | | | | | | | | | any race related test failures in the future. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 3 | -13/+95 | |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |||||
| * | | Enables script access to the per object dynamic attributes through the JsonStore | Mic Bowman | 2013-02-06 | 3 | -13/+95 | |
| |/ | | | | | | | | | | | | | | | | | | | | | script functions. Adds JsonAttachObjectStore to associate a store identifier with an object (scripts can only access the store in their host object, this could be extended but isn't necessary for now). Note this opens a method to the DAMap OSDMap. This will be removed later, but greatly simplifies the code for now. The JsonStore and these scripts are disabled by default. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 1 | -8/+18 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |||||
| * | Allow JsonReadNotecard() to accept the name of the notecard as well as the ↵ | Justin Clark-Casey (justincc) | 2013-02-06 | 1 | -8/+18 | |
| | | | | | | | | | | | | | | asset ID. Agreed in discussion with cmickeyb. This is to make this consistent with similar existing LSL/OSSL functions such as llTriggerSound() and osNpcLoadAppearance() that allow an item name or an asset id. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-04 | 2 | -87/+190 | |
|\ \ | |/ | ||||||
| * | Move the JsonStore regular expressions to static variables to avoid | Mic Bowman | 2013-01-31 | 2 | -87/+190 | |
| | | | | | | | | | | recompiling on every operation. Added JsonList2Path script function to simplify array iteration. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-01-31 | 3 | -33/+110 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||||
| * | Add JsonTestStore to determine if a JsonStore is associated with | Mic Bowman | 2013-01-30 | 2 | -0/+24 | |
| | | | | | | | | a particular UUID. | |||||
| * | Add JsonDestroyStore() basic regression test | Justin Clark-Casey (justincc) | 2013-01-30 | 1 | -0/+15 | |
| | | ||||||
| * | refactor: Make invocations of json store functions from the regression test ↵ | Justin Clark-Casey (justincc) | 2013-01-30 | 1 | -42/+17 | |
| | | | | | | | | simpler | |||||
| * | Add regression test for script func JsonRemoveValue() | Justin Clark-Casey (justincc) | 2013-01-30 | 1 | -0/+52 | |
| | | ||||||
| * | minor: change name of json script tests to JsonStoreScriptModuleTests ↵ | Justin Clark-Casey (justincc) | 2013-01-29 | 1 | -1/+1 | |
| | | | | | | | | instead of copy/pasted LSL_ApiInventoryTests | |||||
| * | Try ignoring json tests if they can't be run due to being on <=.net 3.5 | Justin Clark-Casey (justincc) | 2013-01-29 | 1 | -6/+17 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2013-01-26 | 2 | -26/+171 | |
|\ \ | |/ | ||||||
| * | Disable json tests for now - I see this is failing on jenkins because mono ↵ | Justin Clark-Casey (justincc) | 2013-01-25 | 2 | -32/+29 | |
| | | | | | | | | | | | | 2.4.3 doesn't have Funcs >5 params, though mono 2.6 onwards does. Standardize logging in JsonStoreScriptModule and some minor code formatting. | |||||
| * | See if getting the registering JsonReadNotecard with MethodInfo works around ↵ | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -2/+5 | |
| | | | | | | | | an apparent issue with registering methods with more than 5 parameters on mono 2.4.3 | |||||
| * | Increase logging by enabling during test setup rather than during individual ↵ | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -4/+6 | |
| | | | | | | | | tests of for JsonStore | |||||
| * | Enable logging in new json store tests to find out why they fail on jenkins ↵ | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -4/+4 | |
| | | | | | | | | but not locally. | |||||
| * | Add JsonTestPath() regression test | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -0/+17 | |
| | | ||||||
| * | Add regression test for JsonSetValue() | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -0/+23 | |
| | | ||||||
| * | Add basic JsonGetValue() regression test. | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -0/+17 | |
| | | ||||||
| * | Add basic JsonCreateStore() regression test | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -0/+86 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2013-01-02 | 1 | -2/+2 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| * | Comment out test messages that go directly to the console. | Robert Adams | 2012-12-31 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2012-12-04 | 2 | -19/+69 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | |||||
| * | XmlRpcGridRouter | BlueWall | 2012-12-03 | 2 | -19/+69 | |
| | | | | | | | | | | | | | | | | | | Flesh out XmlRpcGridRouter to reap unused channels from gateway when scripts or objects are removed, or when the llCloseRemoteDataChannel is called. See: http://http://forge.opensimulator.org/gf/project/xmlrpcrouter/ or https://github.com/BlueWall/XmlRpcRouter for php gateway and test code. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 1 | -0/+2 | |
|\ \ | |/ | ||||||
| * | All optional modules' directives moved out of addin.xml | Diva Canto | 2012-11-13 | 1 | -0/+2 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 2 | -2/+2 | |
|\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs | |||||
| * | Remove any mention of IRegionModule from region names and comments to aid | Melanie | 2012-11-12 | 2 | -2/+2 | |
| | | | | | | | | grepping for remaining uses | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 3 | -59/+117 | |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||||
| * | Two more modules converted: XmlRpcGridRouterModule and XmlRpcRouterModule. | Diva Canto | 2012-11-11 | 2 | -18/+60 | |
| | | ||||||
| * | One more module converted: MRMModule. | Diva Canto | 2012-11-11 | 1 | -35/+56 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-30 | 1 | -2/+5 | |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| * | shuffling code around so that the interface for ISoundModule.SendSound() ↵ | SignpostMarv | 2012-10-29 | 1 | -1/+1 | |
| | | | | | | | | specifies a UUID rather than a string | |||||
| * | moving SendSound from SceneObjectPart to ISoundModule | SignpostMarv | 2012-10-29 | 1 | -2/+5 | |
| | |