Merge branch 'master' into vehicles

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
                 {
                     foreach (IScriptModule e in engines)
                     {
-                        string n = e.GetAssemblyName(item.ItemID);
-                        if (n != "")
+                        if (e != null)
                         {
-                            if (!ret.Contains(n))
-                                ret.Add(n);
-                            break;
+                            string n = e.GetAssemblyName(item.ItemID);
+                            if (n != String.Empty)
+                            {
+                                if (!ret.Contains(n))
+                                    ret.Add(n);
+                                break;
+                            }
                         }
                     }
                 }
@@ -898,12 +901,15 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     foreach (IScriptModule e in engines)
                     {
-                        string n = e.GetXMLState(item.ItemID);
-                        if (n != "")
+                        if (e != null)
                         {
-                            if (!ret.ContainsKey(item.ItemID))
-                                ret[item.ItemID] = n;
-                            break;
+                            string n = e.GetXMLState(item.ItemID);
+                            if (n != String.Empty)
+                            {
+                                if (!ret.ContainsKey(item.ItemID))
+                                    ret[item.ItemID] = n;
+                                break;
+                            }
                         }
                     }
                 }