aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authordahlia2013-06-27 18:01:17 -0700
committerdahlia2013-06-27 18:01:17 -0700
commitd47fc48b3230b6d5cb555014d6242960cd397810 (patch)
tree73ee2d47282b1cb7abc10e6e551fa10a7d16c585 /OpenSim/Region/OptionalModules
parenttest for null return from DynAttrs.GetStore() (diff)
downloadopensim-SC_OLD-d47fc48b3230b6d5cb555014d6242960cd397810.zip
opensim-SC_OLD-d47fc48b3230b6d5cb555014d6242960cd397810.tar.gz
opensim-SC_OLD-d47fc48b3230b6d5cb555014d6242960cd397810.tar.bz2
opensim-SC_OLD-d47fc48b3230b6d5cb555014d6242960cd397810.tar.xz
and yet another check for null returned from DynAttrs.GetStore()
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index be2d8da..34dc552 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -197,6 +197,10 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
197 if (part.DynAttrs.ContainsStore("OpenSim", "Materials")) 197 if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
198 { 198 {
199 OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials"); 199 OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
200
201 if (materialsStore == null)
202 return;
203
200 materialsStore.TryGetValue("Materials", out OSMaterials); 204 materialsStore.TryGetValue("Materials", out OSMaterials);
201 } 205 }
202 206