diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 098e010..f4ca877 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -871,12 +871,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 871 | { | 871 | { |
| 872 | foreach (IScriptModule e in engines) | 872 | foreach (IScriptModule e in engines) |
| 873 | { | 873 | { |
| 874 | string n = e.GetAssemblyName(item.ItemID); | 874 | if (e != null) |
| 875 | if (n != "") | ||
| 876 | { | 875 | { |
| 877 | if (!ret.Contains(n)) | 876 | string n = e.GetAssemblyName(item.ItemID); |
| 878 | ret.Add(n); | 877 | if (n != String.Empty) |
| 879 | break; | 878 | { |
| 879 | if (!ret.Contains(n)) | ||
| 880 | ret.Add(n); | ||
| 881 | break; | ||
| 882 | } | ||
| 880 | } | 883 | } |
| 881 | } | 884 | } |
| 882 | } | 885 | } |
| @@ -898,12 +901,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 898 | { | 901 | { |
| 899 | foreach (IScriptModule e in engines) | 902 | foreach (IScriptModule e in engines) |
| 900 | { | 903 | { |
| 901 | string n = e.GetXMLState(item.ItemID); | 904 | if (e != null) |
| 902 | if (n != "") | ||
| 903 | { | 905 | { |
| 904 | if (!ret.ContainsKey(item.ItemID)) | 906 | string n = e.GetXMLState(item.ItemID); |
| 905 | ret[item.ItemID] = n; | 907 | if (n != String.Empty) |
| 906 | break; | 908 | { |
| 909 | if (!ret.ContainsKey(item.ItemID)) | ||
| 910 | ret[item.ItemID] = n; | ||
| 911 | break; | ||
| 912 | } | ||
| 907 | } | 913 | } |
| 908 | } | 914 | } |
| 909 | } | 915 | } |