minor: resolve some mono compiler warnings
parent
c544f0d0c5
commit
3083c517a0
|
@ -849,7 +849,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
/// <param name="xferManager"></param>
|
/// <param name="xferManager"></param>
|
||||||
public void RequestInventoryFile(IClientAPI client, IXfer xferManager)
|
public void RequestInventoryFile(IClientAPI client, IXfer xferManager)
|
||||||
{
|
{
|
||||||
bool changed = CreateInventoryFile();
|
CreateInventoryFile();
|
||||||
|
|
||||||
if (m_inventorySerial == 0) // No inventory
|
if (m_inventorySerial == 0) // No inventory
|
||||||
{
|
{
|
||||||
|
|
|
@ -1108,7 +1108,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void CompleteMovement(IClientAPI client)
|
public void CompleteMovement(IClientAPI client)
|
||||||
{
|
{
|
||||||
DateTime startTime = DateTime.Now;
|
// DateTime startTime = DateTime.Now;
|
||||||
|
|
||||||
m_log.DebugFormat(
|
m_log.DebugFormat(
|
||||||
"[SCENE PRESENCE]: Completing movement of {0} into region {1}",
|
"[SCENE PRESENCE]: Completing movement of {0} into region {1}",
|
||||||
|
|
|
@ -303,7 +303,7 @@ namespace OpenSim.Services.HypergridService
|
||||||
return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
|
return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Object[] args = new Object[] { userURL };
|
// Object[] args = new Object[] { userURL };
|
||||||
IUserAgentService userAgentService = new UserAgentServiceConnector(userURL);
|
IUserAgentService userAgentService = new UserAgentServiceConnector(userURL);
|
||||||
if (userAgentService != null)
|
if (userAgentService != null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -53,7 +53,7 @@ namespace OpenSim.Services.HypergridService
|
||||||
LogManager.GetLogger(
|
LogManager.GetLogger(
|
||||||
MethodBase.GetCurrentMethod().DeclaringType);
|
MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
protected new IXInventoryData m_Database;
|
protected IXInventoryData m_Database;
|
||||||
|
|
||||||
private string m_ProfileServiceURL;
|
private string m_ProfileServiceURL;
|
||||||
private IUserAccountService m_UserAccountService;
|
private IUserAccountService m_UserAccountService;
|
||||||
|
|
|
@ -13,9 +13,10 @@ namespace OpenSim.Services.HypergridService
|
||||||
{
|
{
|
||||||
private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours!
|
private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours!
|
||||||
|
|
||||||
private static readonly ILog m_log =
|
// private static readonly ILog m_log =
|
||||||
LogManager.GetLogger(
|
// LogManager.GetLogger(
|
||||||
MethodBase.GetCurrentMethod().DeclaringType);
|
// MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
private ExpiringCache<UUID, UserAccount> m_UUIDCache;
|
private ExpiringCache<UUID, UserAccount> m_UUIDCache;
|
||||||
|
|
||||||
private IUserAccountService m_UserAccountService;
|
private IUserAccountService m_UserAccountService;
|
||||||
|
|
Loading…
Reference in New Issue