diff options
author | Diva Canto | 2012-09-22 14:41:19 -0700 |
---|---|---|
committer | Diva Canto | 2012-09-22 14:41:19 -0700 |
commit | 1c4233738123f1bcf3f9b45a527422cb09a43bcc (patch) | |
tree | 041f567ef801b0d26c9cf25af0757b9397cc40c1 /OpenSim/Region | |
parent | Guard against inventory get failures. (diff) | |
download | opensim-SC-1c4233738123f1bcf3f9b45a527422cb09a43bcc.zip opensim-SC-1c4233738123f1bcf3f9b45a527422cb09a43bcc.tar.gz opensim-SC-1c4233738123f1bcf3f9b45a527422cb09a43bcc.tar.bz2 opensim-SC-1c4233738123f1bcf3f9b45a527422cb09a43bcc.tar.xz |
HG Rez object: warn the user if the item or asset cannot be found.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index a0cad40..80257bd 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -263,8 +263,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
263 | //} | 263 | //} |
264 | 264 | ||
265 | // OK, we're done fetching. Pass it up to the default RezObject | 265 | // OK, we're done fetching. Pass it up to the default RezObject |
266 | return base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection, | 266 | SceneObjectGroup sog = base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection, |
267 | RezSelected, RemoveItem, fromTaskID, attachment); | 267 | RezSelected, RemoveItem, fromTaskID, attachment); |
268 | |||
269 | if (sog == null) | ||
270 | remoteClient.SendAgentAlertMessage("Unable to rez: problem accessing inventory or locating assets", false); | ||
271 | |||
272 | return sog; | ||
268 | 273 | ||
269 | } | 274 | } |
270 | 275 | ||