diff options
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs | 10 | ||||
-rw-r--r-- | OpenSim/Services/UserProfilesService/UserProfilesService.cs | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs index c0041e6..b5e6d69 100644 --- a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs | |||
@@ -84,16 +84,16 @@ namespace OpenSim.Services.Connectors | |||
84 | { | 84 | { |
85 | if (String.IsNullOrEmpty(m_ServerURI)) | 85 | if (String.IsNullOrEmpty(m_ServerURI)) |
86 | { | 86 | { |
87 | m_log.WarnFormat("[HELO SERVICE]: Unable to invoke HELO due to malformed URL"); | 87 | m_log.WarnFormat("[HELO SERVICE]: Unable to invoke HELO due to empty URL"); |
88 | return String.Empty; | 88 | return String.Empty; |
89 | } | 89 | } |
90 | 90 | ||
91 | HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI); | ||
92 | // Eventually we need to switch to HEAD | ||
93 | /* req.Method = "HEAD"; */ | ||
94 | |||
95 | try | 91 | try |
96 | { | 92 | { |
93 | HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI); | ||
94 | // Eventually we need to switch to HEAD | ||
95 | /* req.Method = "HEAD"; */ | ||
96 | |||
97 | using (WebResponse response = req.GetResponse()) | 97 | using (WebResponse response = req.GetResponse()) |
98 | { | 98 | { |
99 | if (response.Headers.Get("X-Handlers-Provided") == null) // just in case this ever returns a null | 99 | if (response.Headers.Get("X-Handlers-Provided") == null) // just in case this ever returns a null |
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs index 75101ff..96c13c0 100644 --- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs +++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs | |||
@@ -196,6 +196,9 @@ namespace OpenSim.Services.ProfilesService | |||
196 | 196 | ||
197 | public bool UserPreferencesRequest(ref UserPreferences pref, ref string result) | 197 | public bool UserPreferencesRequest(ref UserPreferences pref, ref string result) |
198 | { | 198 | { |
199 | if (!ProfilesData.GetUserPreferences(ref pref, ref result)) | ||
200 | return false; | ||
201 | |||
199 | if(string.IsNullOrEmpty(pref.EMail)) | 202 | if(string.IsNullOrEmpty(pref.EMail)) |
200 | { | 203 | { |
201 | UserAccount account = new UserAccount(); | 204 | UserAccount account = new UserAccount(); |
@@ -228,9 +231,6 @@ namespace OpenSim.Services.ProfilesService | |||
228 | return false; | 231 | return false; |
229 | } | 232 | } |
230 | } | 233 | } |
231 | if (!ProfilesData.GetUserPreferences (ref pref, ref result)) | ||
232 | return false; | ||
233 | |||
234 | 234 | ||
235 | if(string.IsNullOrEmpty(pref.EMail)) | 235 | if(string.IsNullOrEmpty(pref.EMail)) |
236 | pref.EMail = "No Email Address On Record"; | 236 | pref.EMail = "No Email Address On Record"; |