diff options
| author | Justin Clark-Casey (justincc) | 2013-06-28 23:57:41 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-06-28 23:57:41 +0100 |
| commit | 371085546d93c610770abe1182e2add1d75cb16e (patch) | |
| tree | 93b9e7b1de960844e8f3ae602b332bb6bb124afe | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-371085546d93c610770abe1182e2add1d75cb16e.zip opensim-SC_OLD-371085546d93c610770abe1182e2add1d75cb16e.tar.gz opensim-SC_OLD-371085546d93c610770abe1182e2add1d75cb16e.tar.bz2 opensim-SC_OLD-371085546d93c610770abe1182e2add1d75cb16e.tar.xz | |
Add materials store null check into UuidGatherer code.
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 4 |
1 files changed, 4 insertions, 0 deletions
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 | |||
| 232 | if (part.DynAttrs.ContainsStore("OpenSim", "Materials")) | 232 | if (part.DynAttrs.ContainsStore("OpenSim", "Materials")) |
| 233 | { | 233 | { |
| 234 | OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials"); | 234 | OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials"); |
| 235 | |||
| 236 | if (materialsStore == null) | ||
| 237 | return; | ||
| 238 | |||
| 235 | materialsStore.TryGetValue("Materials", out osdMaterials); | 239 | materialsStore.TryGetValue("Materials", out osdMaterials); |
| 236 | } | 240 | } |
| 237 | 241 | ||