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

GridIMs don't have a (sending) client, which led to a NRE on access. 

Doesn't use client now in that case.
0.6.1-post-fixes
Homer Horwitz 2008-11-16 19:45:46 +00:00
parent 9e7d00c1e6
commit e1ccbed982
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Framework/GridInstantMessage.cs
View File

@ -75,9 +75,12 @@ namespace OpenSim.Framework
offline = 0; offline = 0;
Position = _position; Position = _position;
binaryBucket = _binaryBucket; binaryBucket = _binaryBucket;
ParentEstateID = scene.RegionInfo.EstateSettings.ParentEstateID; if (scene != null)
RegionID = scene.RegionInfo.RegionSettings.RegionUUID.Guid; {
ParentEstateID = scene.RegionInfo.EstateSettings.ParentEstateID;
RegionID = scene.RegionInfo.RegionSettings.RegionUUID.Guid;
}
timestamp = (uint)Util.UnixTimeSinceEpoch(); timestamp = (uint)Util.UnixTimeSinceEpoch();
} }

3
OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
View File

@ -127,7 +127,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
return; return;
} }
GridInstantMessage im = new GridInstantMessage(client.Scene, IScene scene = client == null ? null : client.Scene;
GridInstantMessage im = new GridInstantMessage(scene,
fromAgentID, fromAgentName, fromAgentSession, toAgentID, fromAgentID, fromAgentName, fromAgentSession, toAgentID,
dialog, fromGroup, message, imSessionID, dialog, fromGroup, message, imSessionID,
offline != 0 ? true : false, Position, offline != 0 ? true : false, Position,