diff options
author | Justin Clark-Casey (justincc) | 2009-11-09 16:03:15 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-09 16:03:15 +0000 |
commit | a7af92d5d025b3d1522be94fea8c0f64237a352e (patch) | |
tree | 0cab63dd492ba65e73b8e65490f80136b757d4a2 | |
parent | refactor: make human iar escape char a constant rather than a magic char (diff) | |
download | opensim-SC-a7af92d5d025b3d1522be94fea8c0f64237a352e.zip opensim-SC-a7af92d5d025b3d1522be94fea8c0f64237a352e.tar.gz opensim-SC-a7af92d5d025b3d1522be94fea8c0f64237a352e.tar.bz2 opensim-SC-a7af92d5d025b3d1522be94fea8c0f64237a352e.tar.xz |
minor: remove some mono compiler warnings
Diffstat (limited to '')
5 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index 7456e8c..13fbb60 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | |||
@@ -144,8 +144,8 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
144 | /// <param name="j2kData">JPEG2000 data</param> | 144 | /// <param name="j2kData">JPEG2000 data</param> |
145 | private void DoJ2KDecode(UUID assetID, byte[] j2kData) | 145 | private void DoJ2KDecode(UUID assetID, byte[] j2kData) |
146 | { | 146 | { |
147 | int DecodeTime = 0; | 147 | // int DecodeTime = 0; |
148 | DecodeTime = Environment.TickCount; | 148 | // DecodeTime = Environment.TickCount; |
149 | OpenJPEG.J2KLayerInfo[] layers; | 149 | OpenJPEG.J2KLayerInfo[] layers; |
150 | 150 | ||
151 | if (!TryLoadCacheForAsset(assetID, out layers)) | 151 | if (!TryLoadCacheForAsset(assetID, out layers)) |
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index c6af806..adcf6bd 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -831,7 +831,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
831 | 831 | ||
832 | public string Store(AssetBase asset) | 832 | public string Store(AssetBase asset) |
833 | { | 833 | { |
834 | if ((asset.FullID == null) || (asset.FullID == UUID.Zero)) | 834 | if (asset.FullID == UUID.Zero) |
835 | { | 835 | { |
836 | asset.FullID = UUID.Random(); | 836 | asset.FullID = UUID.Random(); |
837 | } | 837 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs index 5c31c26..7e72ca0 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
41 | /// </summary> | 41 | /// </summary> |
42 | public static class InventoryArchiveUtils | 42 | public static class InventoryArchiveUtils |
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | // Character used for escaping the path delimter ("\/") and itself ("\\") in human escaped strings | 46 | // Character used for escaping the path delimter ("\/") and itself ("\\") in human escaped strings |
47 | public static readonly char ESCAPE_CHARACTER = '\\'; | 47 | public static readonly char ESCAPE_CHARACTER = '\\'; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs index 92db15b..b12d778 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs | |||
@@ -118,7 +118,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
118 | 118 | ||
119 | m_log.Info("[HypergridService]: Starting..."); | 119 | m_log.Info("[HypergridService]: Starting..."); |
120 | 120 | ||
121 | Object[] args = new Object[] { m_Config, MainServer.Instance }; | 121 | // Object[] args = new Object[] { m_Config, MainServer.Instance }; |
122 | 122 | ||
123 | m_HypergridHandler = new HypergridServiceInConnector(m_Config, MainServer.Instance, scene.RequestModuleInterface<IHyperlinkService>()); | 123 | m_HypergridHandler = new HypergridServiceInConnector(m_Config, MainServer.Instance, scene.RequestModuleInterface<IHyperlinkService>()); |
124 | //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args); | 124 | //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 9c04755..f2d8579 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | |||
@@ -336,7 +336,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
336 | public List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax) | 336 | public List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax) |
337 | { | 337 | { |
338 | int snapXmin = (int)(xmin / Constants.RegionSize) * (int)Constants.RegionSize; | 338 | int snapXmin = (int)(xmin / Constants.RegionSize) * (int)Constants.RegionSize; |
339 | int snapXmax = (int)(xmax / Constants.RegionSize) * (int)Constants.RegionSize; | 339 | // int snapXmax = (int)(xmax / Constants.RegionSize) * (int)Constants.RegionSize; |
340 | int snapYmin = (int)(ymin / Constants.RegionSize) * (int)Constants.RegionSize; | 340 | int snapYmin = (int)(ymin / Constants.RegionSize) * (int)Constants.RegionSize; |
341 | int snapYmax = (int)(ymax / Constants.RegionSize) * (int)Constants.RegionSize; | 341 | int snapYmax = (int)(ymax / Constants.RegionSize) * (int)Constants.RegionSize; |
342 | 342 | ||
@@ -613,7 +613,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
613 | m_log.Info("[HGrid]: Local user is going to foreign region or foreign user is going elsewhere"); | 613 | m_log.Info("[HGrid]: Local user is going to foreign region or foreign user is going elsewhere"); |
614 | 614 | ||
615 | // Set the position of the region on the remote grid | 615 | // Set the position of the region on the remote grid |
616 | ulong realHandle = FindRegionHandle(regInfo.RegionHandle); | 616 | // ulong realHandle = FindRegionHandle(regInfo.RegionHandle); |
617 | uint x = 0, y = 0; | 617 | uint x = 0, y = 0; |
618 | Utils.LongToUInts(regInfo.RegionHandle, out x, out y); | 618 | Utils.LongToUInts(regInfo.RegionHandle, out x, out y); |
619 | GridRegion clonedRegion = new GridRegion(regInfo); | 619 | GridRegion clonedRegion = new GridRegion(regInfo); |