aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2010-05-26 19:26:30 +0200
committerMelanie2010-05-26 18:25:53 +0100
commit9ac8d2de794f2942e028722fb62911d44d97514b (patch)
treedfcd0d42d1e5b179e55023ba64681529b29ec717 /OpenSim
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-9ac8d2de794f2942e028722fb62911d44d97514b.zip
opensim-SC_OLD-9ac8d2de794f2942e028722fb62911d44d97514b.tar.gz
opensim-SC_OLD-9ac8d2de794f2942e028722fb62911d44d97514b.tar.bz2
opensim-SC_OLD-9ac8d2de794f2942e028722fb62911d44d97514b.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 e67428d..0945bce 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4918,14 +4918,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4918 arg.SessionID = x.SessionID; 4918 arg.SessionID = x.SessionID;
4919 arg.State = x.State; 4919 arg.State = x.State;
4920 UpdateAgent handlerAgentUpdate = OnAgentUpdate; 4920 UpdateAgent handlerAgentUpdate = OnAgentUpdate;
4921 UpdateAgent handlerPreAgentUpdate = OnPreAgentUpdate;
4921 lastarg = arg; // save this set of arguments for nexttime 4922 lastarg = arg; // save this set of arguments for nexttime
4922 if (handlerAgentUpdate != null) 4923 if (handlerPreAgentUpdate != null)
4923 {
4924 OnPreAgentUpdate(this, arg); 4924 OnPreAgentUpdate(this, arg);
4925 if (handlerAgentUpdate != null)
4925 OnAgentUpdate(this, arg); 4926 OnAgentUpdate(this, arg);
4926 }
4927 4927
4928 handlerAgentUpdate = null; 4928 handlerAgentUpdate = null;
4929 handlerPreAgentUpdate = null;
4929 } 4930 }
4930 } 4931 }
4931 4932