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

Fixed nullrefs

avinationmerge
CasperW 2009-11-23 19:51:40 +01:00
parent 889ce36afa
commit 73c2162ff6
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,25 +266,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
} }
// m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
if (c.Scene != null)
((Scene)c.Scene).ForEachScenePresence( {
delegate(ScenePresence presence) ((Scene)c.Scene).ForEachScenePresence
{ (
// ignore chat from child agents delegate(ScenePresence presence)
if (presence.IsChildAgent) return; {
// ignore chat from child agents
IClientAPI client = presence.ControllingClient; if (presence.IsChildAgent) return;
// don't forward SayOwner chat from objects to IClientAPI client = presence.ControllingClient;
// non-owner agents
if ((c.Type == ChatTypeEnum.Owner) && // don't forward SayOwner chat from objects to
(null != c.SenderObject) && // non-owner agents
(((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId)) if ((c.Type == ChatTypeEnum.Owner) &&
return; (null != c.SenderObject) &&
(((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, return;
(byte)sourceType, (byte)ChatAudibleLevel.Fully);
}); client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID,
(byte)sourceType, (byte)ChatAudibleLevel.Fully);
}
);
}
} }

8
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -840,8 +840,12 @@ namespace OpenSim.Region.Framework.Scenes
public void RemoveTaskInventory(IClientAPI remoteClient, UUID itemID, uint localID) public void RemoveTaskInventory(IClientAPI remoteClient, UUID itemID, uint localID)
{ {
SceneObjectPart part = GetSceneObjectPart(localID); SceneObjectPart part = GetSceneObjectPart(localID);
SceneObjectGroup group = part.ParentGroup; SceneObjectGroup group = null;
if (group != null) if (part != null)
{
group = part.ParentGroup;
}
if (part != null && group != null)
{ {
TaskInventoryItem item = group.GetInventoryItem(localID, itemID); TaskInventoryItem item = group.GetInventoryItem(localID, itemID);
if (item == null) if (item == null)