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

* minor: eliminate mono compiler warnings

0.6.1-post-fixes
Justin Clarke Casey 2008-11-25 15:41:42 +00:00
parent 3223a4d16d
commit fbf90b1ece
7 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/LoginService.cs
View File

@ -118,7 +118,7 @@ namespace OpenSim.Framework.Communications
bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") &&
(requestData.Contains("passwd") || requestData.Contains("web_login_key"))); (requestData.Contains("passwd") || requestData.Contains("web_login_key")));
bool GoodLogin; //bool GoodLogin;
string startLocationRequest = "last"; string startLocationRequest = "last";

6
OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
View File

@ -527,10 +527,10 @@ namespace OpenSim.Region.Communications.Hypergrid
public bool InformRegionOfUser(RegionInfo regInfo, AgentCircuitData agentData) public bool InformRegionOfUser(RegionInfo regInfo, AgentCircuitData agentData)
{ {
ulong regionHandle = regInfo.RegionHandle; //ulong regionHandle = regInfo.RegionHandle;
try try
{ {
regionHandle = Convert.ToUInt64(regInfo.regionSecret); //regionHandle = Convert.ToUInt64(regInfo.regionSecret);
m_log.Info("[HGrid]: InformRegionOfUser: Remote hyperlinked region " + regInfo.regionSecret); m_log.Info("[HGrid]: InformRegionOfUser: Remote hyperlinked region " + regInfo.regionSecret);
} }
catch catch
@ -883,7 +883,7 @@ namespace OpenSim.Region.Communications.Hypergrid
if (regInfo == null) if (regInfo == null)
return false; return false;
ulong realHandle = regionHandle; //ulong realHandle = regionHandle;
CachedUserInfo uinfo = m_userProfileCache.GetUserDetails(agentData.AgentID); CachedUserInfo uinfo = m_userProfileCache.GetUserDetails(agentData.AgentID);
if ((uinfo == null) || !IsGoingHome(uinfo, regInfo)) if ((uinfo == null) || !IsGoingHome(uinfo, regInfo))

4
OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
View File

@ -46,7 +46,7 @@ namespace OpenSim.Region.Communications.Hypergrid
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string _inventoryServerUrl; private string _inventoryServerUrl;
private Uri m_Uri; //private Uri m_Uri;
private UserProfileCacheService m_userProfileCache; private UserProfileCacheService m_userProfileCache;
private bool m_gridmode = false; private bool m_gridmode = false;
@ -61,7 +61,7 @@ namespace OpenSim.Region.Communications.Hypergrid
public HGInventoryService(string inventoryServerUrl, UserProfileCacheService userProfileCacheService, bool gridmode) public HGInventoryService(string inventoryServerUrl, UserProfileCacheService userProfileCacheService, bool gridmode)
{ {
_inventoryServerUrl = HGNetworkServersInfo.ServerURI(inventoryServerUrl); _inventoryServerUrl = HGNetworkServersInfo.ServerURI(inventoryServerUrl);
m_Uri = new Uri(_inventoryServerUrl); //m_Uri = new Uri(_inventoryServerUrl);
m_userProfileCache = userProfileCacheService; m_userProfileCache = userProfileCacheService;
m_gridmode = gridmode; m_gridmode = gridmode;
} }

6
OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
View File

@ -47,14 +47,14 @@ namespace OpenSim.Region.Communications.Hypergrid
/// </summary> /// </summary>
public class HGUserServices : IUserService, IAvatarService, IMessagingService public class HGUserServices : IUserService, IAvatarService, IMessagingService
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private HGCommunicationsGridMode m_parent; //private HGCommunicationsGridMode m_parent;
private OGS1UserServices m_remoteUserServices; private OGS1UserServices m_remoteUserServices;
public HGUserServices(HGCommunicationsGridMode parent) public HGUserServices(HGCommunicationsGridMode parent)
{ {
m_parent = parent; //m_parent = parent;
m_remoteUserServices = new OGS1UserServices(parent); m_remoteUserServices = new OGS1UserServices(parent);
} }

5
OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid
private static bool enabled = false; private static bool enabled = false;
Scene m_scene; Scene m_scene;
AssetService m_assetService; //AssetService m_assetService;
#region IRegionModule interface #region IRegionModule interface
@ -75,7 +75,8 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid
{ {
m_log.Info("[HGStandaloneAssetService]: Starting..."); m_log.Info("[HGStandaloneAssetService]: Starting...");
m_assetService = new AssetService(m_scene); //m_assetService = new AssetService(m_scene);
new AssetService(m_scene);
} }
} }

5
OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs
View File

@ -52,7 +52,7 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid
private static bool enabled = false; private static bool enabled = false;
Scene m_scene; Scene m_scene;
InventoryService m_inventoryService; //InventoryService m_inventoryService;
#region IRegionModule interface #region IRegionModule interface
@ -73,7 +73,8 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid
if (enabled) if (enabled)
{ {
m_log.Info("[HGStandaloneInvService]: Starting..."); m_log.Info("[HGStandaloneInvService]: Starting...");
m_inventoryService = new InventoryService(m_scene); //m_inventoryService = new InventoryService(m_scene);
new InventoryService(m_scene);
} }
} }

2
OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs
View File

@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
private Dictionary<UUID, bool> SniffUUIDs(UUID assetID) private Dictionary<UUID, bool> SniffUUIDs(UUID assetID)
{ {
Dictionary<UUID, bool> uuids = new Dictionary<UUID, bool>(); //Dictionary<UUID, bool> uuids = new Dictionary<UUID, bool>();
AssetBase asset; AssetBase asset;
m_scene.CommsManager.AssetCache.TryGetCachedAsset(assetID, out asset); m_scene.CommsManager.AssetCache.TryGetCachedAsset(assetID, out asset);