Melanie 243acef917 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2011-11-03 00:06:14 +00:00

..

Plugins

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07: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

Add a state change method to the Async commands handler to allow timers

2010-07-18 21:05:50 +02:00

CM_Api.cs

Add the country functions in the careminster API

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

LS_Api.cs

Add case to Lightshare/Windlight

2011-10-22 13:06:34 -04:00

LSL_Api.cs

Merge branch 'master' into bigmerge

2011-11-03 00:06:14 +00:00

MOD_Api.cs

Add IScriptModuleComms interface and region module to handle dispatch of

2009-11-10 03:36:43 +00:00

OSSL_Api.cs

Merge branch 'master' into bigmerge

2011-10-30 10:16:25 +00:00