diff options
author | Oren Hurvitz | 2014-04-22 20:04:12 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-23 16:37:36 +0300 |
commit | 998d7009a65def0a4debc9369d35b63611db5b55 (patch) | |
tree | d1303dc0387ae9ce4ddb076d5ccc856f3d5844e0 /OpenSim/Services | |
parent | Workaround for SRAS: if Store Asset returns 'null' then assume the asset alre... (diff) | |
download | opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.zip opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.gz opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.bz2 opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.xz |
Eliminated many warnings
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 3 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/UserProfilesService/UserProfilesService.cs | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index bbf95ad..dec3d35 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -124,7 +124,10 @@ namespace OpenSim.Services.Interfaces | |||
124 | public class GridRegion | 124 | public class GridRegion |
125 | { | 125 | { |
126 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 126 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
127 | |||
128 | #pragma warning disable 414 | ||
127 | private static readonly string LogHeader = "[GRID REGION]"; | 129 | private static readonly string LogHeader = "[GRID REGION]"; |
130 | #pragma warning restore 414 | ||
128 | 131 | ||
129 | /// <summary> | 132 | /// <summary> |
130 | /// The port by which http communication occurs with the region | 133 | /// The port by which http communication occurs with the region |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 25c9417..5888cce 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -939,7 +939,7 @@ namespace OpenSim.Services.LLLoginService | |||
939 | if (!keyValue.EndsWith("/")) | 939 | if (!keyValue.EndsWith("/")) |
940 | keyValue = keyValue + "/"; | 940 | keyValue = keyValue + "/"; |
941 | 941 | ||
942 | if (!account.ServiceURLs.ContainsKey(keyName) || (account.ServiceURLs.ContainsKey(keyName) && account.ServiceURLs[keyName] != keyValue)) | 942 | if (!account.ServiceURLs.ContainsKey(keyName) || (account.ServiceURLs.ContainsKey(keyName) && (string)account.ServiceURLs[keyName] != keyValue)) |
943 | { | 943 | { |
944 | account.ServiceURLs[keyName] = keyValue; | 944 | account.ServiceURLs[keyName] = keyValue; |
945 | newUrls = true; | 945 | newUrls = true; |
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs index dd26cdc..c752055 100644 --- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs +++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs | |||
@@ -37,7 +37,6 @@ using OpenSim.Data; | |||
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenMetaverse.StructuredData; | 38 | using OpenMetaverse.StructuredData; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Services.UserAccountService; | ||
41 | 40 | ||
42 | namespace OpenSim.Services.ProfilesService | 41 | namespace OpenSim.Services.ProfilesService |
43 | { | 42 | { |