summaryrefslogtreecommitdiff
path: root/indra/llui/lllineeditor.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-13 17:51:14 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-13 17:51:14 -0500
commit27f11d9868bc72e7096ae6266af1c6c9318c545e (patch)
tree12190521b6870891072e312c8b3e8864721aa075 /indra/llui/lllineeditor.h
parentfbab245e487650d6420c9fe33cf07123af12f422 (diff)
parentdd06d42c09e5e1f4b28559059ec8393e53f767a7 (diff)
merge
Diffstat (limited to 'indra/llui/lllineeditor.h')
-rw-r--r--indra/llui/lllineeditor.h2
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.