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

diff options

author	Melanie	2011-11-06 20:54:13 +0000
committer	Melanie	2011-11-06 20:54:13 +0000
commit	323b76cee4a9e90de3c7a2bad76c9d27a7953c2d (patch)
tree	57b11cd3cb52af5502d2b8945e0f9c5f3bf6c108 /bin/assets/TexturesAssetSet/30047cec-269d-408e-0c30-b2603b887268.j2c
parent	Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int... (diff)
parent	Make the AsyncSceneObjectDeleter send a list of kills. This will make large (diff)
download	opensim-SC-323b76cee4a9e90de3c7a2bad76c9d27a7953c2d.zip opensim-SC-323b76cee4a9e90de3c7a2bad76c9d27a7953c2d.tar.gz opensim-SC-323b76cee4a9e90de3c7a2bad76c9d27a7953c2d.tar.bz2 opensim-SC-323b76cee4a9e90de3c7a2bad76c9d27a7953c2d.tar.xz

Merge branch 'master' into bigmerge

Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/30047cec-269d-408e-0c30-b2603b887268.j2c')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: