diff options
| author | richard <none@none> | 2009-10-30 17:46:28 -0700 |
|---|---|---|
| committer | richard <none@none> | 2009-10-30 17:46:28 -0700 |
| commit | c964f281906e760c88c4f01edc566df35291ddff (patch) | |
| tree | 431bef201d87f3628c9702a5ec73ca8737d198b5 /indra/llui/lluictrl.cpp | |
| parent | 123db56856ef0451e28fe7ac7ce3bcc27d3066f1 (diff) | |
| parent | b82bda605d85fe9b1ad69ce36a36de18a2924924 (diff) | |
merge
Diffstat (limited to 'indra/llui/lluictrl.cpp')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index 0faff5eff6..08fc8fb784 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -42,6 +42,7 @@ static LLDefaultChildRegistry::Register<LLUICtrl> r("ui_ctrl"); LLUICtrl::Params::Params() : tab_stop("tab_stop", true), + chrome("chrome", false), label("label"), initial_value("value"), init_callback("init_callback"), @@ -86,6 +87,7 @@ void LLUICtrl::initFromParams(const Params& p) { LLView::initFromParams(p); + setIsChrome(p.chrome); setControlName(p.control_name); if(p.enabled_controls.isProvided()) { @@ -582,7 +584,6 @@ void LLUICtrl::setIsChrome(BOOL is_chrome) // virtual BOOL LLUICtrl::getIsChrome() const { - LLView* parent_ctrl = getParent(); while(parent_ctrl) { |