aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-21 01:01:07 +0100
committerJustin Clark-Casey (justincc)2010-09-21 01:01:07 +0100
commit192bcab98711245e241f1b37cb12cc29a26b168e (patch)
tree6e72ef2c0b7d20355f29119a603877786d83bf37 /OpenSim/Services
parentIf the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ... (diff)
parent* Tweaked the LocationTests for maximum coverage. (diff)
downloadopensim-SC-192bcab98711245e241f1b37cb12cc29a26b168e.zip
opensim-SC-192bcab98711245e241f1b37cb12cc29a26b168e.tar.gz
opensim-SC-192bcab98711245e241f1b37cb12cc29a26b168e.tar.bz2
opensim-SC-192bcab98711245e241f1b37cb12cc29a26b168e.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