diff options
author | Jeff Ames | 2007-11-18 15:14:37 +0000 |
---|---|---|
committer | Jeff Ames | 2007-11-18 15:14:37 +0000 |
commit | 924026d01c1dd25218e9a4296eb27640091405f3 (patch) | |
tree | 7d9e8fcb28b0ce6090cc42c4754d5673bb2853c2 /OpenSim/Framework | |
parent | first stab at implementation of CopyInventoryItem (diff) | |
download | opensim-SC_OLD-924026d01c1dd25218e9a4296eb27640091405f3.zip opensim-SC_OLD-924026d01c1dd25218e9a4296eb27640091405f3.tar.gz opensim-SC_OLD-924026d01c1dd25218e9a4296eb27640091405f3.tar.bz2 opensim-SC_OLD-924026d01c1dd25218e9a4296eb27640091405f3.tar.xz |
cleaned up some mono compiler warnings
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 3a32ba9..cf82103 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -115,7 +115,7 @@ namespace OpenSim.Framework.UserManagement | |||
115 | pickerlist = plugin.Value.GeneratePickerResults(queryID, query); | 115 | pickerlist = plugin.Value.GeneratePickerResults(queryID, query); |
116 | 116 | ||
117 | } | 117 | } |
118 | catch (Exception e) | 118 | catch (Exception) |
119 | { | 119 | { |
120 | MainLog.Instance.Verbose("Unable to generate AgentPickerData via " + plugin.Key + "(" + query + ")"); | 120 | MainLog.Instance.Verbose("Unable to generate AgentPickerData via " + plugin.Key + "(" + query + ")"); |
121 | return new List<AvatarPickerAvatar>(); | 121 | return new List<AvatarPickerAvatar>(); |
@@ -326,7 +326,7 @@ namespace OpenSim.Framework.UserManagement | |||
326 | try | 326 | try |
327 | { | 327 | { |
328 | string[] parts = startLoc.Remove(0, 4).Split('&'); | 328 | string[] parts = startLoc.Remove(0, 4).Split('&'); |
329 | string region = parts[0]; | 329 | //string region = parts[0]; |
330 | 330 | ||
331 | //////////////////////////////////////////////////// | 331 | //////////////////////////////////////////////////// |
332 | //SimProfile SimInfo = new SimProfile(); | 332 | //SimProfile SimInfo = new SimProfile(); |
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index cfd15fc..7ef4205 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -301,7 +301,7 @@ namespace OpenSim.Framework | |||
301 | 301 | ||
302 | public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) | 302 | public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) |
303 | { | 303 | { |
304 | if (MasterAvatarAssignedUUID == null || MasterAvatarAssignedUUID.ToStringHyphenated() == LLUUID.Zero.ToStringHyphenated()) | 304 | if (MasterAvatarAssignedUUID.Equals(null) || MasterAvatarAssignedUUID.ToStringHyphenated() == LLUUID.Zero.ToStringHyphenated()) |
305 | { | 305 | { |
306 | return true; | 306 | return true; |
307 | } | 307 | } |