diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-06-18 11:32:53 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-06-18 11:32:53 -0700 |
| commit | a4d60d6721c62511ba7a26352e3b5d35cd0dbb94 (patch) | |
| tree | 082fa1927273936fa07b9b500a7a3548833cbb6f /indra/llui/lllineeditor.cpp | |
| parent | 4bcf2079f15a09d40f1d7aa61b2768cc54dc427a (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Pulled merge from release.
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
| -rwxr-xr-x | indra/llui/lllineeditor.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index d410a2de33..b09c927782 100755 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -192,6 +192,7 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p) setPrevalidateInput(p.prevalidate_input_callback()); setPrevalidate(p.prevalidate_callback()); + llassert(LLMenuGL::sMenuContainer != NULL); LLContextMenu* menu = LLUICtrlFactory::instance().createFromFile<LLContextMenu> ("menu_text_editor.xml", LLMenuGL::sMenuContainer, |