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

diff options

author	Melanie	2013-01-10 01:25:07 +0000
committer	Melanie	2013-01-10 01:25:07 +0000
commit	aecb32b74efa5b74adcfc026f7261f43ad5934f4 (patch)
tree	8c775eca7460a5c5c2bc08e25d2334897e693673 /bin/assets/TexturesAssetSet/db9d39ec-a896-c287-1ced-64566217021e.j2c
parent	Merge branch 'avination' into careminster (diff)
parent	Change IsRoot to use ReferenceEquals to prevent operator == messiness (diff)
download	opensim-SC-aecb32b74efa5b74adcfc026f7261f43ad5934f4.zip opensim-SC-aecb32b74efa5b74adcfc026f7261f43ad5934f4.tar.gz opensim-SC-aecb32b74efa5b74adcfc026f7261f43ad5934f4.tar.bz2 opensim-SC-aecb32b74efa5b74adcfc026f7261f43ad5934f4.tar.xz

Merge branch 'avination' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/db9d39ec-a896-c287-1ced-64566217021e.j2c')

0 files changed, 0 insertions, 0 deletions