diff options
author | Melanie | 2011-12-10 14:47:00 +0100 |
---|---|---|
committer | Melanie | 2011-12-10 14:47:00 +0100 |
commit | db98698bbea1777fd3ba50d7c441d581a733addd (patch) | |
tree | 24e30a6e13f5acd1010769d49730409f2d5b1028 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-db98698bbea1777fd3ba50d7c441d581a733addd.zip opensim-SC-db98698bbea1777fd3ba50d7c441d581a733addd.tar.gz opensim-SC-db98698bbea1777fd3ba50d7c441d581a733addd.tar.bz2 opensim-SC-db98698bbea1777fd3ba50d7c441d581a733addd.tar.xz |
Prevent spurious error message when client tries to move a null item
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 83990b1..1746cfe 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1105,6 +1105,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1105 | { | 1105 | { |
1106 | SceneObjectPart part = GetSceneObjectPart(primLocalId); | 1106 | SceneObjectPart part = GetSceneObjectPart(primLocalId); |
1107 | 1107 | ||
1108 | // Can't move a null item | ||
1109 | if (itemId == UUID.Zero) | ||
1110 | return; | ||
1111 | |||
1108 | if (null == part) | 1112 | if (null == part) |
1109 | { | 1113 | { |
1110 | m_log.WarnFormat( | 1114 | m_log.WarnFormat( |