aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
diff options
context:
space:
mode:
authorDiva Canto2014-05-22 10:16:19 -0700
committerDiva Canto2014-05-22 10:16:19 -0700
commitb7c7293c7aa7bb37085eaf6740e10a268aecf608 (patch)
tree55022934c63bea8fd9fbd31be2df016cf5593d9a /OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
parentFixed a problem with detaching attachments in situations where the user's ass... (diff)
parentFix mantis 6973. Prevent BOM being prefixed to message XML which was causing ... (diff)
downloadopensim-SC_OLD-b7c7293c7aa7bb37085eaf6740e10a268aecf608.zip
opensim-SC_OLD-b7c7293c7aa7bb37085eaf6740e10a268aecf608.tar.gz
opensim-SC_OLD-b7c7293c7aa7bb37085eaf6740e10a268aecf608.tar.bz2
opensim-SC_OLD-b7c7293c7aa7bb37085eaf6740e10a268aecf608.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 6e48fcc..c4a42bc 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -797,12 +797,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
797 m_log.WarnFormat( 797 m_log.WarnFormat(
798 "[InventoryAccessModule]: Could not find asset {0} for item {1} {2} for {3} in RezObject()", 798 "[InventoryAccessModule]: Could not find asset {0} for item {1} {2} for {3} in RezObject()",
799 assetID, item.Name, item.ID, remoteClient.Name); 799 assetID, item.Name, item.ID, remoteClient.Name);
800 remoteClient.SendAgentAlertMessage(string.Format("Unable to rez: could not find asset {0} for item {1}.", assetID, item.Name), false);
800 } 801 }
801 else 802 else
802 { 803 {
803 m_log.WarnFormat( 804 m_log.WarnFormat(
804 "[INVENTORY ACCESS MODULE]: Could not find asset {0} for {1} in RezObject()", 805 "[INVENTORY ACCESS MODULE]: Could not find asset {0} for {1} in RezObject()",
805 assetID, remoteClient.Name); 806 assetID, remoteClient.Name);
807 remoteClient.SendAgentAlertMessage(string.Format("Unable to rez: could not find asset {0}.", assetID), false);
806 } 808 }
807 809
808 return null; 810 return null;