diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-31 14:26:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-31 14:26:15 -0400 |
| commit | 925db41711bc319e870aa35f74b58f4e7a74420c (patch) | |
| tree | 69bac61403e5e432c073fb3e7ea29b6c3107a142 /indra/llui/llmenugl.cpp | |
| parent | f09bd7669fcf976edf82c3ce70b26ea044019c67 (diff) | |
| parent | 5cad51594dc583c63bf88376feedb0b170868d3d (diff) | |
merge changes for storm-276
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index ff6928ffda..3c14bf5415 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); } |