OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some mono compiler warnings

0.7.4.1
Justin Clark-Casey (justincc) 2012-06-30 01:25:27 +01:00
parent a4551b027b
commit 1926de5a05
7 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Serialization/External/LandDataSerializer.cs vendored
View File

@ -42,7 +42,7 @@ namespace OpenSim.Framework.Serialization.External
/// </summary> /// </summary>
public class LandDataSerializer public class LandDataSerializer
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding(); protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();

2
OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs vendored
View File

@ -44,7 +44,7 @@ namespace OpenSim.Framework.Serialization.External
/// </summary> /// </summary>
public class UserInventoryItemSerializer public class UserInventoryItemSerializer
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors
= new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>(); = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>();

5
OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs
View File

@ -37,7 +37,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
public class BasicPhysicsPrim : PhysicsActor public class BasicPhysicsPrim : PhysicsActor
{ {
private Vector3 _size; private Vector3 _size;
private PrimitiveBaseShape _shape; // private PrimitiveBaseShape _shape;
public BasicPhysicsPrim( public BasicPhysicsPrim(
string name, uint localId, Vector3 position, Vector3 size, Quaternion orientation, PrimitiveBaseShape shape) string name, uint localId, Vector3 position, Vector3 size, Quaternion orientation, PrimitiveBaseShape shape)
@ -136,7 +136,8 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
public override PrimitiveBaseShape Shape public override PrimitiveBaseShape Shape
{ {
set { _shape = value; } // set { _shape = value; }
set {}
} }
public override float Mass public override float Mass

4
OpenSim/Server/Base/HttpServerBase.cs
View File

@ -40,9 +40,7 @@ namespace OpenSim.Server.Base
{ {
public class HttpServerBase : ServicesServerBase public class HttpServerBase : ServicesServerBase
{ {
// Logger // private static readonly ILog m_Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
//
private static readonly ILog m_Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private uint m_consolePort; private uint m_consolePort;

2
OpenSim/Services/HypergridService/GatekeeperService.cs
View File

@ -370,8 +370,6 @@ namespace OpenSim.Services.HypergridService
return false; return false;
} }
} }
return false;
} }
// Check that the service token was generated for *this* grid. // Check that the service token was generated for *this* grid.

26
OpenSim/Services/HypergridService/HGFriendsService.cs
View File

@ -276,19 +276,19 @@ namespace OpenSim.Services.HypergridService
} }
} }
// Lastly, let's notify the rest who may be online somewhere else // // Lastly, let's notify the rest who may be online somewhere else
foreach (string user in usersToBeNotified) // foreach (string user in usersToBeNotified)
{ // {
UUID id = new UUID(user); // UUID id = new UUID(user);
//m_UserAgentService.LocateUser(id); // //m_UserAgentService.LocateUser(id);
//etc... // //etc...
//if (m_TravelingAgents.ContainsKey(id) && m_TravelingAgents[id].GridExternalName != m_GridName) // //if (m_TravelingAgents.ContainsKey(id) && m_TravelingAgents[id].GridExternalName != m_GridName)
//{ // //{
// string url = m_TravelingAgents[id].GridExternalName; // // string url = m_TravelingAgents[id].GridExternalName;
// // forward // // // forward
//} // //}
//m_log.WarnFormat("[HGFRIENDS SERVICE]: User {0} is visiting another grid. HG Status notifications still not implemented.", user); // //m_log.WarnFormat("[HGFRIENDS SERVICE]: User {0} is visiting another grid. HG Status notifications still not implemented.", user);
} // }
// and finally, let's send the online friends // and finally, let's send the online friends
if (online) if (online)

4
OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
View File

@ -57,7 +57,7 @@ namespace OpenSim.Services.HypergridService
private string m_HomeURL; private string m_HomeURL;
private IUserAccountService m_UserAccountService; private IUserAccountService m_UserAccountService;
private UserAccountCache m_Cache; // private UserAccountCache m_Cache;
private ExpiringCache<UUID, List<XInventoryFolder>> m_SuitcaseTrees = new ExpiringCache<UUID, List<XInventoryFolder>>(); private ExpiringCache<UUID, List<XInventoryFolder>> m_SuitcaseTrees = new ExpiringCache<UUID, List<XInventoryFolder>>();
@ -92,7 +92,7 @@ namespace OpenSim.Services.HypergridService
// Preferred // Preferred
m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL); m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL);
m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); // m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
} }
m_log.Debug("[HG SUITCASE INVENTORY SERVICE]: Starting..."); m_log.Debug("[HG SUITCASE INVENTORY SERVICE]: Starting...");