diff --git a/indra/newview/llfloatertoybox.cpp b/indra/newview/llfloatertoybox.cpp index a025a859e7de67623b99d5a40798b3a3bb83d967..ee19b6cc6e939b89d1fa073fcae4089d38f45a83 100644 --- a/indra/newview/llfloatertoybox.cpp +++ b/indra/newview/llfloatertoybox.cpp @@ -178,6 +178,7 @@ void LLFloaterToybox::onToolBarButtonEnter(LLView* button) case LLToolBarEnums::TOOLBAR_BOTTOM: suffix = LLTrans::getString("Toolbar_Bottom_Tooltip"); break; case LLToolBarEnums::TOOLBAR_LEFT: suffix = LLTrans::getString("Toolbar_Left_Tooltip"); break; case LLToolBarEnums::TOOLBAR_RIGHT: suffix = LLTrans::getString("Toolbar_Right_Tooltip"); break; + case LLToolBarEnums::TOOLBAR_TOP: suffix = LLTrans::getString("Toolbar_Top_Tooltip"); break; default: break; diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 82e26499ee82420bb16cf19b177948cc9233335e..925cb4eaaee3e839a5737779dc01c2c3883baec6 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1989,6 +1989,10 @@ LLDockControl::DocAt LLCallDialog::getDockControlPos(const std::string& toolbarB case LLToolBarEnums::TOOLBAR_RIGHT: doc_at = LLDockControl::LEFT; break; + + case LLToolBarEnums::TOOLBAR_TOP: + doc_at = LLDockControl::BOTTOM; + break; } return doc_at; diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 22275fbed391b17f9f4c9ecb4738bbe27ebf9bc0..646beef124b9942ff750bd2d573e502f3dc0f73e 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4196,6 +4196,7 @@ Try enclosing path to the editor with double quotes. <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string> <string name="Command_Webbrowser_Tooltip">Open a web browser inside [APP_NAME]</string> + <string name="Toolbar_Top_Tooltip">currently in your top toolbar</string> <string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string> <string name="Toolbar_Left_Tooltip" >currently in your left toolbar</string> <string name="Toolbar_Right_Tooltip" >currently in your right toolbar</string>