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

diff options

author	Melanie	2013-03-23 11:45:52 +0000
committer	Melanie	2013-03-23 11:45:52 +0000
commit	8669586e185680172cb577da7f961fb22a437fcb (patch)
tree	52cc9902b1684da747c281528083bedeeebf19cb /OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Make sharing errors not spew and let the cache retry the files (diff)
download	opensim-SC_OLD-8669586e185680172cb577da7f961fb22a437fcb.zip opensim-SC_OLD-8669586e185680172cb577da7f961fb22a437fcb.tar.gz opensim-SC_OLD-8669586e185680172cb577da7f961fb22a437fcb.tar.bz2 opensim-SC_OLD-8669586e185680172cb577da7f961fb22a437fcb.tar.xz

Merge branch 'avination' into careminster

Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs

Diffstat (limited to 'OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs')

0 files changed, 0 insertions, 0 deletions