diff options
author | Melanie | 2010-12-21 20:47:00 +0000 |
---|---|---|
committer | Melanie | 2010-12-21 20:47:00 +0000 |
commit | 2f84f2171fb7e17f6c336a4e6db9a04ad822704a (patch) | |
tree | 8e83f98605b7dbb30960d0aa5ecf64d0d800a0ad /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-2f84f2171fb7e17f6c336a4e6db9a04ad822704a.zip opensim-SC_OLD-2f84f2171fb7e17f6c336a4e6db9a04ad822704a.tar.gz opensim-SC_OLD-2f84f2171fb7e17f6c336a4e6db9a04ad822704a.tar.bz2 opensim-SC_OLD-2f84f2171fb7e17f6c336a4e6db9a04ad822704a.tar.xz |
Make prim inventories a bit more sane
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index a1f1ea5..47c574a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -951,23 +951,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
951 | /// <param name="primLocalID"></param> | 951 | /// <param name="primLocalID"></param> |
952 | public void RequestTaskInventory(IClientAPI remoteClient, uint primLocalID) | 952 | public void RequestTaskInventory(IClientAPI remoteClient, uint primLocalID) |
953 | { | 953 | { |
954 | SceneObjectGroup group = GetGroupByPrim(primLocalID); | 954 | SceneObjectPart part = GetSceneObjectPart(primLocalID); |
955 | if (group != null) | 955 | if (part == null) |
956 | { | 956 | return; |
957 | bool fileChange = group.GetPartInventoryFileName(remoteClient, primLocalID); | 957 | |
958 | if (fileChange) | 958 | if (XferManager != null) |
959 | { | 959 | part.Inventory.RequestInventoryFile(remoteClient, XferManager); |
960 | if (XferManager != null) | ||
961 | { | ||
962 | group.RequestInventoryFile(remoteClient, primLocalID, XferManager); | ||
963 | } | ||
964 | } | ||
965 | } | ||
966 | else | ||
967 | { | ||
968 | m_log.ErrorFormat( | ||
969 | "[PRIM INVENTORY]: Inventory requested of prim {0} which doesn't exist", primLocalID); | ||
970 | } | ||
971 | } | 960 | } |
972 | 961 | ||
973 | /// <summary> | 962 | /// <summary> |