diff options
| author | McCabe Maxsted | 2011-04-05 00:12:17 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-04-05 00:12:42 -0700 |
| commit | 3487cd338227871bbc64c134481c7e567e8e7eae (patch) | |
| tree | 751f6a36cf16ac7a1bb7cd95ec56a3e88cd5e039 /linden/indra | |
| parent | Fixed viewer crash when hair etc. is attached to the HUD, ported from Singula... (diff) | |
| download | meta-impy-3487cd338227871bbc64c134481c7e567e8e7eae.zip meta-impy-3487cd338227871bbc64c134481c7e567e8e7eae.tar.gz meta-impy-3487cd338227871bbc64c134481c7e567e8e7eae.tar.bz2 meta-impy-3487cd338227871bbc64c134481c7e567e8e7eae.tar.xz | |
Added a nullcheck, from Singularity, patch by Shoytl
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp index 65c1d11..58b8490 100644 --- a/linden/indra/newview/llviewerobject.cpp +++ b/linden/indra/newview/llviewerobject.cpp | |||
| @@ -4581,7 +4581,7 @@ bool LLViewerObject::setParameterEntry(U16 param_type, const LLNetworkData& new_ | |||
| 4581 | bool LLViewerObject::setParameterEntryInUse(U16 param_type, BOOL in_use, bool local_origin) | 4581 | bool LLViewerObject::setParameterEntryInUse(U16 param_type, BOOL in_use, bool local_origin) |
| 4582 | { | 4582 | { |
| 4583 | ExtraParameter* param = getExtraParameterEntryCreate(param_type); | 4583 | ExtraParameter* param = getExtraParameterEntryCreate(param_type); |
| 4584 | if (param->in_use != in_use) | 4584 | if (param && param->in_use != in_use) |
| 4585 | { | 4585 | { |
| 4586 | param->in_use = in_use; | 4586 | param->in_use = in_use; |
| 4587 | parameterChanged(param_type, param->data, in_use, local_origin); | 4587 | parameterChanged(param_type, param->data, in_use, local_origin); |