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

minor: remove some mono compiler warnings

slimupdates
Justin Clark-Casey (justincc) 2010-03-12 23:21:45 +00:00
parent 315fa06c75
commit 4b81393274
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Services/GridService/GridService.cs
View File

@ -123,8 +123,7 @@ namespace OpenSim.Services.GridService
if ((rflags & OpenSim.Data.RegionFlags.Reservation) != 0) if ((rflags & OpenSim.Data.RegionFlags.Reservation) != 0)
{ {
// Regions reserved for the null key cannot be taken. // Regions reserved for the null key cannot be taken.
// if ((string)region.Data["PrincipalID"] == UUID.Zero.ToString())
if (region.Data["PrincipalID"] == UUID.Zero.ToString())
return "Region location us reserved"; return "Region location us reserved";
// Treat it as an auth request // Treat it as an auth request
@ -132,7 +131,6 @@ namespace OpenSim.Services.GridService
// NOTE: Fudging the flags value here, so these flags // NOTE: Fudging the flags value here, so these flags
// should not be used elsewhere. Don't optimize // should not be used elsewhere. Don't optimize
// this with the later retrieval of the same flags! // this with the later retrieval of the same flags!
//
rflags |= OpenSim.Data.RegionFlags.Authenticate; rflags |= OpenSim.Data.RegionFlags.Authenticate;
} }
@ -489,7 +487,7 @@ namespace OpenSim.Services.GridService
f |= (OpenSim.Data.RegionFlags)val; f |= (OpenSim.Data.RegionFlags)val;
} }
} }
catch (Exception e) catch (Exception)
{ {
MainConsole.Instance.Output("Error in flag specification: " + p); MainConsole.Instance.Output("Error in flag specification: " + p);
} }

5
OpenSim/Services/GridService/HypergridLinker.cs
View File

@ -168,10 +168,11 @@ namespace OpenSim.Services.GridService
} }
// Sanity check. // Sanity check.
IPAddress ipaddr = null; //IPAddress ipaddr = null;
try try
{ {
ipaddr = Util.GetHostFromDNS(host); //ipaddr = Util.GetHostFromDNS(host);
Util.GetHostFromDNS(host);
} }
catch catch
{ {