diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-05-29 11:49:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-05-29 11:49:46 -0400 |
| commit | c18a4cb0117b6e865a72a01465606c67a7e3bf6d (patch) | |
| tree | 25abf867eabd03b7804a1e36e9c9af2513636cc7 /indra/newview/llpreviewscript.cpp | |
| parent | 77344afa8b39b4c1fcebda4de63998a67fd4debb (diff) | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
merge changes for 5.1.4-release
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
| -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); } |