From 5da967dc744f35d5270c7cb0b8b23b993ecda3e1 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 8 May 2009 07:58:49 +0000 Subject: merge skinning-7 -r 119501-119577 -> viewer-2.0.0-1 *NOTE: This overlaps a little with the skinning-7 -> skinning-8 merge of 119500-119692 -- James ignore-dead-branch --- indra/llui/llview.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'indra/llui/llview.cpp') 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); } -- cgit v1.2.3