OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Just because there is an agent update handler, that doesn't mean there is 

a pre agent update handler. Null check these separately.
avinationmerge
Melanie Thielker 2010-05-26 19:26:30 +02:00
parent 97501495eb
commit f90d81a864
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -4922,14 +4922,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
arg.SessionID = x.SessionID; arg.SessionID = x.SessionID;
arg.State = x.State; arg.State = x.State;
UpdateAgent handlerAgentUpdate = OnAgentUpdate; UpdateAgent handlerAgentUpdate = OnAgentUpdate;
UpdateAgent handlerPreAgentUpdate = OnPreAgentUpdate;
lastarg = arg; // save this set of arguments for nexttime lastarg = arg; // save this set of arguments for nexttime
if (handlerAgentUpdate != null) if (handlerPreAgentUpdate != null)
{
OnPreAgentUpdate(this, arg); OnPreAgentUpdate(this, arg);
if (handlerAgentUpdate != null)
OnAgentUpdate(this, arg); OnAgentUpdate(this, arg);
}
handlerAgentUpdate = null; handlerAgentUpdate = null;
handlerPreAgentUpdate = null;
} }
} }