opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

diff options

author	Melanie	2012-04-03 23:52:53 +0100
committer	Melanie	2012-04-03 23:52:53 +0100
commit	63c44719f7a67950325690bc4cc848b75318e29f (patch)
tree	eaa0575671680d8dad75813dc8700d098a3df622 /OpenSim/Region/Framework/Scenes/EventManager.cs
parent	Merge branch 'master' into careminster (diff)
parent	terrain save-tile extensions Signed-off-by: Garmin Kawaguichi <garmin.kawagui... (diff)
download	opensim-SC_OLD-63c44719f7a67950325690bc4cc848b75318e29f.zip opensim-SC_OLD-63c44719f7a67950325690bc4cc848b75318e29f.tar.gz opensim-SC_OLD-63c44719f7a67950325690bc4cc848b75318e29f.tar.bz2 opensim-SC_OLD-63c44719f7a67950325690bc4cc848b75318e29f.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: