diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2018-01-16 16:08:08 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2018-01-16 16:08:08 +0200 |
| commit | df45a4ef146a0eaa78d3a174bbc68bb67f0dee36 (patch) | |
| tree | cf3892d9499506a0740300ddf0b6ddce1a9ebfec /indra/newview | |
| parent | 3229b34a078fb3a69efaf8cd72f596d5f8be4ef6 (diff) | |
MAINT-7732 Crash in LLLiveLSLEditor::loadScriptText(..)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 6ecc4c7fb9..945f3c370c 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -2041,7 +2041,15 @@ void LLLiveLSLEditor::loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType mScriptEd->setScriptText(LLStringExplicit(&buffer[0]), TRUE); mScriptEd->makeEditorPristine(); - mScriptEd->setScriptName(getItem()->getName()); + + std::string script_name = DEFAULT_SCRIPT_NAME; + const LLInventoryItem* inv_item = getItem(); + + if(inv_item) + { + script_name = inv_item->getName(); + } + mScriptEd->setScriptName(script_name); } |