Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set Text Editor Enabled before loading text into it

Browse Source
This commit is contained in:
Lirusaito
2019-03-01 16:00:30 -05:00
parent 2b8c630922
commit 1c2c10fc58
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llpreviewnotecard.cpp
View File

@@ -388,7 +388,11 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
// put a EOS at the end
buffer[file_length] = 0;
// Singu Note: Set Enabled first, it determines whether or not our text will be linked
const LLInventoryItem* item = preview->getItem();
BOOL modifiable = item && gAgent.allowOperation(PERM_MODIFY,
item->getPermissions(), GP_OBJECT_MANIPULATE);
preview->setEnabled(modifiable);
if (LLViewerTextEditor* previewEditor = preview->findChild<LLViewerTextEditor>("Notecard Editor"))
{
if ((file_length > 19) && !strncmp(buffer, "Linden text version", 19))
@@ -406,11 +410,6 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
previewEditor->makePristine();
}
const LLInventoryItem* item = preview->getItem();
BOOL modifiable = item && gAgent.allowOperation(PERM_MODIFY,
item->getPermissions(), GP_OBJECT_MANIPULATE);
preview->setEnabled(modifiable);
delete[] buffer;
preview->mAssetStatus = PREVIEW_ASSET_LOADED;
}