diff options
| author | Melanie | 2010-08-30 02:30:28 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-30 02:30:28 +0100 |
| commit | 79bfa275da6b8be03678bfa284bd205410296b6a (patch) | |
| tree | 1ce2f9f2da9bb0e3a8f5628d54f44e45bfc33044 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | Remove CRLF endings (diff) | |
| parent | Fix a casting operation to use ToString() (diff) | |
| download | opensim-SC-79bfa275da6b8be03678bfa284bd205410296b6a.zip opensim-SC-79bfa275da6b8be03678bfa284bd205410296b6a.tar.gz opensim-SC-79bfa275da6b8be03678bfa284bd205410296b6a.tar.bz2 opensim-SC-79bfa275da6b8be03678bfa284bd205410296b6a.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 10931b7..c5994b2 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -724,8 +724,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 724 | } | 724 | } |
| 725 | 725 | ||
| 726 | public SceneObjectGroup GetRezReadySceneObject(TaskInventoryItem item) | 726 | public SceneObjectGroup GetRezReadySceneObject(TaskInventoryItem item) |
| 727 | { | 727 | { |
| 728 | UUID ownerID = item.OwnerID; | ||
| 729 | AssetBase rezAsset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); | 728 | AssetBase rezAsset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); |
| 730 | 729 | ||
| 731 | if (null == rezAsset) | 730 | if (null == rezAsset) |