diff options
author | Merov Linden <merov@lindenlab.com> | 2012-06-08 17:29:56 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 17:29:56 -0700 |
commit | ac6f0304c51b6b8c8e4414ff1bc254be78f0845d (patch) | |
tree | 0b211c8c84ff92e6cdbeeb8d0197314e4821a60c /indra/newview/llfloaterwebcontent.cpp | |
parent | 1aba6c119ef05a4cfd91325c8455dc8c60098746 (diff) | |
parent | cdb57cb299097b203581a6ef99840350831c321c (diff) |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterwebcontent.cpp')
-rw-r--r-- | indra/newview/llfloaterwebcontent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index 3b5c3663fb..3fe2518de6 100644 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -169,7 +169,7 @@ void LLFloaterWebContent::geometryChanged(const std::string &uuid, S32 x, S32 y, void LLFloaterWebContent::geometryChanged(S32 x, S32 y, S32 width, S32 height) { // Make sure the layout of the browser control is updated, so this calculation is correct. - LLLayoutStack::updateClass(); + getChild<LLLayoutStack>("stack1")->updateLayout(); // TODO: need to adjust size and constrain position to make sure floaters aren't moved outside the window view, etc. LLCoordWindow window_size; @@ -258,7 +258,7 @@ void LLFloaterWebContent::open_media(const Params& p) if (!p.preferred_media_size().isEmpty()) { - LLLayoutStack::updateClass(); + getChild<LLLayoutStack>("stack1")->updateLayout(); LLRect browser_rect = mWebBrowser->calcScreenRect(); LLCoordWindow window_size; getWindow()->getSize(&window_size); |