Melanie 3a495ccd56 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

2013-01-10 01:38:03 +00:00

..

Properties

Added AssemblyInfos to every dll in the OpenSim.Region namespace.

2012-11-14 11:09:43 -08:00

Resources

Add the XML manifests needed to get the new style modules to load.

2009-04-15 23:59:15 +00:00

Tests

Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests

2012-11-24 03:15:24 +00:00

EventManager.cs

Add money event routing to the script engine.

2012-10-02 01:25:55 +01:00

ScriptEngineConsoleCommands.cs

Add "show script timers" command to show script timers. For debug purposes.

2013-01-10 00:57:49 +00:00

XEngine.cs

Merge branch 'master' into careminster

2013-01-10 01:38:03 +00:00

XWorkItem.cs

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

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