diff options
author | Justin Clark-Casey (justincc) | 2010-03-12 23:21:45 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-03-12 23:21:45 +0000 |
commit | 4b813932745775ef585a2cbca99233e57d20e13e (patch) | |
tree | b2086676f98296fe13fd2ec98477ca5089b4dcbc /OpenSim/Services/GridService | |
parent | refactor: Move another RezSingleAttachment() from Scene.Inventory to Attachme... (diff) | |
download | opensim-SC-4b813932745775ef585a2cbca99233e57d20e13e.zip opensim-SC-4b813932745775ef585a2cbca99233e57d20e13e.tar.gz opensim-SC-4b813932745775ef585a2cbca99233e57d20e13e.tar.bz2 opensim-SC-4b813932745775ef585a2cbca99233e57d20e13e.tar.xz |
minor: remove some mono compiler warnings
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 6 | ||||
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 1368e46..2faf018 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -123,8 +123,7 @@ namespace OpenSim.Services.GridService | |||
123 | if ((rflags & OpenSim.Data.RegionFlags.Reservation) != 0) | 123 | if ((rflags & OpenSim.Data.RegionFlags.Reservation) != 0) |
124 | { | 124 | { |
125 | // Regions reserved for the null key cannot be taken. | 125 | // Regions reserved for the null key cannot be taken. |
126 | // | 126 | if ((string)region.Data["PrincipalID"] == UUID.Zero.ToString()) |
127 | if (region.Data["PrincipalID"] == UUID.Zero.ToString()) | ||
128 | return "Region location us reserved"; | 127 | return "Region location us reserved"; |
129 | 128 | ||
130 | // Treat it as an auth request | 129 | // Treat it as an auth request |
@@ -132,7 +131,6 @@ namespace OpenSim.Services.GridService | |||
132 | // NOTE: Fudging the flags value here, so these flags | 131 | // NOTE: Fudging the flags value here, so these flags |
133 | // should not be used elsewhere. Don't optimize | 132 | // should not be used elsewhere. Don't optimize |
134 | // this with the later retrieval of the same flags! | 133 | // this with the later retrieval of the same flags! |
135 | // | ||
136 | rflags |= OpenSim.Data.RegionFlags.Authenticate; | 134 | rflags |= OpenSim.Data.RegionFlags.Authenticate; |
137 | } | 135 | } |
138 | 136 | ||
@@ -489,7 +487,7 @@ namespace OpenSim.Services.GridService | |||
489 | f |= (OpenSim.Data.RegionFlags)val; | 487 | f |= (OpenSim.Data.RegionFlags)val; |
490 | } | 488 | } |
491 | } | 489 | } |
492 | catch (Exception e) | 490 | catch (Exception) |
493 | { | 491 | { |
494 | MainConsole.Instance.Output("Error in flag specification: " + p); | 492 | MainConsole.Instance.Output("Error in flag specification: " + p); |
495 | } | 493 | } |
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index de5df9d..58746d0 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -168,10 +168,11 @@ namespace OpenSim.Services.GridService | |||
168 | } | 168 | } |
169 | 169 | ||
170 | // Sanity check. | 170 | // Sanity check. |
171 | IPAddress ipaddr = null; | 171 | //IPAddress ipaddr = null; |
172 | try | 172 | try |
173 | { | 173 | { |
174 | ipaddr = Util.GetHostFromDNS(host); | 174 | //ipaddr = Util.GetHostFromDNS(host); |
175 | Util.GetHostFromDNS(host); | ||
175 | } | 176 | } |
176 | catch | 177 | catch |
177 | { | 178 | { |