diff options
author | Richard Linden <none@none> | 2011-12-07 11:47:33 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2011-12-07 11:47:33 -0800 |
commit | afc19140575fb96826b12139d77c5b2174c4713e (patch) | |
tree | c19ffda9772e741ce58b9bfb66b854232d53dc4d /indra/llui | |
parent | ae8bf629834a1fe2d2707ec631ac1d487dda800a (diff) |
EXP-1652 FIX (Build tool floater size affected by viewer window size)
force all floaters to have follows flags = FOLLOWS_NONE and use llfloaterview::reshape logic instead
removed existing follows flags from any floater XUI and deprecated the follows parameter for floaters
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(); }; |