diff options
author | Justin Clark-Casey (justincc) | 2012-06-30 01:25:27 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-06-30 01:25:39 +0100 |
commit | 1926de5a0599051c27c065fb06da3dc536e6784a (patch) | |
tree | 11b8fe286f3e81c5ddfa0ff3de49d6b11737bba3 | |
parent | Removing unused handling of incoming create object by userID and itemID only. (diff) | |
download | opensim-SC_OLD-1926de5a0599051c27c065fb06da3dc536e6784a.zip opensim-SC_OLD-1926de5a0599051c27c065fb06da3dc536e6784a.tar.gz opensim-SC_OLD-1926de5a0599051c27c065fb06da3dc536e6784a.tar.bz2 opensim-SC_OLD-1926de5a0599051c27c065fb06da3dc536e6784a.tar.xz |
Remove some mono compiler warnings
7 files changed, 21 insertions, 24 deletions
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs index a12877a..e8d82d3 100644 --- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs +++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Serialization.External | |||
42 | /// </summary> | 42 | /// </summary> |
43 | public class LandDataSerializer | 43 | public class LandDataSerializer |
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding(); | 47 | protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding(); |
48 | 48 | ||
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs index 57da7ca..88f9581 100644 --- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs +++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Serialization.External | |||
44 | /// </summary> | 44 | /// </summary> |
45 | public class UserInventoryItemSerializer | 45 | public class UserInventoryItemSerializer |
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 | private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors | 49 | private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors |
50 | = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>(); | 50 | = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>(); |
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs index b89eeed..47d7df3 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
37 | public class BasicPhysicsPrim : PhysicsActor | 37 | public class BasicPhysicsPrim : PhysicsActor |
38 | { | 38 | { |
39 | private Vector3 _size; | 39 | private Vector3 _size; |
40 | private PrimitiveBaseShape _shape; | 40 | // private PrimitiveBaseShape _shape; |
41 | 41 | ||
42 | public BasicPhysicsPrim( | 42 | public BasicPhysicsPrim( |
43 | string name, uint localId, Vector3 position, Vector3 size, Quaternion orientation, PrimitiveBaseShape shape) | 43 | string name, uint localId, Vector3 position, Vector3 size, Quaternion orientation, PrimitiveBaseShape shape) |
@@ -136,7 +136,8 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
136 | 136 | ||
137 | public override PrimitiveBaseShape Shape | 137 | public override PrimitiveBaseShape Shape |
138 | { | 138 | { |
139 | set { _shape = value; } | 139 | // set { _shape = value; } |
140 | set {} | ||
140 | } | 141 | } |
141 | 142 | ||
142 | public override float Mass | 143 | public override float Mass |
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs index 7ba0ca8..29b1c00 100644 --- a/OpenSim/Server/Base/HttpServerBase.cs +++ b/OpenSim/Server/Base/HttpServerBase.cs | |||
@@ -40,9 +40,7 @@ namespace OpenSim.Server.Base | |||
40 | { | 40 | { |
41 | public class HttpServerBase : ServicesServerBase | 41 | public class HttpServerBase : ServicesServerBase |
42 | { | 42 | { |
43 | // Logger | 43 | // private static readonly ILog m_Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | // | ||
45 | private static readonly ILog m_Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
46 | 44 | ||
47 | private uint m_consolePort; | 45 | private uint m_consolePort; |
48 | 46 | ||
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 149a0ab..47d22b9 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -370,8 +370,6 @@ namespace OpenSim.Services.HypergridService | |||
370 | return false; | 370 | return false; |
371 | } | 371 | } |
372 | } | 372 | } |
373 | |||
374 | return false; | ||
375 | } | 373 | } |
376 | 374 | ||
377 | // Check that the service token was generated for *this* grid. | 375 | // Check that the service token was generated for *this* grid. |
diff --git a/OpenSim/Services/HypergridService/HGFriendsService.cs b/OpenSim/Services/HypergridService/HGFriendsService.cs index 39524ab..98423d7 100644 --- a/OpenSim/Services/HypergridService/HGFriendsService.cs +++ b/OpenSim/Services/HypergridService/HGFriendsService.cs | |||
@@ -276,19 +276,19 @@ namespace OpenSim.Services.HypergridService | |||
276 | } | 276 | } |
277 | } | 277 | } |
278 | 278 | ||
279 | // Lastly, let's notify the rest who may be online somewhere else | 279 | // // Lastly, let's notify the rest who may be online somewhere else |
280 | foreach (string user in usersToBeNotified) | 280 | // foreach (string user in usersToBeNotified) |
281 | { | 281 | // { |
282 | UUID id = new UUID(user); | 282 | // UUID id = new UUID(user); |
283 | //m_UserAgentService.LocateUser(id); | 283 | // //m_UserAgentService.LocateUser(id); |
284 | //etc... | 284 | // //etc... |
285 | //if (m_TravelingAgents.ContainsKey(id) && m_TravelingAgents[id].GridExternalName != m_GridName) | 285 | // //if (m_TravelingAgents.ContainsKey(id) && m_TravelingAgents[id].GridExternalName != m_GridName) |
286 | //{ | 286 | // //{ |
287 | // string url = m_TravelingAgents[id].GridExternalName; | 287 | // // string url = m_TravelingAgents[id].GridExternalName; |
288 | // // forward | 288 | // // // forward |
289 | //} | 289 | // //} |
290 | //m_log.WarnFormat("[HGFRIENDS SERVICE]: User {0} is visiting another grid. HG Status notifications still not implemented.", user); | 290 | // //m_log.WarnFormat("[HGFRIENDS SERVICE]: User {0} is visiting another grid. HG Status notifications still not implemented.", user); |
291 | } | 291 | // } |
292 | 292 | ||
293 | // and finally, let's send the online friends | 293 | // and finally, let's send the online friends |
294 | if (online) | 294 | if (online) |
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 53fbea6..6e4b68c 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Services.HypergridService | |||
57 | private string m_HomeURL; | 57 | private string m_HomeURL; |
58 | private IUserAccountService m_UserAccountService; | 58 | private IUserAccountService m_UserAccountService; |
59 | 59 | ||
60 | private UserAccountCache m_Cache; | 60 | // private UserAccountCache m_Cache; |
61 | 61 | ||
62 | private ExpiringCache<UUID, List<XInventoryFolder>> m_SuitcaseTrees = new ExpiringCache<UUID, List<XInventoryFolder>>(); | 62 | private ExpiringCache<UUID, List<XInventoryFolder>> m_SuitcaseTrees = new ExpiringCache<UUID, List<XInventoryFolder>>(); |
63 | 63 | ||
@@ -92,7 +92,7 @@ namespace OpenSim.Services.HypergridService | |||
92 | // Preferred | 92 | // Preferred |
93 | m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL); | 93 | m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL); |
94 | 94 | ||
95 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 95 | // m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
96 | } | 96 | } |
97 | 97 | ||
98 | m_log.Debug("[HG SUITCASE INVENTORY SERVICE]: Starting..."); | 98 | m_log.Debug("[HG SUITCASE INVENTORY SERVICE]: Starting..."); |