ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-24 19:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,771 Commits 5 Branches 93 Tags
b52f7b920342b7ea3e0294eae054e7520801e339
Commit Graph

415 Commits

Author SHA1 Message Date
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)
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
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
ef86a9be45 Merge branch 'master' into careminster 2013-02-07 23:23:53 +00:00
Justin Clark-Casey (justincc)
2e86978b60 Add TestJsonDestoreStoreNotExists() 
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.
 2013-02-07 23:30:03 +00:00
Justin Clark-Casey (justincc)
9e17dc3daa Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-07 23:09:47 +00:00
Justin Clark-Casey (justincc)
c135c3224f Fix a recent regression in e17392a where JsonSetValue() stopped working (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
 2013-02-07 23:08:19 +00:00
Melanie
529489e73a Merge branch 'master' into careminster 2013-02-07 03:20:16 +00:00
Justin Clark-Casey (justincc)
2c5d24d394 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-07 02:19:53 +00:00
Justin Clark-Casey (justincc)
3657a08844 Add TestJsonWriteReadNotecard() regression test 2013-02-07 02:19:26 +00:00
Melanie
375114bea3 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
 2013-02-07 01:40:11 +00:00
Mic Bowman
e17392acbb Enables script access to the per object dynamic attributes through the JsonStore 
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.
 2013-02-06 17:29:17 -08:00
Justin Clark-Casey (justincc)
4d1758985f Make json store tests operate on a single thread to ensure we don't run into any race related test failures in the future. 2013-02-07 00:54:09 +00:00
Melanie
f567ff9f51 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
 2013-02-06 02:22:12 +00:00
Justin Clark-Casey (justincc)
eddfed3812 Allow JsonReadNotecard() to accept the name of the notecard as well as the 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.
 2013-02-06 01:37:22 +00:00
Melanie
7482ad1c22 Merge branch 'master' into careminster 2013-02-04 19:21:39 +00:00
Mic Bowman
1e0420431f Move the JsonStore regular expressions to static variables to avoid 
recompiling on every operation. Added JsonList2Path script function
to simplify array iteration.
 2013-01-31 14:53:16 -08:00
Melanie
9a4de546fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2013-01-31 02:53:11 +00:00
Mic Bowman
a0ef3df194 Add JsonTestStore to determine if a JsonStore is associated with 
a particular UUID.
 2013-01-30 14:45:03 -08:00
Justin Clark-Casey (justincc)
d42c7afe3f Add JsonDestroyStore() basic regression test 2013-01-30 05:56:30 +00:00
Justin Clark-Casey (justincc)
5a22efe69c refactor: Make invocations of json store functions from the regression test simpler 2013-01-30 05:49:28 +00:00
Justin Clark-Casey (justincc)
addf9ada49 Add regression test for script func JsonRemoveValue() 2013-01-30 05:39:34 +00:00
Justin Clark-Casey (justincc)
39700445f2 minor: change name of json script tests to JsonStoreScriptModuleTests instead of copy/pasted LSL_ApiInventoryTests 2013-01-29 04:36:41 +00:00
Justin Clark-Casey (justincc)
e0f4e91d22 Try ignoring json tests if they can't be run due to being on <=.net 3.5 2013-01-29 04:26:47 +00:00
Melanie
e28c042dce Merge branch 'master' into careminster 2013-01-26 01:56:23 +00:00
Justin Clark-Casey (justincc)
d977bb77cb Disable json tests for now - I see this is failing on jenkins because mono 2.4.3 doesn't have Funcs >5 params, though mono 2.6 onwards does. 
Standardize logging in JsonStoreScriptModule and some minor code formatting.
 2013-01-25 03:19:56 +00:00
Justin Clark-Casey (justincc)
614d4eda3e See if getting the registering JsonReadNotecard with MethodInfo works around an apparent issue with registering methods with more than 5 parameters on mono 2.4.3 2013-01-25 03:02:08 +00:00
Justin Clark-Casey (justincc)
4f52acaa83 Increase logging by enabling during test setup rather than during individual tests of for JsonStore 2013-01-25 02:32:38 +00:00
Justin Clark-Casey (justincc)
8c68451856 Enable logging in new json store tests to find out why they fail on jenkins but not locally. 2013-01-25 02:22:24 +00:00
Justin Clark-Casey (justincc)
844e60da0f Add JsonTestPath() regression test 2013-01-25 02:12:28 +00:00
Justin Clark-Casey (justincc)
f32361d595 Add regression test for JsonSetValue() 2013-01-25 02:08:33 +00:00
Justin Clark-Casey (justincc)
ba369c5cfe Add basic JsonGetValue() regression test. 2013-01-25 01:55:27 +00:00
Justin Clark-Casey (justincc)
f557d7e828 Add basic JsonCreateStore() regression test 2013-01-25 01:48:31 +00:00
Melanie
7943c8d11c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-01-02 11:52:37 +00:00
Robert Adams
26f364cc5d Comment out test messages that go directly to the console. 2012-12-31 19:57:20 -08:00
Melanie
5837e731bf Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
 2012-12-04 23:01:18 +00:00
BlueWall
ac65085cc3 XmlRpcGridRouter 
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.
 2012-12-03 20:16:44 -05:00
Melanie
06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Diva Canto
18c5d33f0a All optional modules' directives moved out of addin.xml 2012-11-13 09:48:56 -08:00
Melanie
2e0ce70e63 Merge branch 'master' into careminster 
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
 2012-11-12 23:27:47 +00:00
Melanie
0d15a6a01f Remove any mention of IRegionModule from region names and comments to aid 
grepping for remaining uses
 2012-11-12 19:18:20 +00:00
Melanie
d9b149b375 Merge branch 'master' into careminster 
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
 2012-11-12 15:46:45 +00:00
Diva Canto
64fad2f80e Two more modules converted: XmlRpcGridRouterModule and XmlRpcRouterModule. 2012-11-11 16:44:59 -08:00