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

diff options

author	Melanie	2012-05-19 13:34:44 +0100
committer	Melanie	2012-05-19 13:34:44 +0100
commit	ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4 (patch)
tree	2d63da14ca345487a27f2202b2490eae0d86b60c /OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs
parent	Merge branch 'avination' into careminster (diff)
parent	Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ... (diff)
download	opensim-SC_OLD-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.zip opensim-SC_OLD-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.gz opensim-SC_OLD-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.bz2 opensim-SC_OLD-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs

Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs')

0 files changed, 0 insertions, 0 deletions