diff options
| author | Justin Clark-Casey (justincc) | 2010-08-14 00:58:12 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-14 00:58:12 +0100 |
| commit | e1cff5f8c9a482b4de1017cf88e4be260109a40d (patch) | |
| tree | 0089cc54cbf8ee887a2608739b4107537958c839 /OpenSim | |
| parent | In EventQueueHelper.uintToByteArray, fetch big end-ian bytes directly from li... (diff) | |
| parent | * Fixed a casing typo for Simian profile data (diff) | |
| download | opensim-SC-e1cff5f8c9a482b4de1017cf88e4be260109a40d.zip opensim-SC-e1cff5f8c9a482b4de1017cf88e4be260109a40d.tar.gz opensim-SC-e1cff5f8c9a482b4de1017cf88e4be260109a40d.tar.bz2 opensim-SC-e1cff5f8c9a482b4de1017cf88e4be260109a40d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 7a420e4..616b5a7 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
| @@ -184,7 +184,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 184 | } | 184 | } |
| 185 | catch (Exception ex) | 185 | catch (Exception ex) |
| 186 | { | 186 | { |
| 187 | m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); | 187 | m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset HEAD from " + url + " failed: " + ex.Message); |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | return metadata; | 190 | return metadata; |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs index 704790e..d30d880 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | |||
| @@ -326,7 +326,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 326 | try | 326 | try |
| 327 | { | 327 | { |
| 328 | interests = OSDParser.DeserializeJson(user["LLInterests"].AsString()) as OSDMap; | 328 | interests = OSDParser.DeserializeJson(user["LLInterests"].AsString()) as OSDMap; |
| 329 | client.SendAvatarInterestsReply(avatarID, interests["WantMask"].AsUInteger(), interests["WantText"].AsString(), interests["SkillsMask"].AsUInteger(), interests["SkillsText"].AsString(), interests["languages"].AsString()); | 329 | client.SendAvatarInterestsReply(avatarID, interests["WantMask"].AsUInteger(), interests["WantText"].AsString(), interests["SkillsMask"].AsUInteger(), interests["SkillsText"].AsString(), interests["Languages"].AsString()); |
| 330 | } | 330 | } |
| 331 | catch { } | 331 | catch { } |
| 332 | } | 332 | } |