diff options
| author | James Cook <james@lindenlab.com> | 2009-12-16 16:04:26 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-16 16:04:26 -0800 |
| commit | 4c0d5200bc7a53537f9ee7028e74c1feb4abc52e (patch) | |
| tree | 85a48a0e970c5376ab216d86b068db303ead30af /indra/llui/llview.cpp | |
| parent | 699d038af4edf9e854525ea380905737b645ebfc (diff) | |
| parent | e8fe81c4fcbec173606b5ad635e0b774e4d8b24b (diff) | |
Merge
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 9f6fc1f298..7932b749a8 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -2501,8 +2501,6 @@ void LLView::setupParams(LLView::Params& p, LLView* parent) p.layout = parent->getLayout(); } - p.from_xui = true; - if (parent) { LLRect parent_rect = parent->getLocalRect(); @@ -2518,7 +2516,7 @@ void LLView::setupParams(LLView::Params& p, LLView* parent) } // convert negative or centered coordinates to parent relative values - // Note: some of this logic matches the logic in TypedParam<LLRect>::setValueFromBlock() + // Note: some of this logic matches the logic in TypedParam<LLRect>::getValueFromBlock() if (p.center_horiz) { |