diff options
| author | Melanie | 2012-02-05 20:58:04 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-05 20:58:04 +0000 |
| commit | 54fc78013d1eb946551656849e7007427ef4aec3 (patch) | |
| tree | fae81b9031f5ae0fb07d0f3e61eb83946bbc26b1 /OpenSim/Region/CoreModules/World/WorldMap | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revert my two quick fixes for the lag issue and put in the real fix, which (diff) | |
| download | opensim-SC_OLD-54fc78013d1eb946551656849e7007427ef4aec3.zip opensim-SC_OLD-54fc78013d1eb946551656849e7007427ef4aec3.tar.gz opensim-SC_OLD-54fc78013d1eb946551656849e7007427ef4aec3.tar.bz2 opensim-SC_OLD-54fc78013d1eb946551656849e7007427ef4aec3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index a4210b2..4ebfb21 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
| @@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 288 | /// <returns></returns> | 288 | /// <returns></returns> |
| 289 | public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq) | 289 | public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq) |
| 290 | { | 290 | { |
| 291 | m_log.DebugFormat("[WORLD MAP]: MapLayer Request in region: {0}", m_scene.RegionInfo.RegionName); | 291 | // m_log.DebugFormat("[WORLD MAP]: MapLayer Request in region: {0}", m_scene.RegionInfo.RegionName); |
| 292 | LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); | 292 | LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); |
| 293 | mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse()); | 293 | mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse()); |
| 294 | return mapResponse; | 294 | return mapResponse; |
| @@ -373,7 +373,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 373 | public virtual void HandleMapItemRequest(IClientAPI remoteClient, uint flags, | 373 | public virtual void HandleMapItemRequest(IClientAPI remoteClient, uint flags, |
| 374 | uint EstateID, bool godlike, uint itemtype, ulong regionhandle) | 374 | uint EstateID, bool godlike, uint itemtype, ulong regionhandle) |
| 375 | { | 375 | { |
| 376 | m_log.DebugFormat("[WORLD MAP]: Handle MapItem request {0} {1}", regionhandle, itemtype); | 376 | // m_log.DebugFormat("[WORLD MAP]: Handle MapItem request {0} {1}", regionhandle, itemtype); |
| 377 | 377 | ||
| 378 | lock (m_rootAgents) | 378 | lock (m_rootAgents) |
| 379 | { | 379 | { |