Melanie 985526b662 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs

2012-02-18 22:21:10 +00:00

..

Plugins

Merge branch 'master' into careminster

2012-02-16 00:38:04 +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

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

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

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

LSL_Api.cs

Prevent object loss and positioning outside the region with failed object sim

2012-02-14 00:02:53 +01: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 careminster

2012-02-18 22:21:10 +00:00