aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Null
diff options
context:
space:
mode:
authorDiva Canto2012-12-09 15:31:50 -0800
committerDiva Canto2012-12-09 15:31:50 -0800
commit39b388a094aaf028e5f482885b98a2589c9434fe (patch)
tree59967bcfb070252f28cc344a6fd9ef9987d5dd61 /OpenSim/Data/Null
parentUserManagementModule: search the local cache for names too. (diff)
parentRestrict IPresenceData.VerifyAgent (diff)
downloadopensim-SC_OLD-39b388a094aaf028e5f482885b98a2589c9434fe.zip
opensim-SC_OLD-39b388a094aaf028e5f482885b98a2589c9434fe.tar.gz
opensim-SC_OLD-39b388a094aaf028e5f482885b98a2589c9434fe.tar.bz2
opensim-SC_OLD-39b388a094aaf028e5f482885b98a2589c9434fe.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/Null/NullPresenceData.cs11
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs
index eafde95..b85b95e 100644
--- a/OpenSim/Data/Null/NullPresenceData.cs
+++ b/OpenSim/Data/Null/NullPresenceData.cs
@@ -222,17 +222,12 @@ namespace OpenSim.Data.Null
222 return true; 222 return true;
223 } 223 }
224 224
225 public PresenceData VerifyAgent(UUID secureSessionID) 225 public bool VerifyAgent(UUID agentId, UUID secureSessionID)
226 { 226 {
227 if (Instance != this) 227 if (Instance != this)
228 return Instance.VerifyAgent(secureSessionID); 228 return Instance.VerifyAgent(agentId, secureSessionID);
229 229
230 if (m_presenceData.ContainsKey(secureSessionID)) 230 return false;
231 {
232 return m_presenceData[secureSessionID];
233 }
234
235 return null;
236 } 231 }
237 232
238 } 233 }