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

diff options

author	Melanie	2011-10-11 23:08:07 +0100
committer	Melanie	2011-10-11 23:08:07 +0100
commit	a157fdedcfa7078c5bcf696f5c7f91aeb8835233 (patch)
tree	742a1eccae60ace95a94161ec51b07992f582b2e /OpenSim/Region/Framework/Scenes/SceneManager.cs
parent	Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge (diff)
parent	Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ar... (diff)
download	opensim-SC_OLD-a157fdedcfa7078c5bcf696f5c7f91aeb8835233.zip opensim-SC_OLD-a157fdedcfa7078c5bcf696f5c7f91aeb8835233.tar.gz opensim-SC_OLD-a157fdedcfa7078c5bcf696f5c7f91aeb8835233.tar.bz2 opensim-SC_OLD-a157fdedcfa7078c5bcf696f5c7f91aeb8835233.tar.xz

Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge

Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

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

0 files changed, 0 insertions, 0 deletions