diff options
author | Oren Hurvitz | 2014-04-22 20:04:12 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-23 16:37:36 +0300 |
commit | 998d7009a65def0a4debc9369d35b63611db5b55 (patch) | |
tree | d1303dc0387ae9ce4ddb076d5ccc856f3d5844e0 /OpenSim/Region/CoreModules/World | |
parent | Workaround for SRAS: if Store Asset returns 'null' then assume the asset alre... (diff) | |
download | opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.zip opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.gz opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.bz2 opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.xz |
Eliminated many warnings
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
5 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 5ab97ff..fa5bfd6 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -848,8 +848,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
848 | /// </param> | 848 | /// </param> |
849 | private ILandObject GetLandObject(int x, int y, bool returnNullIfLandObjectOutsideBounds) | 849 | private ILandObject GetLandObject(int x, int y, bool returnNullIfLandObjectOutsideBounds) |
850 | { | 850 | { |
851 | ILandObject ret = null; | ||
852 | |||
853 | if (x >= m_scene.RegionInfo.RegionSizeX || y >= m_scene.RegionInfo.RegionSizeY || x < 0 || y < 0) | 851 | if (x >= m_scene.RegionInfo.RegionSizeX || y >= m_scene.RegionInfo.RegionSizeY || x < 0 || y < 0) |
854 | { | 852 | { |
855 | // These exceptions here will cause a lot of complaints from the users specifically because | 853 | // These exceptions here will cause a lot of complaints from the users specifically because |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 57fa4d9..b1cfc81 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -927,7 +927,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
927 | { | 927 | { |
928 | tempConvertMap[x, y] = bit; | 928 | tempConvertMap[x, y] = bit; |
929 | } | 929 | } |
930 | catch (Exception e) | 930 | catch (Exception) |
931 | { | 931 | { |
932 | m_log.DebugFormat("{0} ConvertBytestoLandBitmap: i={1}, x={2}, y={3}", LogHeader, i, x, y); | 932 | m_log.DebugFormat("{0} ConvertBytestoLandBitmap: i={1}, x={2}, y={3}", LogHeader, i, x, y); |
933 | } | 933 | } |
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs index b00620e..796a15f 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | |||
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
124 | { | 124 | { |
125 | mapbmp = new Bitmap(m_scene.RegionInfo.MaptileStaticFile); | 125 | mapbmp = new Bitmap(m_scene.RegionInfo.MaptileStaticFile); |
126 | } | 126 | } |
127 | catch (Exception e) | 127 | catch (Exception) |
128 | { | 128 | { |
129 | m_log.ErrorFormat( | 129 | m_log.ErrorFormat( |
130 | "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", | 130 | "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", |
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index 3fda67f..56ceffd 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |||
@@ -74,8 +74,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
74 | #endregion | 74 | #endregion |
75 | 75 | ||
76 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 76 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
77 | |||
78 | #pragma warning disable 414 | ||
77 | private static readonly string LogHeader = "[TERRAIN MODULE]"; | 79 | private static readonly string LogHeader = "[TERRAIN MODULE]"; |
78 | 80 | #pragma warning restore 414 | |
81 | |||
79 | private readonly Commander m_commander = new Commander("terrain"); | 82 | private readonly Commander m_commander = new Commander("terrain"); |
80 | 83 | ||
81 | private readonly Dictionary<StandardTerrainEffects, ITerrainFloodEffect> m_floodeffects = | 84 | private readonly Dictionary<StandardTerrainEffects, ITerrainFloodEffect> m_floodeffects = |
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 23dee56..700fd8f 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |||
@@ -61,7 +61,10 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
61 | private static readonly Color4 WATER_COLOR = new Color4(29, 72, 96, 216); | 61 | private static readonly Color4 WATER_COLOR = new Color4(29, 72, 96, 216); |
62 | 62 | ||
63 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 63 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
64 | |||
65 | #pragma warning disable 414 | ||
64 | private static string LogHeader = "[WARP 3D IMAGE MODULE]"; | 66 | private static string LogHeader = "[WARP 3D IMAGE MODULE]"; |
67 | #pragma warning restore 414 | ||
65 | 68 | ||
66 | private Scene m_scene; | 69 | private Scene m_scene; |
67 | private IRendering m_primMesher; | 70 | private IRendering m_primMesher; |