From d47fc48b3230b6d5cb555014d6242960cd397810 Mon Sep 17 00:00:00 2001
From: dahlia <dahlia@nomail>
Date: Thu, 27 Jun 2013 18:01:17 -0700
Subject: [PATCH] and yet another check for null returned from
 DynAttrs.GetStore()

---
 .../Region/OptionalModules/Materials/MaterialsDemoModule.cs   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index be2d8da38e..34dc552d2e 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -197,6 +197,10 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
                 {
                     OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+
+                    if (materialsStore == null)
+                        return;
+
                     materialsStore.TryGetValue("Materials", out OSMaterials);
                 }