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

diff options

author	Melanie	2012-05-15 21:24:27 +0100
committer	Melanie	2012-05-15 21:24:27 +0100
commit	81ce169dfe4c498d6fda7bb2393bfec56065affc (patch)
tree	f7ceaf7d145aaf3fa263933bbad847ef42a93c50 /OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
parent	Merge branch 'master' into careminster (diff)
parent	use part VolumeDetectActive and not rootPart.VolumeDetectActive to be coeren... (diff)
download	opensim-SC_OLD-81ce169dfe4c498d6fda7bb2393bfec56065affc.zip opensim-SC_OLD-81ce169dfe4c498d6fda7bb2393bfec56065affc.tar.gz opensim-SC_OLD-81ce169dfe4c498d6fda7bb2393bfec56065affc.tar.bz2 opensim-SC_OLD-81ce169dfe4c498d6fda7bb2393bfec56065affc.tar.xz

Merge branch 'avination' into careminster

Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs')

0 files changed, 0 insertions, 0 deletions