Melanie 3889e68c54 Merge branch 'master' into careminster-presence-refactor ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
	OpenSim/Services/GridService/HypergridLinker.cs

2011-02-07 22:08:53 +00:00

..

Plugins

Correct Sensor axis for unattached daughter prims.

2010-12-12 23:26:58 +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

LS_Api.cs

Add lsClearWindlightScene() to the lightshare module to remove WL settings

2010-11-03 02:31:43 +00:00

LSL_Api.cs

Merge branch 'master' into careminster-presence-refactor

2011-02-07 22:08:53 +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 careminster-presence-refactor

2011-02-07 22:08:53 +00:00