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

diff options

author	Melanie	2013-11-23 19:13:22 +0000
committer	Melanie	2013-11-23 19:13:22 +0000
commit	3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch)
tree	a833014a1fedd774e7a9a01cd89a7edddb4210ba /bin/assets/TexturesAssetSet/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c
parent	Merge branch 'master' into careminster (diff)
parent	Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff)
download	opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2 opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz

Merge branch 'master' into careminster

Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat

Diffstat (limited to 'bin/assets/TexturesAssetSet/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: