diff options
| author | Melanie | 2011-03-14 14:48:00 +0000 |
|---|---|---|
| committer | Melanie | 2011-03-14 14:48:00 +0000 |
| commit | 3dc877c59f2e257a07bae6b558bdf79a4cee1de8 (patch) | |
| tree | 7e6ed75f380ca42261e9de0529eb6462bec74db2 /OpenSim/Region/CoreModules/World | |
| parent | Up the timeout on slow requests to 3000 to stop console spam. Make sure (diff) | |
| parent | factor inventory file loading into its own method (diff) | |
| download | opensim-SC_OLD-3dc877c59f2e257a07bae6b558bdf79a4cee1de8.zip opensim-SC_OLD-3dc877c59f2e257a07bae6b558bdf79a4cee1de8.tar.gz opensim-SC_OLD-3dc877c59f2e257a07bae6b558bdf79a4cee1de8.tar.bz2 opensim-SC_OLD-3dc877c59f2e257a07bae6b558bdf79a4cee1de8.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index 334dcb0..282e4f1 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
| @@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 113 | data = new MapBlockData(); | 113 | data = new MapBlockData(); |
| 114 | data.Agents = 0; | 114 | data.Agents = 0; |
| 115 | data.Access = info.Access; | 115 | data.Access = info.Access; |
| 116 | data.MapImageId = info.TerrainImage; | 116 | data.MapImageId = UUID.Zero; // could use info.TerrainImage but it seems to break viewer2 |
| 117 | data.Name = info.RegionName; | 117 | data.Name = info.RegionName; |
| 118 | data.RegionFlags = 0; // TODO not used? | 118 | data.RegionFlags = 0; // TODO not used? |
| 119 | data.WaterHeight = 0; // not used | 119 | data.WaterHeight = 0; // not used |