diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-04-21 15:46:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-04-21 15:46:27 -0400 |
| commit | 4322f4b21f1f8aaac56fefc4062b5b837d50ce84 (patch) | |
| tree | 5588ee95dbf42e873400cb1b2aa520fc1a64883a /indra | |
| parent | 922783ef6695df1eff783d1e597f257ff316181c (diff) | |
| parent | adf4b727c26f5906d78ac2a3fa6b88436baddcc0 (diff) | |
Merged in Ansariel/391-blizzard-496-merge-cleanup (pull request #29)
Fix further merge error in LLLiveLSLEditor::draw()
Diffstat (limited to 'indra')
| -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; } |