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

get rid of pointless grp null check in attachObjectAssetStore()

bulletsim
Justin Clark-Casey (justincc) 2011-08-24 21:23:10 +01:00
parent 0e0d40c810
commit 274e354006
1 changed files with 74 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1876,8 +1876,7 @@ namespace OpenSim.Region.Framework.Scenes
// m_log.DebugFormat("[SCENE]: Called attachObjectAssetStore for object {0} {1} for {2} {3} {4}", grp.Name, grp.LocalId, remoteClient.Name, remoteClient.AgentId, AgentId); // m_log.DebugFormat("[SCENE]: Called attachObjectAssetStore for object {0} {1} for {2} {3} {4}", grp.Name, grp.LocalId, remoteClient.Name, remoteClient.AgentId, AgentId);
itemID = UUID.Zero; itemID = UUID.Zero;
if (grp != null)
{
Vector3 inventoryStoredPosition = new Vector3 Vector3 inventoryStoredPosition = new Vector3
(((grp.AbsolutePosition.X > (int)Constants.RegionSize) (((grp.AbsolutePosition.X > (int)Constants.RegionSize)
? Constants.RegionSize - 6 ? Constants.RegionSize - 6
@ -1956,9 +1955,6 @@ namespace OpenSim.Region.Framework.Scenes
return item.AssetID; return item.AssetID;
} }
return UUID.Zero;
}
/// <summary> /// <summary>
/// Event Handler Rez an object into a scene /// Event Handler Rez an object into a scene
/// Calls the non-void event handler /// Calls the non-void event handler