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

Annoying Crash Fix.

Browse Source 
This fixes that thing where saving scripts in deleted object makes
viewer go FFFFFF.
This commit is contained in:
Drake Arconis
2012-02-21 10:56:27 -05:00
parent 803011582c
commit 3250725aae
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llpreviewscript.cpp
View File

@@ -2301,6 +2301,13 @@ void LLLiveLSLEditor::saveIfNeeded()
return;
}
// [RLVa:KB] - Checked: 2010-11-25 (RLVa-1.2.2b) | Modified: RLVa-1.2.2b
if ( (rlv_handler_t::isEnabled()) && (gRlvAttachmentLocks.isLockedAttachment(object->getRootEdit())) )
{
return;
}
// [/RLVa:KB]
// get the latest info about it. We used to be losing the script
// name on save, because the viewer object version of the item,
// and the editor version would get out of synch. Here's a good
@@ -2607,14 +2614,6 @@ void LLLiveLSLEditor::onSave(void* userdata, BOOL close_after_save)
{
LLLiveLSLEditor* self = (LLLiveLSLEditor*)userdata;
// [RLVa:KB] - Checked: 2010-09-28 (RLVa-1.2.1f) | Modified: RLVa-1.0.5a
const LLViewerObject* pObject = gObjectList.findObject(self->mObjectID);
if ( (rlv_handler_t::isEnabled()) && (gRlvAttachmentLocks.isLockedAttachment(pObject->getRootEdit())) )
{
return;
}
// [/RLVa:KB]
self->mCloseAfterSave = close_after_save;
self->saveIfNeeded();
}