Dan Lake 32ddcefaca Merge branch 'master' into dev ...

Conflicts:
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
	OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs

2011-06-14 23:15:34 -07:00

..

Interfaces

Trigger changed event with CHANGED_TELEPORT when teleporting to another region.

2010-11-26 22:46:48 +01:00

Shared

Merge branch 'master' into dev

2011-06-14 23:15:34 -07:00

XEngine

Merge branch 'master' into dev

2011-06-14 23:15:34 -07:00