diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-13 15:15:51 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-13 15:15:51 -0800 |
| commit | eae15689d8af7e2cd37108fda833bcc87f63eb4b (patch) | |
| tree | 735dc7ac82a5d9f665b8fee5bd191381037f77db /indra/llui | |
| parent | c316edda259a3914ceb0c646a543f144c370a39b (diff) | |
| parent | 6ad8674a8c5a87f438aa5ad6230396a859ba268e (diff) | |
automated merge PE->viewer2.0
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index bd67949c2a..21f3f15739 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -2966,7 +2966,7 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y) LLUI::getMousePositionLocal(menu->getParent(), &mouse_x, &mouse_y); LLMenuHolderGL::sContextMenuSpawnPos.set(mouse_x,mouse_y); - const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getMenuRect(); + const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getRect(); const S32 HPAD = 2; LLRect rect = menu->getRect(); |