diff options
| author | Melanie Thielker | 2009-04-20 13:56:16 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2009-04-20 13:56:16 +0000 |
| commit | 6a8fe8a84e257e4991b2d8bf1e8bac1d989aabe3 (patch) | |
| tree | 99760a2cd488eda2ae589e217fb9ababb04bf2e5 | |
| parent | Make sure that the groups module is really disabled when it's not configured. (diff) | |
| download | opensim-SC-6a8fe8a84e257e4991b2d8bf1e8bac1d989aabe3.zip opensim-SC-6a8fe8a84e257e4991b2d8bf1e8bac1d989aabe3.tar.gz opensim-SC-6a8fe8a84e257e4991b2d8bf1e8bac1d989aabe3.tar.bz2 opensim-SC-6a8fe8a84e257e4991b2d8bf1e8bac1d989aabe3.tar.xz | |
Prevent a null ref if a notecard is not found
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 56d7d50..ae4fcbc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -9209,6 +9209,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 9209 | 9209 | ||
| 9210 | WithNotecard(assetID, delegate (UUID id, AssetBase a) | 9210 | WithNotecard(assetID, delegate (UUID id, AssetBase a) |
| 9211 | { | 9211 | { |
| 9212 | if (a == null) | ||
| 9213 | return; | ||
| 9214 | |||
| 9212 | if (a.Type != 7) | 9215 | if (a.Type != 7) |
| 9213 | return; | 9216 | return; |
| 9214 | 9217 | ||
| @@ -9283,6 +9286,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 9283 | 9286 | ||
| 9284 | WithNotecard(assetID, delegate (UUID id, AssetBase a) | 9287 | WithNotecard(assetID, delegate (UUID id, AssetBase a) |
| 9285 | { | 9288 | { |
| 9289 | if (a == null) | ||
| 9290 | return; | ||
| 9291 | |||
| 9286 | if (a.Type != 7) | 9292 | if (a.Type != 7) |
| 9287 | return; | 9293 | return; |
| 9288 | 9294 | ||