diff options
author | Richard Linden <none@none> | 2011-04-01 14:13:05 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-04-01 14:13:05 -0700 |
commit | 878b0e2da1b91f06757b349640e1ac22bccb3a55 (patch) | |
tree | 0cb57ebd49ad77879d02181998938730fffa3954 /indra/llui/llmenugl.cpp | |
parent | 4aad5ee313f580e08f9689b7ff4c4c088c20f831 (diff) | |
parent | 84f242ff4fc7743e909f53695a4e7a51c3c60299 (diff) |
Automated merge with http://bitbucket.org/merov_linden/viewer-autobuild2010
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); - - - } ///============================================================================ |