Skip to content
Snippets Groups Projects
Commit 172e85d6 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix a few bugs with call dialog and toyboy with the top toolbar

parent 78b50c6a
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -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;
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment