aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-11-20 10:22:49 +0000
committerJustin Clark-Casey (justincc)2012-11-20 10:22:49 +0000
commitf656adee31f5210acb4d1c8c89fe0d1e9362feee (patch)
tree2a92108d5a02698c5b9a8a540d17d4ca0aa10c4f
parentrefactor: Move common presence connector code into BasePresenceServiceConnector (diff)
downloadopensim-SC_OLD-f656adee31f5210acb4d1c8c89fe0d1e9362feee.zip
opensim-SC_OLD-f656adee31f5210acb4d1c8c89fe0d1e9362feee.tar.gz
opensim-SC_OLD-f656adee31f5210acb4d1c8c89fe0d1e9362feee.tar.bz2
opensim-SC_OLD-f656adee31f5210acb4d1c8c89fe0d1e9362feee.tar.xz
If GetAgents() is called with an empty userIDs array then don't bother with a useless potentially network call on the scene presence service connector.
This also eliminates the "[PRESENCE HANDLER]: GetAgents called without required uuids argument" which has started to pop up in the logs when a call is made with an empty uuid array as occasionally happens.
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/BasePresenceServiceConnector.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/BasePresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/BasePresenceServiceConnector.cs
index c84518d..fdbe10a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/BasePresenceServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/BasePresenceServiceConnector.cs
@@ -125,6 +125,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
125 125
126 public PresenceInfo[] GetAgents(string[] userIDs) 126 public PresenceInfo[] GetAgents(string[] userIDs)
127 { 127 {
128 // Don't bother potentially making a useless network call if we not going to ask for any users anyway.
129 if (userIDs.Length == 0)
130 return new PresenceInfo[0];
131
128 return m_PresenceService.GetAgents(userIDs); 132 return m_PresenceService.GetAgents(userIDs);
129 } 133 }
130 134