diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:26:12 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:26:12 -0400 |
| commit | b68d1a0f50c073257fb48692b666bb692d0c9981 (patch) | |
| tree | 46ca2d8a49a2fd8dc3d98db6da926faf84c31b8a /indra/llui/llmenugl.cpp | |
| parent | 6715603b6a991f822274b000e5d8fb9b8d405464 (diff) | |
| parent | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (diff) | |
Merge viewer-pre-beta -> seraph-viewer-pre-beta
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); - - - } ///============================================================================ |