summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-12-22 14:06:46 -0800
committerMerov Linden <merov@lindenlab.com>2010-12-22 14:06:46 -0800
commitc86d6a7bbb7c0db7665b76cf52b12b90c6e98c6d (patch)
tree1056d6dc941e2aed458b459901fbb448c6e40ef7 /indra/newview/llchathistory.cpp
parentab100825bd0064dc64b9ef8bea1c70bc04090716 (diff)
parent6182ded4e9b4ba076add7a840c535589d36ec283 (diff)
STORM-808 : merge webkit upgrade to Qt v4.7.1
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 6e778de2d8..c98bcbda45 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<LLLayoutStack>(layout_p, this);