diff options
author | Justin Clark-Casey (justincc) | 2010-08-13 23:28:28 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-13 23:28:28 +0100 |
commit | 8acb401a1455430336c41ac9becb0c16390612f0 (patch) | |
tree | e3de4e8562741c8419b4d7bfafae707d84dd5df0 /OpenSim/Region | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC-8acb401a1455430336c41ac9becb0c16390612f0.zip opensim-SC-8acb401a1455430336c41ac9becb0c16390612f0.tar.gz opensim-SC-8acb401a1455430336c41ac9becb0c16390612f0.tar.bz2 opensim-SC-8acb401a1455430336c41ac9becb0c16390612f0.tar.xz |
minor: remove mono compiler warnings
Diffstat (limited to 'OpenSim/Region')
10 files changed, 62 insertions, 63 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index ab1cfc3..364d340 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -1265,18 +1265,18 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1265 | return handles; | 1265 | return handles; |
1266 | } | 1266 | } |
1267 | 1267 | ||
1268 | private void Dump(string msg, List<ulong> handles) | 1268 | // private void Dump(string msg, List<ulong> handles) |
1269 | { | 1269 | // { |
1270 | m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg); | 1270 | // m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg); |
1271 | foreach (ulong handle in handles) | 1271 | // foreach (ulong handle in handles) |
1272 | { | 1272 | // { |
1273 | uint x, y; | 1273 | // uint x, y; |
1274 | Utils.LongToUInts(handle, out x, out y); | 1274 | // Utils.LongToUInts(handle, out x, out y); |
1275 | x = x / Constants.RegionSize; | 1275 | // x = x / Constants.RegionSize; |
1276 | y = y / Constants.RegionSize; | 1276 | // y = y / Constants.RegionSize; |
1277 | m_log.InfoFormat("({0}, {1})", x, y); | 1277 | // m_log.InfoFormat("({0}, {1})", x, y); |
1278 | } | 1278 | // } |
1279 | } | 1279 | // } |
1280 | 1280 | ||
1281 | #endregion | 1281 | #endregion |
1282 | 1282 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs index b13b9d8..ccb892e 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs | |||
@@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
95 | try | 95 | try |
96 | { | 96 | { |
97 | asset1.ID = url + "/" + asset.ID; | 97 | asset1.ID = url + "/" + asset.ID; |
98 | UUID temp = UUID.Zero; | 98 | // UUID temp = UUID.Zero; |
99 | // TODO: if the creator is local, stick this grid's URL in front | 99 | // TODO: if the creator is local, stick this grid's URL in front |
100 | //if (UUID.TryParse(asset.Metadata.CreatorID, out temp)) | 100 | //if (UUID.TryParse(asset.Metadata.CreatorID, out temp)) |
101 | // asset1.Metadata.CreatorID = ??? + "/" + asset.Metadata.CreatorID; | 101 | // asset1.Metadata.CreatorID = ??? + "/" + asset.Metadata.CreatorID; |
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 8ccc941..c673b31 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
54 | get { return m_assMapper; } | 54 | get { return m_assMapper; } |
55 | } | 55 | } |
56 | 56 | ||
57 | private bool m_Initialized = false; | 57 | // private bool m_Initialized = false; |
58 | 58 | ||
59 | #region INonSharedRegionModule | 59 | #region INonSharedRegionModule |
60 | 60 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs index 9c20d68..d570608 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
51 | private static bool m_HasRunOnce = false; | 51 | private static bool m_HasRunOnce = false; |
52 | 52 | ||
53 | private bool m_Enabled = false; | 53 | private bool m_Enabled = false; |
54 | private string m_LibraryName = "OpenSim Library"; | 54 | // private string m_LibraryName = "OpenSim Library"; |
55 | private Scene m_Scene; | 55 | private Scene m_Scene; |
56 | 56 | ||
57 | private ILibraryService m_Library; | 57 | private ILibraryService m_Library; |
@@ -212,13 +212,13 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
212 | } | 212 | } |
213 | } | 213 | } |
214 | 214 | ||
215 | private void DumpLibrary() | 215 | // private void DumpLibrary() |
216 | { | 216 | // { |
217 | InventoryFolderImpl lib = m_Library.LibraryRootFolder; | 217 | // InventoryFolderImpl lib = m_Library.LibraryRootFolder; |
218 | 218 | // | |
219 | m_log.DebugFormat(" - folder {0}", lib.Name); | 219 | // m_log.DebugFormat(" - folder {0}", lib.Name); |
220 | DumpFolder(lib); | 220 | // DumpFolder(lib); |
221 | } | 221 | // } |
222 | // | 222 | // |
223 | // private void DumpLibrary() | 223 | // private void DumpLibrary() |
224 | // { | 224 | // { |
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index e95d2f8..87a0a8d 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
91 | private string httpsCN = ""; | 91 | private string httpsCN = ""; |
92 | private bool httpSSL = false; | 92 | private bool httpSSL = false; |
93 | private uint httpsslport = 0; | 93 | private uint httpsslport = 0; |
94 | private bool GridMode = false; | 94 | // private bool GridMode = false; |
95 | 95 | ||
96 | #region IRegionModule Members | 96 | #region IRegionModule Members |
97 | 97 | ||
@@ -126,10 +126,10 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
126 | 126 | ||
127 | } | 127 | } |
128 | 128 | ||
129 | if (startupcfg != null) | 129 | // if (startupcfg != null) |
130 | { | 130 | // { |
131 | GridMode = enabled = startupcfg.GetBoolean("gridmode", false); | 131 | // GridMode = enabled = startupcfg.GetBoolean("gridmode", false); |
132 | } | 132 | // } |
133 | 133 | ||
134 | if (cfg != null) | 134 | if (cfg != null) |
135 | { | 135 | { |
@@ -1213,18 +1213,19 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
1213 | } | 1213 | } |
1214 | } | 1214 | } |
1215 | 1215 | ||
1216 | private string CreateRandomStr(int len) | 1216 | // private string CreateRandomStr(int len) |
1217 | { | 1217 | // { |
1218 | Random rnd = new Random(Environment.TickCount); | 1218 | // Random rnd = new Random(Environment.TickCount); |
1219 | string returnstring = ""; | 1219 | // string returnstring = ""; |
1220 | string chars = "abcdefghijklmnopqrstuvwxyz0123456789"; | 1220 | // string chars = "abcdefghijklmnopqrstuvwxyz0123456789"; |
1221 | 1221 | // | |
1222 | for (int i = 0; i < len; i++) | 1222 | // for (int i = 0; i < len; i++) |
1223 | { | 1223 | // { |
1224 | returnstring += chars.Substring(rnd.Next(chars.Length), 1); | 1224 | // returnstring += chars.Substring(rnd.Next(chars.Length), 1); |
1225 | } | 1225 | // } |
1226 | return returnstring; | 1226 | // return returnstring; |
1227 | } | 1227 | // } |
1228 | |||
1228 | // Temporary hack to allow teleporting to and from Vaak | 1229 | // Temporary hack to allow teleporting to and from Vaak |
1229 | private static bool customXertificateValidation(object sender, X509Certificate cert, X509Chain chain, SslPolicyErrors error) | 1230 | private static bool customXertificateValidation(object sender, X509Certificate cert, X509Chain chain, SslPolicyErrors error) |
1230 | { | 1231 | { |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index aa3b30d..153aeec 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | |||
@@ -32,7 +32,6 @@ using System.Reflection; | |||
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Statistics; | 34 | using OpenSim.Framework.Statistics; |
35 | |||
36 | using OpenSim.Services.Connectors; | 35 | using OpenSim.Services.Connectors; |
37 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
@@ -48,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
48 | 47 | ||
49 | private bool m_Enabled = false; | 48 | private bool m_Enabled = false; |
50 | private bool m_Initialized = false; | 49 | private bool m_Initialized = false; |
51 | private Scene m_Scene; | 50 | // private Scene m_Scene; |
52 | private InventoryServicesConnector m_RemoteConnector; | 51 | private InventoryServicesConnector m_RemoteConnector; |
53 | 52 | ||
54 | public Type ReplaceableInterface | 53 | public Type ReplaceableInterface |
@@ -105,7 +104,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
105 | 104 | ||
106 | public void AddRegion(Scene scene) | 105 | public void AddRegion(Scene scene) |
107 | { | 106 | { |
108 | m_Scene = scene; | 107 | // m_Scene = scene; |
109 | //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName); | 108 | //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName); |
110 | 109 | ||
111 | if (!m_Enabled) | 110 | if (!m_Enabled) |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 277060d..ada26cc 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |||
@@ -32,7 +32,6 @@ using System.Reflection; | |||
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Statistics; | 34 | using OpenSim.Framework.Statistics; |
35 | |||
36 | using OpenSim.Services.Connectors; | 35 | using OpenSim.Services.Connectors; |
37 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
@@ -48,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
48 | 47 | ||
49 | private bool m_Enabled = false; | 48 | private bool m_Enabled = false; |
50 | private bool m_Initialized = false; | 49 | private bool m_Initialized = false; |
51 | private Scene m_Scene; | 50 | // private Scene m_Scene; |
52 | private XInventoryServicesConnector m_RemoteConnector; | 51 | private XInventoryServicesConnector m_RemoteConnector; |
53 | 52 | ||
54 | public Type ReplaceableInterface | 53 | public Type ReplaceableInterface |
@@ -109,7 +108,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
109 | 108 | ||
110 | public void AddRegion(Scene scene) | 109 | public void AddRegion(Scene scene) |
111 | { | 110 | { |
112 | m_Scene = scene; | 111 | // m_Scene = scene; |
113 | //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName); | 112 | //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName); |
114 | 113 | ||
115 | if (!m_Enabled) | 114 | if (!m_Enabled) |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 31aa017..15dc301 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -139,12 +139,12 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
139 | { | 139 | { |
140 | } | 140 | } |
141 | 141 | ||
142 | private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason) | 142 | // private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason) |
143 | { | 143 | // { |
144 | ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y); | 144 | // ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y); |
145 | reason = "You are not allowed to enter this sim."; | 145 | // reason = "You are not allowed to enter this sim."; |
146 | return nearestParcel != null; | 146 | // return nearestParcel != null; |
147 | } | 147 | // } |
148 | 148 | ||
149 | void EventManagerOnNewClient(IClientAPI client) | 149 | void EventManagerOnNewClient(IClientAPI client) |
150 | { | 150 | { |
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index b0ddd8f..62abd4c 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell | |||
44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BuySellModule")] | 44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BuySellModule")] |
45 | public class BuySellModule : IBuySellModule, INonSharedRegionModule | 45 | public class BuySellModule : IBuySellModule, INonSharedRegionModule |
46 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | protected Scene m_scene = null; | 49 | protected Scene m_scene = null; |
50 | protected IDialogModule m_dialogModule; | 50 | protected IDialogModule m_dialogModule; |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index a1a4f9e..9f88517 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
@@ -138,14 +138,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
138 | remoteClient.SendMapBlock(blocks, 2); | 138 | remoteClient.SendMapBlock(blocks, 2); |
139 | } | 139 | } |
140 | 140 | ||
141 | private Scene GetClientScene(IClientAPI client) | 141 | // private Scene GetClientScene(IClientAPI client) |
142 | { | 142 | // { |
143 | foreach (Scene s in m_scenes) | 143 | // foreach (Scene s in m_scenes) |
144 | { | 144 | // { |
145 | if (client.Scene.RegionInfo.RegionHandle == s.RegionInfo.RegionHandle) | 145 | // if (client.Scene.RegionInfo.RegionHandle == s.RegionInfo.RegionHandle) |
146 | return s; | 146 | // return s; |
147 | } | 147 | // } |
148 | return m_scene; | 148 | // return m_scene; |
149 | } | 149 | // } |
150 | } | 150 | } |
151 | } | 151 | } |