aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2010-05-26 19:26:30 +0200
committerMelanie Thielker2010-05-26 19:26:30 +0200
commitf90d81a864c8ae1cf8125839bc883dc0ace7f214 (patch)
tree838595fe0961825b12c15f6571a473d04868511d /OpenSim
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-f90d81a864c8ae1cf8125839bc883dc0ace7f214.zip
opensim-SC_OLD-f90d81a864c8ae1cf8125839bc883dc0ace7f214.tar.gz
opensim-SC_OLD-f90d81a864c8ae1cf8125839bc883dc0ace7f214.tar.bz2
opensim-SC_OLD-f90d81a864c8ae1cf8125839bc883dc0ace7f214.tar.xz
Just because there is an agent update handler, that doesn't mean there is
a pre agent update handler. Null check these separately.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 173c9e5..51cc763 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4922,14 +4922,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4922 arg.SessionID = x.SessionID; 4922 arg.SessionID = x.SessionID;
4923 arg.State = x.State; 4923 arg.State = x.State;
4924 UpdateAgent handlerAgentUpdate = OnAgentUpdate; 4924 UpdateAgent handlerAgentUpdate = OnAgentUpdate;
4925 UpdateAgent handlerPreAgentUpdate = OnPreAgentUpdate;
4925 lastarg = arg; // save this set of arguments for nexttime 4926 lastarg = arg; // save this set of arguments for nexttime
4926 if (handlerAgentUpdate != null) 4927 if (handlerPreAgentUpdate != null)
4927 {
4928 OnPreAgentUpdate(this, arg); 4928 OnPreAgentUpdate(this, arg);
4929 if (handlerAgentUpdate != null)
4929 OnAgentUpdate(this, arg); 4930 OnAgentUpdate(this, arg);
4930 }
4931 4931
4932 handlerAgentUpdate = null; 4932 handlerAgentUpdate = null;
4933 handlerPreAgentUpdate = null;
4933 } 4934 }
4934 } 4935 }
4935 4936