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

diff options

author	Melanie	2012-05-09 00:43:33 +0100
committer	Melanie	2012-05-09 00:43:33 +0100
commit	50321fb7bf6472c4edfe574a2ba0113c0d4cd3be (patch)
tree	b93dce1de50843d68b1daffbe3afc3903beee2fb /OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
parent	Merge branch 'master' into careminster (diff)
parent	Remove physics actor related race conditions in SetVehicleFlags() and SetPhys... (diff)
download	opensim-SC-50321fb7bf6472c4edfe574a2ba0113c0d4cd3be.zip opensim-SC-50321fb7bf6472c4edfe574a2ba0113c0d4cd3be.tar.gz opensim-SC-50321fb7bf6472c4edfe574a2ba0113c0d4cd3be.tar.bz2 opensim-SC-50321fb7bf6472c4edfe574a2ba0113c0d4cd3be.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs

Diffstat (limited to 'OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: