diff options
author | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
commit | bc54f1bb89452467ca8b652e4b961444d9c4be8d (patch) | |
tree | b5aac588bc7ec1506456eaf5967e9a7930b42fc0 /indra/newview/llfloaterwebcontent.cpp | |
parent | 05d721cecfa0c20a6fd8498a18f36cde7014248e (diff) | |
parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) |
Merge : pull from lindenlab/viewer-release
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); |