diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 94b6797..4bbc2ed 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -1151,20 +1151,26 @@ namespace OpenSim.Region.Environment.Scenes | |||
1151 | { | 1151 | { |
1152 | MainLog.Instance.Warn( | 1152 | MainLog.Instance.Warn( |
1153 | "SCENE", | 1153 | "SCENE", |
1154 | "Couldn't find part {0} in object group {1} ({2}) to retreive prim inventory", | 1154 | "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory", |
1155 | localID, LocalId, UUID); | 1155 | localID, Name, UUID); |
1156 | } | 1156 | } |
1157 | return false; | 1157 | return false; |
1158 | } | 1158 | } |
1159 | 1159 | ||
1160 | public string RequestInventoryFile(uint localID, IXfer xferManager) | 1160 | public void RequestInventoryFile(uint localID, IXfer xferManager) |
1161 | { | 1161 | { |
1162 | SceneObjectPart part = GetChildPart(localID); | 1162 | SceneObjectPart part = GetChildPart(localID); |
1163 | if (part != null) | 1163 | if (part != null) |
1164 | { | 1164 | { |
1165 | part.RequestInventoryFile(xferManager); | 1165 | part.RequestInventoryFile(xferManager); |
1166 | } | 1166 | } |
1167 | return ""; | 1167 | else |
1168 | { | ||
1169 | MainLog.Instance.Warn( | ||
1170 | "PRIMINVENTORY", | ||
1171 | "Couldn't find part {0} in object group {1}, {2} to request inventory data", | ||
1172 | localID, Name, UUID); | ||
1173 | } | ||
1168 | } | 1174 | } |
1169 | 1175 | ||
1170 | public bool AddInventoryItem(IClientAPI remoteClient, uint localID, InventoryItemBase item) | 1176 | public bool AddInventoryItem(IClientAPI remoteClient, uint localID, InventoryItemBase item) |
@@ -1202,7 +1208,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1202 | taskItem.owner_id = new LLUUID(item.avatarID.ToString()); | 1208 | taskItem.owner_id = new LLUUID(item.avatarID.ToString()); |
1203 | taskItem.creator_id = new LLUUID(item.creatorsID.ToString()); | 1209 | taskItem.creator_id = new LLUUID(item.creatorsID.ToString()); |
1204 | taskItem.type = SceneObjectPart.TaskInventoryItem.Types[item.assetType]; | 1210 | taskItem.type = SceneObjectPart.TaskInventoryItem.Types[item.assetType]; |
1205 | taskItem.inv_type = SceneObjectPart.TaskInventoryItem.Types[item.invType]; | 1211 | taskItem.inv_type = SceneObjectPart.TaskInventoryItem.InvTypes[item.invType]; |
1206 | part.AddInventoryItem(taskItem); | 1212 | part.AddInventoryItem(taskItem); |
1207 | return true; | 1213 | return true; |
1208 | } | 1214 | } |