diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-02 17:06:08 -0500 | 
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-02 17:06:08 -0500 | 
| commit | d529abbfe62c879e4c0e6397e55cc80030b735b8 (patch) | |
| tree | 192c9f41686a8f6c32626b6b514978ae29a02b02 /indra/llui/llmenubutton.cpp | |
| parent | f0bca5f0683db1540b640191ab2780224aceb800 (diff) | |
| parent | 680328dd78e1d31a2f8836919a0f6140a76af5f4 (diff) | |
merge
Diffstat (limited to 'indra/llui/llmenubutton.cpp')
| -rw-r--r-- | indra/llui/llmenubutton.cpp | 7 | 
1 files changed, 7 insertions, 0 deletions
| diff --git a/indra/llui/llmenubutton.cpp b/indra/llui/llmenubutton.cpp index ac568a83e4..eed0085273 100644 --- a/indra/llui/llmenubutton.cpp +++ b/indra/llui/llmenubutton.cpp @@ -175,6 +175,13 @@ void LLMenuButton::updateMenuOrigin()  			mY = rect.mTop + mMenuHandle.get()->getRect().getHeight();  			break;  		} +		case MP_TOP_RIGHT: +		{ +			const LLRect& menu_rect = mMenuHandle.get()->getRect(); +			mX = rect.mRight - menu_rect.getWidth(); +			mY = rect.mTop + menu_rect.getHeight(); +			break; +		}  		case MP_BOTTOM_LEFT:  		{  			mX = rect.mLeft; | 
