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

..

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-03 00:06:14 +00:00

XEngine

Merge branch 'master' into bigmerge

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