aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2012-01-30 19:49:12 +0000
committerMelanie2012-01-30 19:49:12 +0000
commitea16c9f858c575169b8003e9e7947855259a5696 (patch)
treee56e24d8378cee4b98fb23999927b61968625aaf /OpenSim/Services
parentSome plumbing for map overlays (diff)
parentRevert "Pickup map overlay tile from RegionSettings.ParcelImageID" (diff)
downloadopensim-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/Services')
0 files changed, 0 insertions, 0 deletions