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

Fixing null pointer exception from Mathias Soeken: 

e.Scene is copied to locale variable scene and replaced when it is null,
but in the LLVector3 constructor in the next line, e.Scene is used, so
it can be null.
afrisby
Dalien Talbot 2007-11-11 22:19:33 +00:00
parent db174dfa20
commit aeb7b8cc18
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Modules/ChatModule.cs
View File

@ -124,7 +124,7 @@ namespace OpenSim.Region.Environment.Modules
// Filled in since it's easier than rewriting right now. // Filled in since it's easier than rewriting right now.
LLVector3 fromPos = e.Position; LLVector3 fromPos = e.Position;
LLVector3 fromRegionPos = e.Position + LLVector3 fromRegionPos = e.Position +
new LLVector3(e.Scene.RegionInfo.RegionLocX*256, e.Scene.RegionInfo.RegionLocY*256, new LLVector3(scene.RegionInfo.RegionLocX*256, scene.RegionInfo.RegionLocY*256,
0); 0);
string fromName = e.From; string fromName = e.From;
string message = e.Message; string message = e.Message;
@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment.Modules
{ {
fromPos = avatar.AbsolutePosition; fromPos = avatar.AbsolutePosition;
fromRegionPos = fromPos + fromRegionPos = fromPos +
new LLVector3(e.Scene.RegionInfo.RegionLocX*256, e.Scene.RegionInfo.RegionLocY*256, 0); new LLVector3(scene.RegionInfo.RegionLocX*256, scene.RegionInfo.RegionLocY*256, 0);
fromName = avatar.Firstname + " " + avatar.Lastname; fromName = avatar.Firstname + " " + avatar.Lastname;
fromAgentID = e.Sender.AgentId; fromAgentID = e.Sender.AgentId;
avatar = null; avatar = null;