From f8d08af9f1e810c977626e4131baf771d2b3655c Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 23 Nov 2010 16:25:10 -0800 Subject: SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1 converted LLLayoutStack orientation param to use named enums --- indra/newview/llchathistory.cpp | 2 +- indra/newview/llmediactrl.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 271ee0c4a4..e933770601 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -586,7 +586,7 @@ void LLChatHistory::initFromParams(const LLChatHistory::Params& p) LLLayoutStack::Params layout_p; layout_p.rect = stack_rect; layout_p.follows.flags = FOLLOWS_ALL; - layout_p.orientation = "vertical"; + layout_p.orientation = LLLayoutStack::VERTICAL; layout_p.mouse_opaque = false; LLLayoutStack* stackp = LLUICtrlFactory::create(layout_p, this); diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 6595ee2bcc..54c7d361b7 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -109,7 +109,7 @@ void LLWindowShade::initFromParams(const LLWindowShade::Params& params) layout_p.rect = LLRect(0,getLocalRect().mTop,getLocalRect().mRight, 30); layout_p.follows.flags = FOLLOWS_ALL; layout_p.mouse_opaque = false; - layout_p.orientation = "vertical"; + layout_p.orientation = LLLayoutStack::VERTICAL; LLLayoutStack* stackp = LLUICtrlFactory::create(layout_p); addChild(stackp); @@ -135,7 +135,7 @@ void LLWindowShade::initFromParams(const LLWindowShade::Params& params) layout_p = LLUICtrlFactory::getDefaultParams(); layout_p.rect = LLRect(0, 30, 800, 0); layout_p.follows.flags = FOLLOWS_ALL; - layout_p.orientation = "horizontal"; + layout_p.orientation = LLLayoutStack::HORIZONTAL; stackp = LLUICtrlFactory::create(layout_p); notification_panel->addChild(stackp); -- cgit v1.2.3