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

diff options

author	Melanie	2012-03-23 02:44:22 +0000
committer	Melanie	2012-03-23 02:44:22 +0000
commit	2190a62366a633e93e2d4b0284962127f1a5cbf9 (patch)
tree	326b866b027bd57c8edf158a5514b13c4ad20768 /bin/assets/TexturesAssetSet/d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c
parent	Merge branch 'master' into careminster (diff)
parent	Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method... (diff)
download	opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.zip opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.gz opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.bz2 opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c')

0 files changed, 0 insertions, 0 deletions