diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-13 12:03:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-13 12:03:53 -0400 |
| commit | 6bdfc3d0482b3bbfb55abdb71220ea19391fbe14 (patch) | |
| tree | e0557f36fe0f02e0fdeb2952d2477c01a7498a63 /indra/llui/llmenugl.cpp | |
| parent | 19f356202a9516664c1cacb9b50e9b6e1e072375 (diff) | |
| parent | c77fcfb7a8aeb2f271b050171bf0d6a9bd4c955b (diff) | |
merge out changes up to but not including the STORM-610 change
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); - - - } ///============================================================================ |