Merged in Ansariel/391-blizzard-496-merge-cleanup (pull request #27)

Fix old merge issue in LLLiveLSLEditor::draw()
meow-7.2.2
Oz Linden 2016-04-05 09:07:32 -04:00
commit b30f2b6ffa
1 changed files with 0 additions and 17 deletions

View File

@ -2160,23 +2160,6 @@ void LLLiveLSLEditor::draw()
{
runningCheckbox->setLabel(getString("script_running"));
runningCheckbox->setEnabled(!mIsSaving);
if(object->permAnyOwner())
{
runningCheckbox->setLabel(getString("script_running"));
runningCheckbox->setEnabled(!mIsSaving);
}
else
{
runningCheckbox->setLabel(getString("public_objects_can_not_run"));
runningCheckbox->setEnabled(FALSE);
// *FIX: Set it to false so that the ui is correct for
// a box that is released to public. It could be
// incorrect after a release/claim cycle, but will be
// correct after clicking on it.
runningCheckbox->set(FALSE);
mMonoCheckbox->set(FALSE);
}
}
else
{