diff options
| author | dahlia | 2013-06-27 17:53:15 -0700 |
|---|---|---|
| committer | dahlia | 2013-06-27 17:53:15 -0700 |
| commit | c1b8f83dd4ad3e3c811a16b4b096edab7abccf8e (patch) | |
| tree | 31af46ecf08d6beefdc77f523788f5875606c7af /OpenSim/Region | |
| parent | refactor: Move code for gathering textures referenced by materials into Mater... (diff) | |
| download | opensim-SC_OLD-c1b8f83dd4ad3e3c811a16b4b096edab7abccf8e.zip opensim-SC_OLD-c1b8f83dd4ad3e3c811a16b4b096edab7abccf8e.tar.gz opensim-SC_OLD-c1b8f83dd4ad3e3c811a16b4b096edab7abccf8e.tar.bz2 opensim-SC_OLD-c1b8f83dd4ad3e3c811a16b4b096edab7abccf8e.tar.xz | |
test for null return from DynAttrs.GetStore()
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
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 | |||
| 590 | if (part.DynAttrs.ContainsStore("OpenSim", "Materials")) | 590 | if (part.DynAttrs.ContainsStore("OpenSim", "Materials")) |
| 591 | { | 591 | { |
| 592 | OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials"); | 592 | OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials"); |
| 593 | if (materialsStore == null) | ||
| 594 | return; | ||
| 595 | |||
| 593 | materialsStore.TryGetValue("Materials", out osdMaterials); | 596 | materialsStore.TryGetValue("Materials", out osdMaterials); |
| 594 | } | 597 | } |
| 595 | 598 | ||