Melanie da9743d1d7 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs

2012-03-26 14:22:49 +01:00

..

Plugins

Merge branch 'master' into careminster

2012-03-07 00:51:59 +00:00

ApiManager.cs

…

AsyncCommandManager.cs

Merge branch 'master' into careminster

2012-03-07 00:51:59 +00:00

CM_Api.cs

Add the country functions in the careminster API

2011-02-12 20:59:09 +01:00

LS_Api.cs

Introduce a LightShare kill packet ans send it when needed. Currently only

2011-12-28 09:24:02 +00:00

LSL_Api.cs

Fix merge issue from core

2012-03-22 20:48:31 +00:00

MOD_Api.cs

Add a hust UUID to the script invocations

2012-03-26 14:19:55 +01:00

OSSL_Api.cs

Merge branch 'master' into careminster

2012-03-18 20:44:56 +00:00