From c1b8f83dd4ad3e3c811a16b4b096edab7abccf8e Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 27 Jun 2013 17:53:15 -0700
Subject: test for null return from DynAttrs.GetStore()

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

(limited to 'OpenSim/Region/OptionalModules/Materials')

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index e7b8928..be2d8da 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -590,6 +590,9 @@ 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 osdMaterials);
                 }
 
-- 
cgit v1.1