aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-07-22 16:41:41 +0100
committerUbitUmarov2016-07-22 16:41:41 +0100
commit504ee6e21ca84b7af9a44b6715fb4e65126f3985 (patch)
tree189486e960bb31cd9eef928e8c2484385d0965bb
parentAdd some additional checks to llTransferLindenDollars. (diff)
downloadopensim-SC-504ee6e21ca84b7af9a44b6715fb4e65126f3985.zip
opensim-SC-504ee6e21ca84b7af9a44b6715fb4e65126f3985.tar.gz
opensim-SC-504ee6e21ca84b7af9a44b6715fb4e65126f3985.tar.bz2
opensim-SC-504ee6e21ca84b7af9a44b6715fb4e65126f3985.tar.xz
don't try to rez a object from a asset with empty data and Let user know about it
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 781b9ff..8c560e5 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -867,6 +867,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
867 return null; 867 return null;
868 } 868 }
869 869
870 if(rezAsset.Data == null || rezAsset.Data.Length == 0)
871 {
872 m_log.WarnFormat(
873 "[INVENTORY ACCESS MODULE]: missing data in asset {0} to RezObject()",
874 assetID, remoteClient.Name);
875 remoteClient.SendAgentAlertMessage(string.Format("Unable to rez: missing data in asset {0} ", assetID), false);
876 return null;
877 }
878
870 SceneObjectGroup group = null; 879 SceneObjectGroup group = null;
871 880
872 List<SceneObjectGroup> objlist; 881 List<SceneObjectGroup> objlist;