diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-02-21 12:05:46 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-02-21 12:05:46 -0700 |
| commit | 7674c00fb934b1269192553ccd0cd029d65a4e24 (patch) | |
| tree | b5ac7ac56e27105fcbf04d02aaebe31fdb6ce083 /indra/newview/llpreviewnotecard.cpp | |
| parent | 01d4fd2451f6ba2f4f17c7fbf0f9511d37b20e21 (diff) | |
| parent | 2c4133c8db131b08d40fc91e2881b873ea1a984d (diff) | |
Merge master (v 6.3.8) into DRTVWR-440
Diffstat (limited to 'indra/newview/llpreviewnotecard.cpp')
| -rw-r--r-- | indra/newview/llpreviewnotecard.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp index ee4104f77c..7ef0ef0e8b 100644 --- a/indra/newview/llpreviewnotecard.cpp +++ b/indra/newview/llpreviewnotecard.cpp @@ -367,6 +367,7 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs, previewEditor->makePristine(); BOOL modifiable = preview->canModify(preview->mObjectID, preview->getItem()); preview->setEnabled(modifiable); + preview->syncExternal(); preview->mAssetStatus = PREVIEW_ASSET_LOADED; } else @@ -503,10 +504,6 @@ bool LLPreviewNotecard::saveIfNeeded(LLInventoryItem* copyitem, bool sync) } editor->makePristine(); - if (sync) - { - syncExternal(); - } const LLInventoryItem* item = getItem(); // save it out to database if (item) @@ -760,6 +757,7 @@ void LLPreviewNotecard::openInExternalEditor() // Start watching file changes. mLiveFile = new LLLiveLSLFile(filename, boost::bind(&LLPreviewNotecard::onExternalChange, this, _1)); + mLiveFile->ignoreNextUpdate(); mLiveFile->addToEventTimer(); // Open it in external editor. |