aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJohn Hurliman2010-08-13 16:56:01 -0700
committerJohn Hurliman2010-08-13 16:56:01 -0700
commit46d0690b3166c3367457ad248fb1a65f41b88fb0 (patch)
treec23305f8d1998ca303e027eaf319e8559b2d7ea0 /OpenSim
parentUnit test for ConfigurationLoader. (diff)
downloadopensim-SC-46d0690b3166c3367457ad248fb1a65f41b88fb0.zip
opensim-SC-46d0690b3166c3367457ad248fb1a65f41b88fb0.tar.gz
opensim-SC-46d0690b3166c3367457ad248fb1a65f41b88fb0.tar.bz2
opensim-SC-46d0690b3166c3367457ad248fb1a65f41b88fb0.tar.xz
* Fixed a casing typo for Simian profile data
* Minor logging tweak in Simian asset connector
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs2
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 }