diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
commit | baa73fddd9287ddafd2d31551cb253b355ed910a (patch) | |
tree | e3f0986617fe6c0ee0a14df6aac13c6bb6f92507 /indra/newview/lloutputmonitorctrl.h | |
parent | dc3833f31b8a20220ddb1775e1625c016c397435 (diff) | |
parent | fcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 (diff) |
Merge with viewer-2.0.0-3 branch
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.h')
-rw-r--r-- | indra/newview/lloutputmonitorctrl.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h index d5ab8e75ce..881ad0f010 100644 --- a/indra/newview/lloutputmonitorctrl.h +++ b/indra/newview/lloutputmonitorctrl.h @@ -49,14 +49,18 @@ class LLOutputMonitorCtrl public: struct Params : public LLInitParam::Block<Params, LLView::Params> { + Optional<bool> draw_border; + Params() { + draw_border = true; name = "output_monitor"; follows.flags(FOLLOWS_LEFT|FOLLOWS_TOP); mouse_opaque = false; - } + }; }; protected: + bool mBorder; LLOutputMonitorCtrl(const Params&); friend class LLUICtrlFactory; |