diff options
| author | Ansariel <none@none> | 2016-04-14 14:03:43 +0200 |
|---|---|---|
| committer | Ansariel <none@none> | 2016-04-14 14:03:43 +0200 |
| commit | adf4b727c26f5906d78ac2a3fa6b88436baddcc0 (patch) | |
| tree | 984cab5b4bbf87a30a1ae98dc88c2af01a7f3419 | |
| parent | 3f7c999c30e2a72528a156f7dacdb06f1f1d173f (diff) | |
Fix further merge error in LLLiveLSLEditor::draw()
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index fc185667d7..5b1b356597 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -2083,9 +2083,7 @@ void LLLiveLSLEditor::draw() // incorrect after a release/claim cycle, but will be // correct after clicking on it. runningCheckbox->set(FALSE); - mMonoCheckbox->setEnabled(FALSE); - // object may have fallen out of range. - mHaveRunningInfo = FALSE; + mMonoCheckbox->set(FALSE); } } else if(!object) @@ -2094,6 +2092,7 @@ void LLLiveLSLEditor::draw() // Really ought to put in main window. setTitle(LLTrans::getString("ObjectOutOfRange")); runningCheckbox->setEnabled(FALSE); + mMonoCheckbox->setEnabled(FALSE); // object may have fallen out of range. mHaveRunningInfo = FALSE; } |