diff options
author | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
commit | 706ec08deb3feaea9c5c3516dea657b86b0474c3 (patch) | |
tree | a918eac8a10e43b78d156cb0620520420f0dfc62 /indra/newview/llimview.cpp | |
parent | d2bb4dae980a887a30b206875d8f9419901ed66a (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
Merged in viewer-release
Diffstat (limited to 'indra/newview/llimview.cpp')
-rwxr-xr-x | indra/newview/llimview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 9ffbd1a675..70ffdc14ff 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1959,11 +1959,11 @@ LLDockControl::DocAt LLCallDialog::getDockControlPos(const std::string& toolbarB switch (toolbar_loc) { - case LLToolBarView::TOOLBAR_LEFT: + case LLToolBarEnums::TOOLBAR_LEFT: doc_at = LLDockControl::RIGHT; break; - case LLToolBarView::TOOLBAR_RIGHT: + case LLToolBarEnums::TOOLBAR_RIGHT: doc_at = LLDockControl::LEFT; break; } |