diff options
author | Justin Clarke Casey | 2008-11-25 15:41:42 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-25 15:41:42 +0000 |
commit | fbf90b1ecec7bf26bb0e948f34877bb049e6f333 (patch) | |
tree | bb1d806504679edbcf9ac51122dc83551bfa7987 /OpenSim/Region/Communications | |
parent | made the messaging server OpenMessage_Main constructor public (from private) ... (diff) | |
download | opensim-SC-fbf90b1ecec7bf26bb0e948f34877bb049e6f333.zip opensim-SC-fbf90b1ecec7bf26bb0e948f34877bb049e6f333.tar.gz opensim-SC-fbf90b1ecec7bf26bb0e948f34877bb049e6f333.tar.bz2 opensim-SC-fbf90b1ecec7bf26bb0e948f34877bb049e6f333.tar.xz |
* minor: eliminate mono compiler warnings
Diffstat (limited to '')
3 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs index 5433e41..d05a1d1 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | |||
@@ -527,10 +527,10 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
527 | 527 | ||
528 | public bool InformRegionOfUser(RegionInfo regInfo, AgentCircuitData agentData) | 528 | public bool InformRegionOfUser(RegionInfo regInfo, AgentCircuitData agentData) |
529 | { | 529 | { |
530 | ulong regionHandle = regInfo.RegionHandle; | 530 | //ulong regionHandle = regInfo.RegionHandle; |
531 | try | 531 | try |
532 | { | 532 | { |
533 | regionHandle = Convert.ToUInt64(regInfo.regionSecret); | 533 | //regionHandle = Convert.ToUInt64(regInfo.regionSecret); |
534 | m_log.Info("[HGrid]: InformRegionOfUser: Remote hyperlinked region " + regInfo.regionSecret); | 534 | m_log.Info("[HGrid]: InformRegionOfUser: Remote hyperlinked region " + regInfo.regionSecret); |
535 | } | 535 | } |
536 | catch | 536 | catch |
@@ -883,7 +883,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
883 | if (regInfo == null) | 883 | if (regInfo == null) |
884 | return false; | 884 | return false; |
885 | 885 | ||
886 | ulong realHandle = regionHandle; | 886 | //ulong realHandle = regionHandle; |
887 | 887 | ||
888 | CachedUserInfo uinfo = m_userProfileCache.GetUserDetails(agentData.AgentID); | 888 | CachedUserInfo uinfo = m_userProfileCache.GetUserDetails(agentData.AgentID); |
889 | if ((uinfo == null) || !IsGoingHome(uinfo, regInfo)) | 889 | if ((uinfo == null) || !IsGoingHome(uinfo, regInfo)) |
diff --git a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs index 9ef040b..136fea1 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs | |||
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
46 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | private string _inventoryServerUrl; | 48 | private string _inventoryServerUrl; |
49 | private Uri m_Uri; | 49 | //private Uri m_Uri; |
50 | private UserProfileCacheService m_userProfileCache; | 50 | private UserProfileCacheService m_userProfileCache; |
51 | private bool m_gridmode = false; | 51 | private bool m_gridmode = false; |
52 | 52 | ||
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
61 | public HGInventoryService(string inventoryServerUrl, UserProfileCacheService userProfileCacheService, bool gridmode) | 61 | public HGInventoryService(string inventoryServerUrl, UserProfileCacheService userProfileCacheService, bool gridmode) |
62 | { | 62 | { |
63 | _inventoryServerUrl = HGNetworkServersInfo.ServerURI(inventoryServerUrl); | 63 | _inventoryServerUrl = HGNetworkServersInfo.ServerURI(inventoryServerUrl); |
64 | m_Uri = new Uri(_inventoryServerUrl); | 64 | //m_Uri = new Uri(_inventoryServerUrl); |
65 | m_userProfileCache = userProfileCacheService; | 65 | m_userProfileCache = userProfileCacheService; |
66 | m_gridmode = gridmode; | 66 | m_gridmode = gridmode; |
67 | } | 67 | } |
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs index d9b44a1..0ac39e9 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | |||
@@ -47,14 +47,14 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
47 | /// </summary> | 47 | /// </summary> |
48 | public class HGUserServices : IUserService, IAvatarService, IMessagingService | 48 | public class HGUserServices : IUserService, IAvatarService, IMessagingService |
49 | { | 49 | { |
50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
51 | 51 | ||
52 | private HGCommunicationsGridMode m_parent; | 52 | //private HGCommunicationsGridMode m_parent; |
53 | private OGS1UserServices m_remoteUserServices; | 53 | private OGS1UserServices m_remoteUserServices; |
54 | 54 | ||
55 | public HGUserServices(HGCommunicationsGridMode parent) | 55 | public HGUserServices(HGCommunicationsGridMode parent) |
56 | { | 56 | { |
57 | m_parent = parent; | 57 | //m_parent = parent; |
58 | m_remoteUserServices = new OGS1UserServices(parent); | 58 | m_remoteUserServices = new OGS1UserServices(parent); |
59 | } | 59 | } |
60 | 60 | ||