diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-07 17:00:17 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-07 17:00:17 -0800 |
| commit | bba8f747d1ef32e98d309269b3978c5a278133ea (patch) | |
| tree | 328d62671332289d66341e1f024f78dcdaa7f7e3 /indra/llui | |
| parent | 35020db3a9310742c9759673e3aa1bbb1d7aa02f (diff) | |
| parent | 1df76279212aef112356570356e4c195490fec3b (diff) | |
Merge with latest viewer-experience
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 6 | ||||
| -rw-r--r-- | indra/llui/llfloater.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 40b550269c..33548151fd 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -195,7 +195,8 @@ LLFloater::Params::Params() dock_pressed_image("dock_pressed_image"), help_pressed_image("help_pressed_image"), open_callback("open_callback"), - close_callback("close_callback") + close_callback("close_callback"), + follows("follows") { changeDefault(visible, false); } @@ -2965,6 +2966,9 @@ void LLFloater::initFromParams(const LLFloater::Params& p) // control_name, tab_stop, focus_lost_callback, initial_value, rect, enabled, visible LLPanel::initFromParams(p); + // override any follows flags + setFollows(FOLLOWS_NONE); + mTitle = p.title; mShortTitle = p.short_title; applyTitle(); diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index c70eb0958d..59b35d206f 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -156,6 +156,8 @@ public: Optional<CommitCallbackParam> open_callback, close_callback; + + Ignored follows; Params(); }; |