diff options
author | dr scofield (aka dirk husemann) | 2009-09-02 09:43:22 +0200 |
---|---|---|
committer | dr scofield (aka dirk husemann) | 2009-09-02 11:06:18 +0200 |
commit | 05756e1fb96aa47f9ff111dd04499934c7077731 (patch) | |
tree | 063fa95f8d445cc53c32c607e7e8d3778f1f14a9 /OpenSim/Region/CoreModules | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC_OLD-05756e1fb96aa47f9ff111dd04499934c7077731.zip opensim-SC_OLD-05756e1fb96aa47f9ff111dd04499934c7077731.tar.gz opensim-SC_OLD-05756e1fb96aa47f9ff111dd04499934c7077731.tar.bz2 opensim-SC_OLD-05756e1fb96aa47f9ff111dd04499934c7077731.tar.xz |
warnings safari.
Diffstat (limited to 'OpenSim/Region/CoreModules')
3 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 1696d82..066c5d3 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -93,13 +93,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
93 | string userFirstName = "Jock"; | 93 | string userFirstName = "Jock"; |
94 | string userLastName = "Stirrup"; | 94 | string userLastName = "Stirrup"; |
95 | UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); | 95 | UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); |
96 | CachedUserInfo userInfo; | 96 | // CachedUserInfo userInfo; |
97 | 97 | ||
98 | lock (this) | 98 | lock (this) |
99 | { | 99 | { |
100 | userInfo | 100 | UserProfileTestUtils.CreateUserWithInventory( |
101 | = UserProfileTestUtils.CreateUserWithInventory( | 101 | cm, userFirstName, userLastName, userId, InventoryReceived); |
102 | cm, userFirstName, userLastName, userId, InventoryReceived); | ||
103 | Monitor.Wait(this, 60000); | 102 | Monitor.Wait(this, 60000); |
104 | } | 103 | } |
105 | 104 | ||
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index bb06996..2701f60 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -44,7 +44,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
44 | #region Member Variables | 44 | #region Member Variables |
45 | 45 | ||
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | #pragma warning disable 0429 | ||
47 | private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64; | 48 | private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64; |
49 | #pragma warning restore 0429 | ||
48 | private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax]; | 50 | private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax]; |
49 | 51 | ||
50 | protected LandData m_landData = new LandData(); | 52 | protected LandData m_landData = new LandData(); |
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index 6a5317b..c525227 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | |||
@@ -658,8 +658,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
658 | 658 | ||
659 | public class LargeLandChannel : ILandChannel | 659 | public class LargeLandChannel : ILandChannel |
660 | { | 660 | { |
661 | private static readonly ILog m_log = | 661 | // private static readonly ILog m_log = |
662 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 662 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
663 | private RegionData RegData; | 663 | private RegionData RegData; |
664 | private ILandChannel RootRegionLandChannel; | 664 | private ILandChannel RootRegionLandChannel; |
665 | private readonly List<RegionData> RegionConnections; | 665 | private readonly List<RegionData> RegionConnections; |