diff options
| author | Richard Linden <none@none> | 2011-03-30 14:24:36 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-30 14:24:36 -0700 |
| commit | 5f4a85be9111793f25261b0551460e09e1656f18 (patch) | |
| tree | 3a85977c765291c93710ecc59abd5ae717d72b91 /indra/llui | |
| parent | 2f190297f0ff37452b3e966c0878e14a6aacc41b (diff) | |
| parent | 84b179b0bf254ae039dfdba330d25ac2df1c0a67 (diff) | |
Automated merge with bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.l2uc4d\http__bitbucket.org_merov_linden_viewer-autobuild2010_j2aqwu.hg
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lliconctrl.h | 1 | ||||
| -rw-r--r-- | indra/llui/llmenugl.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index e9bdab2d47..669e126266 100644 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -69,6 +69,7 @@ public: void setColor(const LLColor4& color) { mColor = color; } void setImage(LLPointer<LLUIImage> image) { mImagep = image; } + const LLPointer<LLUIImage> getImage() { return mImagep; } private: void setIconImageDrawSize() ; 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); - - - } ///============================================================================ |