diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-10 15:30:38 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-10 15:30:38 -0700 |
| commit | 8b5ce1e474ac621fc0d8da029e710734792e319d (patch) | |
| tree | d5ad22286bd84418d9ba6356017003d891165243 /indra/newview/llimview.cpp | |
| parent | c64e878333ed86c83b0d82c10cc61d4d8d3e8af2 (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Pull merge from lindenlab/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; } |