diff options
| author | Richard Linden <none@none> | 2011-03-28 17:38:54 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-28 17:38:54 -0700 |
| commit | 84b179b0bf254ae039dfdba330d25ac2df1c0a67 (patch) | |
| tree | 8e35dad1a88b3538722ee3d68891fa6ef9fdf779 /indra/llui | |
| parent | 5b316df2249fc62c1e6a4f089b9726c4e62f23e0 (diff) | |
| parent | d597efc0f365fa07de9b7c0641dc4297466bfae5 (diff) | |
Automated merge with file:///F:\code\viewer-autobuild2010
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); - - - } ///============================================================================ |