diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-08-31 13:47:47 -0700 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-08-31 13:47:47 -0700 |
commit | 30ff6cabd61f2f083df5df1e6e70cc94742af477 (patch) | |
tree | 631935f1cf59d19a91cdad65e9a75fe825afda7d /indra/newview/lltoolview.cpp | |
parent | ff11d74820c89822cd067b51727d9df1dc87d0d0 (diff) | |
parent | 3ac3a4b206c08ed06b889bdaa24074b6aa0e020a (diff) |
Merge with trunk
Diffstat (limited to 'indra/newview/lltoolview.cpp')
-rw-r--r-- | indra/newview/lltoolview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolview.cpp b/indra/newview/lltoolview.cpp index 9f6a77d245..f8393ebc47 100644 --- a/indra/newview/lltoolview.cpp +++ b/indra/newview/lltoolview.cpp @@ -65,9 +65,9 @@ LLToolContainer::~LLToolContainer() LLToolView::LLToolView(const std::string& name, const LLRect& rect) -: LLView(name, rect, MOUSE_OPAQUE), - mButtonCount(0) +: mButtonCount(0) { + LLView::init(LLView::Params().name(name).rect(rect).mouse_opaque(true)); } |