aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorJohn Hurliman2010-09-17 14:35:35 -0700
committerJohn Hurliman2010-09-17 14:35:35 -0700
commitc08b6c28734b0e026aa25533333a66f845c48bca (patch)
treecf1eb99d801d1f65988cf64674189008eed2dc7c /OpenSim/Services
parentApplying the llParseString2List() patch from #5036 that Melanie claims was al... (diff)
parent* Add a few more tests to help our meager code coverage %. (diff)
downloadopensim-SC-c08b6c28734b0e026aa25533333a66f845c48bca.zip
opensim-SC-c08b6c28734b0e026aa25533333a66f845c48bca.tar.gz
opensim-SC-c08b6c28734b0e026aa25533333a66f845c48bca.tar.bz2
opensim-SC-c08b6c28734b0e026aa25533333a66f845c48bca.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
index b7e8538..0ef4974 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
@@ -291,8 +291,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
291 // Check if the user is online 291 // Check if the user is online
292 if (client.Scene is Scene) 292 if (client.Scene is Scene)
293 { 293 {
294 OpenSim.Services.Interfaces.PresenceInfo presence = ((Scene)client.Scene).PresenceService.GetAgent(avatarID); 294 OpenSim.Services.Interfaces.PresenceInfo[] presences = ((Scene)client.Scene).PresenceService.GetAgents(new string[] { avatarID.ToString() });
295 if (presence != null) 295 if (presences != null && presences.Length > 0)
296 flags |= ProfileFlags.Online; 296 flags |= ProfileFlags.Online;
297 } 297 }
298 298