Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
e1cff5f8c9
|
@ -184,7 +184,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message);
|
||||
m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset HEAD from " + url + " failed: " + ex.Message);
|
||||
}
|
||||
|
||||
return metadata;
|
||||
|
|
|
@ -326,7 +326,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
try
|
||||
{
|
||||
interests = OSDParser.DeserializeJson(user["LLInterests"].AsString()) as OSDMap;
|
||||
client.SendAvatarInterestsReply(avatarID, interests["WantMask"].AsUInteger(), interests["WantText"].AsString(), interests["SkillsMask"].AsUInteger(), interests["SkillsText"].AsString(), interests["languages"].AsString());
|
||||
client.SendAvatarInterestsReply(avatarID, interests["WantMask"].AsUInteger(), interests["WantText"].AsString(), interests["SkillsMask"].AsUInteger(), interests["SkillsText"].AsString(), interests["Languages"].AsString());
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue