diff options
author | simon <none@none> | 2013-11-25 09:17:29 -0800 |
---|---|---|
committer | simon <none@none> | 2013-11-25 09:17:29 -0800 |
commit | 5756b7b3d05ce330e9877650ba6af04aaa4da49d (patch) | |
tree | a1668748b931f0b0a9bd2df80aa24b1c156e8f9e /indra/newview/llimview.cpp | |
parent | f1be57cd30489902e44d7843703a39987f379c69 (diff) | |
parent | 1ae4d45337b380213112183f153a631d4c3f3289 (diff) |
Merge - doh!
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; } |