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

diff options

author	Melanie	2012-05-29 18:12:18 +0100
committer	Melanie	2012-05-29 18:12:18 +0100
commit	997d23c590487dcb9a3ea519cc09e1e8cb6c98f4 (patch)
tree	0946744667ceac03e3ad32a8e902a8c547a69d62 /OpenSim/Region/Application/OpenSim.cs
parent	Re-add script collisions that were lost in a merge (diff)
parent	refactor: factor out entity transfer state machine into a separate class to m... (diff)
download	opensim-SC_OLD-997d23c590487dcb9a3ea519cc09e1e8cb6c98f4.zip opensim-SC_OLD-997d23c590487dcb9a3ea519cc09e1e8cb6c98f4.tar.gz opensim-SC_OLD-997d23c590487dcb9a3ea519cc09e1e8cb6c98f4.tar.bz2 opensim-SC_OLD-997d23c590487dcb9a3ea519cc09e1e8cb6c98f4.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')

0 files changed, 0 insertions, 0 deletions