aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2013-06-08 11:00:05 -0400
committerBlueWall2013-06-08 11:00:05 -0400
commit75e4af9d3959b666b652013d2de4d5f4625f9fa2 (patch)
treed73c5c59bcf0f7131059cb8c33f9a56719c910cd
parentMerge branch 'profiles' (diff)
downloadopensim-SC_OLD-75e4af9d3959b666b652013d2de4d5f4625f9fa2.zip
opensim-SC_OLD-75e4af9d3959b666b652013d2de4d5f4625f9fa2.tar.gz
opensim-SC_OLD-75e4af9d3959b666b652013d2de4d5f4625f9fa2.tar.bz2
opensim-SC_OLD-75e4af9d3959b666b652013d2de4d5f4625f9fa2.tar.xz
Catch exception triggered by incoming avatars using legacy profiles
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 72e557c..322addd 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -1317,7 +1317,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
1317 Stream rstream = webResponse.GetResponseStream(); 1317 Stream rstream = webResponse.GetResponseStream();
1318 1318
1319 OSDMap response = new OSDMap(); 1319 OSDMap response = new OSDMap();
1320 response = (OSDMap)OSDParser.DeserializeJson(rstream); 1320 try
1321 {
1322 response = (OSDMap)OSDParser.DeserializeJson(rstream);
1323 }
1324 catch (Exception e)
1325 {
1326 m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message);
1327 return false;
1328 }
1329
1321 if(response.ContainsKey("error")) 1330 if(response.ContainsKey("error"))
1322 { 1331 {
1323 data = response["error"]; 1332 data = response["error"];