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

diff options

author	Melanie	2013-11-08 17:55:01 +0000
committer	Melanie	2013-11-08 17:55:01 +0000
commit	91b70bf3fe382729a94d9a0855be8b07ef67c360 (patch)
tree	3e42c4c536da6c7eaaf1a72ecdbd2a24de4d1658 /bin/assets/TexturesAssetSet/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c
parent	Merge branch 'master' into careminster (diff)
parent	If the LSL state_entry() event definition contains any parameters, then gener... (diff)
download	opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.zip opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.gz opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.bz2 opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c')

0 files changed, 0 insertions, 0 deletions