diff options
| author | Don Kjer <don@lindenlab.com> | 2010-12-13 12:34:39 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2010-12-13 12:34:39 -0800 |
| commit | 9a322d1b7a6ee5380f8724b33a20c56c9583f093 (patch) | |
| tree | 70ee8e942f30ac3ed2f371b60cfcba9adfd961c2 /indra/llui/lllineeditor.h | |
| parent | f4884faf3a020a718c611f34aa534e80d8a8b666 (diff) | |
| parent | e27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff) | |
Merge from viewer-development
Diffstat (limited to 'indra/llui/lllineeditor.h')
| -rw-r--r-- | indra/llui/lllineeditor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index a1aa6b71c6..ce2dfdeeb8 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -336,7 +336,7 @@ protected: std::vector<S32> mPreeditPositions; LLPreeditor::standouts_t mPreeditStandouts; - LLHandle<LLView> mContextMenuHandle; + LLHandle<LLContextMenu> mContextMenuHandle; private: // Instances that by default point to the statics but can be overidden in XML. |