diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-03-19 12:53:05 +0000 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-03-19 12:53:05 +0000 |
| commit | 62be7c38965deb79cbd984cfd4546be040f9c465 (patch) | |
| tree | 492a84da19dc4ba05d41fdc083ad5f579f39b2ee /indra/newview/llpreviewnotecard.cpp | |
| parent | 9a6dcc011c54f65e5da3c3b92074386946d8f291 (diff) | |
| parent | 328329fceab6b18dd7dda6f7ce9a3d4788fd7c54 (diff) | |
Merged master into sl-11445_fmodstudio
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 1533a27469..2f534ac245 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) @@ -755,6 +752,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. |