aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2013-07-10 16:10:04 -0700
committerDiva Canto2013-07-10 16:10:04 -0700
commit864a86983e71c4730f67b03c9890bf80cfa43ef3 (patch)
tree2615cf0cebbc8e02ad45db066d039697863a6eb2 /OpenSim
parentAdded show client-stats [first last] command to expose what viewers are reque... (diff)
parentRemove a null reference exception in SimianPresenceServiceConnector that (diff)
downloadopensim-SC_OLD-864a86983e71c4730f67b03c9890bf80cfa43ef3.zip
opensim-SC_OLD-864a86983e71c4730f67b03c9890bf80cfa43ef3.tar.gz
opensim-SC_OLD-864a86983e71c4730f67b03c9890bf80cfa43ef3.tar.bz2
opensim-SC_OLD-864a86983e71c4730f67b03c9890bf80cfa43ef3.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 0a39088..01163aa 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -315,11 +315,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
315 315
316 UUID userID = new UUID(user); 316 UUID userID = new UUID(user);
317 OSDMap userResponse = GetUserData(userID); 317 OSDMap userResponse = GetUserData(userID);
318 if (userResponse != null)
319 return ResponseToGridUserInfo(userResponse);
320 318
321 m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}: {1}",userID,userResponse["Message"].AsString()); 319 if (userResponse == null)
322 return null; 320 {
321 m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}", userID);
322 }
323
324 // Note that ResponseToGridUserInfo properly checks for and returns a null if passed a null.
325 return ResponseToGridUserInfo(userResponse);
326
323 } 327 }
324 328
325 #endregion 329 #endregion