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

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-03-27 23:14:43 +01:00

..

Plugins

Merge branch 'master' into careminster

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

ApiManager.cs

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00

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

User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.

2012-03-27 22:09:58 +02: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-27 23:14:43 +01:00