Melanie 24235006f4 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs

2011-11-04 01:18:37 +00:00

..

Interfaces

add current script status to "scripts show" command (running, suspended, etc.)

2011-10-19 20:24:07 +01:00

Shared

Merge branch 'master' into bigmerge

2011-11-04 01:18:37 +00:00

XEngine

Merge branch 'master' into bigmerge

2011-10-27 18:14:38 +01:00