ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-24 17:15:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,681 Commits 5 Branches 88 Tags
d3892bbd0674e4f6912ce89e54712ea405dbbfb8
Commit Graph

293 Commits

Author SHA1 Message Date
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
Diva Canto
4e8c8b2cd8 One more module converted: MRMModule. 2012-11-11 16:18:47 -08:00
Melanie
48569e856a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-10-30 01:02:20 +00:00
SignpostMarv
c5af16aef8 shuffling code around so that the interface for ISoundModule.SendSound() specifies a UUID rather than a string 2012-10-29 23:39:00 +00:00
SignpostMarv
5abcecc735 moving SendSound from SceneObjectPart to ISoundModule 2012-10-29 23:39:00 +00:00
Diva Canto
91a5c602e3 Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." 
But the patch is here, in case anyone wants to try it.

This reverts commit 531edd51d8.
 2012-09-30 07:48:03 -07:00
Diva Canto
531edd51d8 Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. 
Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
 2012-09-30 07:22:55 -07:00
Melanie
bbaf2c5a80 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-24 20:14:00 +01:00
Mic Bowman
91312daeb2 Moving ScriptModuleComms into the CoreModules tree. 2012-09-17 09:04:54 -07:00
Melanie
d739246030 Merge branch 'master' into careminster 2012-09-17 14:18:03 +01:00
SignpostMarv
f9721573d9 Implementing ability to register script constants and invocations on a region module automatically 2012-09-17 14:15:47 +01:00
Melanie
db774d4292 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
 2012-09-16 04:11:20 +01:00
Oren Hurvitz
ce468215d5 Support multi-region OAR files 
Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
 2012-09-14 20:25:03 +01:00
Mic Bowman
f06394f195 Allow an incoming identifier to be specified for a JsonStore. 2012-09-11 16:42:07 -07:00
Melanie
cbdfca1460 Merge branch 'master' into careminster 2012-08-31 15:33:42 +01:00
SignpostMarv
dac31303b7 Type.Type is RuntimeType 2012-08-31 15:33:15 +01:00
Melanie
c0feaf54de Merge branch 'master' into careminster 2012-08-31 14:40:30 +01:00
SignpostMarv
054db94d5d formatting 2012-08-31 14:32:33 +01:00
SignpostMarv
794c5f5a6d adding support for static method script invocations 2012-08-31 14:32:33 +01:00
SignpostMarv
b625579780 moving assignment to new line to make next commit easier to read in diffs 2012-08-31 14:32:33 +01:00
SignpostMarv
7e41559917 using specific type instead of var 2012-08-31 14:32:33 +01:00
SignpostMarv
8cd415c2b0 formatting 2012-08-31 14:32:32 +01:00
SignpostMarv
4c58c1b116 formatting 2012-08-31 14:32:32 +01:00