diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-20 11:21:17 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-20 11:21:17 -0800 |
| commit | dee57bea2526c84fb753abfd08e22c19f1cad21c (patch) | |
| tree | 7fbe9a8cbb5957b78a37eb13f58f8b6786ec8cac /indra/llui/lllineeditor.h | |
| parent | 67ca1c0b62cec74495104c0d78fc3743775bfd4e (diff) | |
| parent | 25eef545fd7f6513ae4c590126aef1dc06494f56 (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 d9d36b73a3..723423a5b9 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -337,7 +337,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. |