opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

diff options

author	Melanie	2012-12-16 21:19:30 +0000
committer	Melanie	2012-12-16 21:19:30 +0000
commit	0a876a305c32e52d7d0b437c8246119227fce51c (patch)
tree	59772311fcbaf528749b3b9661b252d99f0776ba /OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs
parent	Merge branch 'master' into careminster (diff)
parent	Make WebStatsModule properly handle scenes added or removed after initial sta... (diff)
download	opensim-SC-0a876a305c32e52d7d0b437c8246119227fce51c.zip opensim-SC-0a876a305c32e52d7d0b437c8246119227fce51c.tar.gz opensim-SC-0a876a305c32e52d7d0b437c8246119227fce51c.tar.bz2 opensim-SC-0a876a305c32e52d7d0b437c8246119227fce51c.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs

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

0 files changed, 0 insertions, 0 deletions