diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Hypergrid')
-rw-r--r-- | OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs index f196973..8946b5c 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | |||
@@ -129,7 +129,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
129 | b.Access = 254; // means 'simulator is offline'. We need this because the viewer ignores 255's | 129 | b.Access = 254; // means 'simulator is offline'. We need this because the viewer ignores 255's |
130 | } | 130 | } |
131 | 131 | ||
132 | m_log.DebugFormat("[HG MAP]: Reseting {0} blocks", mapBlocks.Count); | 132 | m_log.DebugFormat("[HG MAP]: Resetting {0} blocks", mapBlocks.Count); |
133 | sp.ControllingClient.SendMapBlock(mapBlocks, 0); | 133 | sp.ControllingClient.SendMapBlock(mapBlocks, 0); |
134 | m_SeenMapBlocks.Remove(clientID); | 134 | m_SeenMapBlocks.Remove(clientID); |
135 | } | 135 | } |