Skip to content
Snippets Groups Projects
Commit f1c8674a authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for storm-1809

parents 57fe6f66 93c570b3
No related branches found
No related tags found
No related merge requests found
......@@ -618,6 +618,7 @@ Jonathan Yap
STORM-1803
STORM-1799
STORM-1796
STORM-1809
STORM-1793
STORM-1810
Kadah Coba
......
......@@ -929,6 +929,13 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p)
tentative_label_p.rect(LLRect (0, image_middle + line_height / 2, getRect().getWidth(), image_middle - line_height / 2 ));
tentative_label_p.follows.flags(FOLLOWS_ALL);
mTentativeLabel = LLUICtrlFactory::create<LLTextBox> (tentative_label_p);
// It is no longer possible to associate a style with a textbox, so it has to be done in this fashion
LLStyle::Params style_params;
style_params.color = LLColor4::white;
mTentativeLabel->setText(LLTrans::getString("multiple_textures"), style_params);
mTentativeLabel->setHAlign(LLFontGL::HCENTER);
addChild( mTentativeLabel );
LLRect border_rect = getLocalRect();
......
......@@ -369,6 +369,9 @@ Please try logging in again in a minute.</string>
<string name="anim_yes_happy">Yes (Happy)</string>
<string name="anim_yes_head">Yes</string>
<!-- build floater -->
<string name="multiple_textures">Multiple</string>
<!-- world map -->
<string name="texture_loading">Loading...</string>
<string name="worldmap_offline">Offline</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment