diff options
author | Mic Bowman | 2011-08-26 15:23:46 -0700 |
---|---|---|
committer | Mic Bowman | 2011-08-26 15:23:46 -0700 |
commit | 23f10f1d22d5ecf542119e39503230994c521bf0 (patch) | |
tree | 2498e8cccf2ed398052dfa53e9a1faf6e998d039 /OpenSim/Region/CoreModules/World | |
parent | Merge branch 'master' into bulletsim (diff) | |
parent | refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar (diff) | |
download | opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.zip opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.tar.gz opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.tar.bz2 opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.tar.xz |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
3 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 7554e12..2117827 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -743,7 +743,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
743 | // Corner case. If an autoreturn happens during sim startup | 743 | // Corner case. If an autoreturn happens during sim startup |
744 | // we will come here with the list uninitialized | 744 | // we will come here with the list uninitialized |
745 | // | 745 | // |
746 | int landId = m_landIDList[x, y]; | 746 | // int landId = m_landIDList[x, y]; |
747 | 747 | ||
748 | // if (landId == 0) | 748 | // if (landId == 0) |
749 | // m_log.DebugFormat( | 749 | // m_log.DebugFormat( |
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs index dca842a..efede5c 100644 --- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
51 | 51 | ||
52 | public class PrimCountModule : IPrimCountModule, INonSharedRegionModule | 52 | public class PrimCountModule : IPrimCountModule, INonSharedRegionModule |
53 | { | 53 | { |
54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | private Scene m_Scene; | 56 | private Scene m_Scene; |
57 | private Dictionary<UUID, PrimCounts> m_PrimCounts = | 57 | private Dictionary<UUID, PrimCounts> m_PrimCounts = |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 710230a..857079c 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -435,7 +435,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
435 | List<ILandObject> parcels = landChannel.AllParcels(); | 435 | List<ILandObject> parcels = landChannel.AllParcels(); |
436 | 436 | ||
437 | // Local Map Item Request | 437 | // Local Map Item Request |
438 | int tc = Environment.TickCount; | ||
439 | List<mapItemReply> mapitems = new List<mapItemReply>(); | 438 | List<mapItemReply> mapitems = new List<mapItemReply>(); |
440 | mapItemReply mapitem = new mapItemReply(); | 439 | mapItemReply mapitem = new mapItemReply(); |
441 | if ((parcels != null) && (parcels.Count >= 1)) | 440 | if ((parcels != null) && (parcels.Count >= 1)) |