summaryrefslogtreecommitdiff
path: root/indra/llui/llmenugl.cpp
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-01-20 18:06:32 +0100
committerKitty Barnett <develop@catznip.com>2012-01-20 18:06:32 +0100
commit9c66ac87fd46db3987e60ae50989b2497099480b (patch)
tree0b2e6d98f3790ee2c1394017567ef75b9cd426ab /indra/llui/llmenugl.cpp
parent4c5141c5677a2e98c1331026d4e119abee6ab2ae (diff)
STORM-276 Basic spellchecking framework
Diffstat (limited to 'indra/llui/llmenugl.cpp')
-rw-r--r--indra/llui/llmenugl.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 95ecbb1c94..2a65262bbb 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -3854,7 +3854,7 @@ void LLContextMenu::setVisible(BOOL visible)
}
// Takes cursor position in screen space?
-void LLContextMenu::show(S32 x, S32 y)
+void LLContextMenu::show(S32 x, S32 y, LLView* spawning_view)
{
if (getChildList()->empty())
{
@@ -3908,6 +3908,10 @@ void LLContextMenu::show(S32 x, S32 y)
setRect(rect);
arrange();
+ if (spawning_view)
+ mSpawningViewHandle = spawning_view->getHandle();
+ else
+ mSpawningViewHandle.markDead();
LLView::setVisible(TRUE);
}