aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorMelanie2010-12-21 20:47:00 +0000
committerMelanie2010-12-21 20:49:31 +0000
commit043dace1184b14c1b07863c2ffabaf5e24fb53c4 (patch)
tree694712bc17b61db47a6a2033de4b17d46894ac96 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentShooting in the dark for solutions to the appearance problem (diff)
downloadopensim-SC-043dace1184b14c1b07863c2ffabaf5e24fb53c4.zip
opensim-SC-043dace1184b14c1b07863c2ffabaf5e24fb53c4.tar.gz
opensim-SC-043dace1184b14c1b07863c2ffabaf5e24fb53c4.tar.bz2
opensim-SC-043dace1184b14c1b07863c2ffabaf5e24fb53c4.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.cs23
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 2cf0ced..321d0aa 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -949,23 +949,12 @@ namespace OpenSim.Region.Framework.Scenes
949 /// <param name="primLocalID"></param> 949 /// <param name="primLocalID"></param>
950 public void RequestTaskInventory(IClientAPI remoteClient, uint primLocalID) 950 public void RequestTaskInventory(IClientAPI remoteClient, uint primLocalID)
951 { 951 {
952 SceneObjectGroup group = GetGroupByPrim(primLocalID); 952 SceneObjectPart part = GetSceneObjectPart(primLocalID);
953 if (group != null) 953 if (part == null)
954 { 954 return;
955 bool fileChange = group.GetPartInventoryFileName(remoteClient, primLocalID); 955
956 if (fileChange) 956 if (XferManager != null)
957 { 957 part.Inventory.RequestInventoryFile(remoteClient, XferManager);
958 if (XferManager != null)
959 {
960 group.RequestInventoryFile(remoteClient, primLocalID, XferManager);
961 }
962 }
963 }
964 else
965 {
966 m_log.ErrorFormat(
967 "[PRIM INVENTORY]: Inventory requested of prim {0} which doesn't exist", primLocalID);
968 }
969 } 958 }
970 959
971 /// <summary> 960 /// <summary>