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

diff options

author	Melanie	2012-01-30 19:49:12 +0000
committer	Melanie	2012-01-30 19:49:12 +0000
commit	ea16c9f858c575169b8003e9e7947855259a5696 (patch)
tree	e56e24d8378cee4b98fb23999927b61968625aaf /OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
parent	Some plumbing for map overlays (diff)
parent	Revert "Pickup map overlay tile from RegionSettings.ParcelImageID" (diff)
download	opensim-SC_OLD-ea16c9f858c575169b8003e9e7947855259a5696.zip opensim-SC_OLD-ea16c9f858c575169b8003e9e7947855259a5696.tar.gz opensim-SC_OLD-ea16c9f858c575169b8003e9e7947855259a5696.tar.bz2 opensim-SC_OLD-ea16c9f858c575169b8003e9e7947855259a5696.tar.xz

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs')

0 files changed, 0 insertions, 0 deletions