From aeb7b8cc18bf14664e1a08739fe7527fed09f11a Mon Sep 17 00:00:00 2001
From: Dalien Talbot
Date: Sun, 11 Nov 2007 22:19:33 +0000
Subject: 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.



---
 OpenSim/Region/Environment/Modules/ChatModule.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/ChatModule.cs')

diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index 52491ed..f12612e 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Environment.Modules
             // Filled in since it's easier than rewriting right now.
             LLVector3 fromPos = 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);
             string fromName = e.From;
             string message = e.Message;
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment.Modules
             {
                 fromPos = avatar.AbsolutePosition;
                 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;
                 fromAgentID = e.Sender.AgentId;
                 avatar = null;
-- 
cgit v1.1