diff options
author | Oren Hurvitz | 2014-05-15 16:09:44 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-05-19 10:54:27 +0100 |
commit | 96e5836b50f6615bcea4ae43b238147b027fd5f7 (patch) | |
tree | e07775a0e76fce6588f17e2ffbcd6707815f6066 /OpenSim/Region/CoreModules | |
parent | Don't trigger ItemUploaded when no item has been uploaded. (diff) | |
download | opensim-SC_OLD-96e5836b50f6615bcea4ae43b238147b027fd5f7.zip opensim-SC_OLD-96e5836b50f6615bcea4ae43b238147b027fd5f7.tar.gz opensim-SC_OLD-96e5836b50f6615bcea4ae43b238147b027fd5f7.tar.bz2 opensim-SC_OLD-96e5836b50f6615bcea4ae43b238147b027fd5f7.tar.xz |
When can't rez, show only one error message; not two. And show more specific error messages.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 283a0cf..b7de0dc 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -297,9 +297,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
297 | SceneObjectGroup sog = base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection, | 297 | SceneObjectGroup sog = base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection, |
298 | RezSelected, RemoveItem, fromTaskID, attachment); | 298 | RezSelected, RemoveItem, fromTaskID, attachment); |
299 | 299 | ||
300 | if (sog == null) | ||
301 | remoteClient.SendAgentAlertMessage("Unable to rez: problem accessing inventory or locating assets", false); | ||
302 | |||
303 | return sog; | 300 | return sog; |
304 | 301 | ||
305 | } | 302 | } |
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index a116f0f..5cdb70b 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -773,12 +773,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
773 | m_log.WarnFormat( | 773 | m_log.WarnFormat( |
774 | "[InventoryAccessModule]: Could not find asset {0} for item {1} {2} for {3} in RezObject()", | 774 | "[InventoryAccessModule]: Could not find asset {0} for item {1} {2} for {3} in RezObject()", |
775 | assetID, item.Name, item.ID, remoteClient.Name); | 775 | assetID, item.Name, item.ID, remoteClient.Name); |
776 | remoteClient.SendAgentAlertMessage(string.Format("Unable to rez: could not find asset {0} for item {1}.", assetID, item.Name), false); | ||
776 | } | 777 | } |
777 | else | 778 | else |
778 | { | 779 | { |
779 | m_log.WarnFormat( | 780 | m_log.WarnFormat( |
780 | "[INVENTORY ACCESS MODULE]: Could not find asset {0} for {1} in RezObject()", | 781 | "[INVENTORY ACCESS MODULE]: Could not find asset {0} for {1} in RezObject()", |
781 | assetID, remoteClient.Name); | 782 | assetID, remoteClient.Name); |
783 | remoteClient.SendAgentAlertMessage(string.Format("Unable to rez: could not find asset {0}.", assetID), false); | ||
782 | } | 784 | } |
783 | 785 | ||
784 | return null; | 786 | return null; |