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

diff options

author	Melanie	2013-09-01 22:49:31 +0100
committer	Melanie	2013-09-01 22:49:31 +0100
commit	008c98a9748ba7deadb80c435ddd372002b6c844 (patch)
tree	9458b87c1d28d741ee6c2384eb1028375cb703ab /bin/assets/TexturesAssetSet/83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c
parent	Merge branch 'master' into careminster (diff)
parent	Profiles: Clean up some log entries caused when visiting HG avatar is using l... (diff)
download	opensim-SC-008c98a9748ba7deadb80c435ddd372002b6c844.zip opensim-SC-008c98a9748ba7deadb80c435ddd372002b6c844.tar.gz opensim-SC-008c98a9748ba7deadb80c435ddd372002b6c844.tar.bz2 opensim-SC-008c98a9748ba7deadb80c435ddd372002b6c844.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: