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

diff options

author	Melanie	2013-01-10 01:38:03 +0000
committer	Melanie	2013-01-10 01:38:03 +0000
commit	3a495ccd561c9e1e95407d8657065265176a03dd (patch)
tree	cb7e7343e7c9a15bfdd77632d389fc6b6288b709 /bin/assets/TexturesAssetSet/0187babf-6c0d-5891-ebed-4ecab1426683.j2c
parent	Merge branch 'avination' into careminster (diff)
parent	On baked texture save, replace any HG ID with an ordinary asset ID so the HGA... (diff)
download	opensim-SC-3a495ccd561c9e1e95407d8657065265176a03dd.zip opensim-SC-3a495ccd561c9e1e95407d8657065265176a03dd.tar.gz opensim-SC-3a495ccd561c9e1e95407d8657065265176a03dd.tar.bz2 opensim-SC-3a495ccd561c9e1e95407d8657065265176a03dd.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/0187babf-6c0d-5891-ebed-4ecab1426683.j2c')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: