ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

mantis 8798: avoid null ref

Browse Source
This commit is contained in:
UbitUmarov
2020-11-09 23:03:28 +00:00
parent 0cb83154e0
commit 8b952b7a3b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
View File

@@ -217,7 +217,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
Scene scene = c.Scene as Scene;
UUID destination = c.Destination;
Vector3 fromPos = c.Position;
Vector3 regionPos = new Vector3(scene.RegionInfo.WorldLocX, scene.RegionInfo.WorldLocY, 0);
bool checkParcelHide = false;
UUID sourceParcelID = UUID.Zero;
@@ -236,6 +235,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
{
case ChatSourceType.Agent:
ScenePresence avatar = (scene as Scene).GetScenePresence(c.Sender.AgentId);
if(avatar == null)
return;
fromPos = avatar.AbsolutePosition;
fromName = avatar.Name;
fromID = c.Sender.AgentId;
@@ -293,6 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
}
}
Vector3 regionPos = new Vector3(scene.RegionInfo.WorldLocX, scene.RegionInfo.WorldLocY, 0);
scene.ForEachScenePresence(
delegate(ScenePresence presence)
{