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

diff options

author	Melanie	2011-11-04 01:18:37 +0000
committer	Melanie	2011-11-04 01:18:37 +0000
commit	24235006f473cec56213705ce70df781cf9bcbc1 (patch)
tree	7d0e75978d48272827c3f03f087bf79658dd16cf /bin/assets/TexturesAssetSet/2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c
parent	Merge branch 'master' into bigmerge (diff)
parent	Rename ForEachAvatar back to ForEachScenePresence. The other changes (diff)
download	opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.zip opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.tar.gz opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.tar.bz2 opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.tar.xz

Merge branch 'master' into bigmerge

Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: