aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Null
diff options
context:
space:
mode:
authorMelanie2012-12-09 21:27:32 +0000
committerMelanie2012-12-09 21:27:32 +0000
commitf30d519bcc1e68deee0d5b3671766ceb39a37018 (patch)
treee082cd09c815191377d840b1c2936f5e558e45b0 /OpenSim/Data/Null
parentMerge branch 'master' into careminster (diff)
parentRestrict IPresenceData.VerifyAgent (diff)
downloadopensim-SC_OLD-f30d519bcc1e68deee0d5b3671766ceb39a37018.zip
opensim-SC_OLD-f30d519bcc1e68deee0d5b3671766ceb39a37018.tar.gz
opensim-SC_OLD-f30d519bcc1e68deee0d5b3671766ceb39a37018.tar.bz2
opensim-SC_OLD-f30d519bcc1e68deee0d5b3671766ceb39a37018.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Data/Null')
-rw-r--r--OpenSim/Data/Null/NullPresenceData.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs
index c06c223..b85b95e 100644
--- a/OpenSim/Data/Null/NullPresenceData.cs
+++ b/OpenSim/Data/Null/NullPresenceData.cs
@@ -222,5 +222,13 @@ namespace OpenSim.Data.Null
222 return true; 222 return true;
223 } 223 }
224 224
225 public bool VerifyAgent(UUID agentId, UUID secureSessionID)
226 {
227 if (Instance != this)
228 return Instance.VerifyAgent(agentId, secureSessionID);
229
230 return false;
231 }
232
225 } 233 }
226} 234}