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

Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-03-22 20:38:49 +00: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

Merge branch 'master' into careminster

2012-03-22 20:38:49 +00:00

MOD_Api.cs

Adds a new script command 'modInvoke' to invoke registered functions

2012-03-15 13:16:02 -07:00

OSSL_Api.cs

Merge branch 'master' into careminster

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