From 371085546d93c610770abe1182e2add1d75cb16e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Jun 2013 23:57:41 +0100
Subject: Add materials store null check into UuidGatherer code.

---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 4e5fb8e..8f69ce3 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -232,6 +232,10 @@ namespace OpenSim.Region.Framework.Scenes
                 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