diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-18 10:07:40 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-18 10:07:40 -0400 |
commit | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (patch) | |
tree | 3916874ed180ee9567b4fb76d88d8ce72689c257 /indra/llui/llmenugl.cpp | |
parent | d534c8009f2573400a21c19b00691536fc3cc23f (diff) | |
parent | b8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff) |
merged from 2.6.4-start tag in viewer-development
Diffstat (limited to 'indra/llui/llmenugl.cpp')
-rw-r--r-- | indra/llui/llmenugl.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index f0374de98f..8de9c769e2 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -3105,9 +3105,6 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y) CURSOR_HEIGHT + MOUSE_CURSOR_PADDING * 2); menu->translateIntoRectWithExclusion( menu_region_rect, mouse_rect, FALSE ); menu->getParent()->sendChildToFront(menu); - - - } ///============================================================================ |