diff options
author | Richard Linden <none@none> | 2010-11-15 15:52:54 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2010-11-15 15:52:54 -0800 |
commit | 50d21a75a7c6a41a5a3355a8c4406a33454c70dd (patch) | |
tree | e2fe3e855d710700cd956b505a3f0548038c9dac /indra/llui/lllineeditor.h | |
parent | e8e1d7e629b9a4a65cde766ed81334140a749428 (diff) | |
parent | 4bdac3f152862b257b9babe9b5a43329c9f544f9 (diff) |
merge
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. |