diff options
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 462fd16b60..536d0c23f8 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -2341,7 +2341,14 @@ void LLView::initFromParams(const LLView::Params& params) void LLView::parseFollowsFlags(const LLView::Params& params) { - if (params.follows.string.isProvided()) + // preserve follows flags set by code if user did not override + if (!params.follows.isProvided()) + { + return; + } + + // interpret either string or bitfield version of follows + if (params.follows.string.isChosen()) { setFollows(FOLLOWS_NONE); @@ -2378,7 +2385,7 @@ void LLView::parseFollowsFlags(const LLView::Params& params) ++token_iter; } } - else if (params.follows.flags.isProvided()) + else if (params.follows.flags.isChosen()) { setFollows(params.follows.flags); } |