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

minor: remove redundant grp != null check from AM.UpdateKnownItem()

remove-scene-viewer
Justin Clark-Casey (justincc) 2011-09-13 22:24:33 +01:00
parent 8880aea728
commit 62b3e74bc5
1 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -707,49 +707,46 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
/// <param name="agentID"></param> /// <param name="agentID"></param>
public void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp, UUID itemID, UUID agentID) public void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp, UUID itemID, UUID agentID)
{ {
if (grp != null) if (grp.HasGroupChanged || grp.ContainsScripts())
{ {
if (grp.HasGroupChanged || grp.ContainsScripts()) m_log.DebugFormat(
"[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
grp.UUID, grp.AttachmentPoint);
string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
item = m_scene.InventoryService.GetItem(item);
if (item != null)
{ {
m_log.DebugFormat( AssetBase asset = m_scene.CreateAsset(
"[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}", grp.GetPartName(grp.LocalId),
grp.UUID, grp.AttachmentPoint); grp.GetPartDescription(grp.LocalId),
(sbyte)AssetType.Object,
Utils.StringToBytes(sceneObjectXml),
remoteClient.AgentId);
m_scene.AssetService.Store(asset);
string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp); item.AssetID = asset.FullID;
item.Description = asset.Description;
item.Name = asset.Name;
item.AssetType = asset.Type;
item.InvType = (int)InventoryType.Object;
InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); m_scene.InventoryService.UpdateItem(item);
item = m_scene.InventoryService.GetItem(item);
if (item != null) // this gets called when the agent logs off!
{ if (remoteClient != null)
AssetBase asset = m_scene.CreateAsset( remoteClient.SendInventoryItemCreateUpdate(item, 0);
grp.GetPartName(grp.LocalId),
grp.GetPartDescription(grp.LocalId),
(sbyte)AssetType.Object,
Utils.StringToBytes(sceneObjectXml),
remoteClient.AgentId);
m_scene.AssetService.Store(asset);
item.AssetID = asset.FullID;
item.Description = asset.Description;
item.Name = asset.Name;
item.AssetType = asset.Type;
item.InvType = (int)InventoryType.Object;
m_scene.InventoryService.UpdateItem(item);
// this gets called when the agent logs off!
if (remoteClient != null)
remoteClient.SendInventoryItemCreateUpdate(item, 0);
}
}
else
{
m_log.DebugFormat(
"[ATTACHMENTS MODULE]: Don't need to update asset for unchanged attachment {0}, attachpoint {1}",
grp.UUID, grp.AttachmentPoint);
} }
} }
else
{
m_log.DebugFormat(
"[ATTACHMENTS MODULE]: Don't need to update asset for unchanged attachment {0}, attachpoint {1}",
grp.UUID, grp.AttachmentPoint);
}
} }
/// <summary> /// <summary>