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

diff options

author	Melanie	2012-03-03 09:58:57 +0000
committer	Melanie	2012-03-03 09:58:57 +0000
commit	1f32730798c7633bbed47736a1b302dcd13ce903 (patch)
tree	2456fc1135e91e56e0d17d9fbe67f147b7f5fda2 /bin/assets/TexturesAssetSet/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c
parent	Merge branch 'master' into careminster (diff)
parent	Remove outdated comment about checking attachment prims in Scene.PipeEventsFo... (diff)
download	opensim-SC_OLD-1f32730798c7633bbed47736a1b302dcd13ce903.zip opensim-SC_OLD-1f32730798c7633bbed47736a1b302dcd13ce903.tar.gz opensim-SC_OLD-1f32730798c7633bbed47736a1b302dcd13ce903.tar.bz2 opensim-SC_OLD-1f32730798c7633bbed47736a1b302dcd13ce903.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: