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

diff options

author	Melanie	2012-09-07 19:49:46 +0100
committer	Melanie	2012-09-07 19:49:46 +0100
commit	924df14c5e15185e14c144164dd80d9859d5c583 (patch)
tree	110f0e402b879f49943ff2e76598e2241e20057c /bin/assets/TexturesAssetSet/9deab416-9c63-78d6-d558-9a156f12044c.j2c
parent	Revert "made setting rotation match Second Life" (diff)
parent	Move addin attributes to RegionCombinerModule.addin.xml (diff)
download	opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.zip opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.tar.gz opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.tar.bz2 opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/9deab416-9c63-78d6-d558-9a156f12044c.j2c')

0 files changed, 0 insertions, 0 deletions