livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge from PE's viewer-trunk

meow-7.2.2
Tofu Linden 2010-08-04 12:21:59 +01:00
parent 4e966c1b15 ec06fa16ec
commit 0a55a522a6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/llmenugl.cpp
View File

@ -58,6 +58,7 @@
#include "llbutton.h"
#include "llfontgl.h"
#include "llresmgr.h"
#include "lltrans.h"
#include "llui.h"
#include "llstl.h"
@ -2272,8 +2273,9 @@ void LLMenuGL::createSpilloverBranch()
// technically, you can't tear off spillover menus, but we're passing the handle
// along just to be safe
LLMenuGL::Params p;
std::string label = LLTrans::getString("More");
p.name("More");
p.label("More"); // *TODO: Translate
p.label(label);
p.bg_color(mBackgroundColor);
p.bg_visible(true);
p.can_tear_off(false);
@ -2282,7 +2284,7 @@ void LLMenuGL::createSpilloverBranch()
LLMenuItemBranchGL::Params branch_params;
branch_params.name = "More";
branch_params.label = "More"; // *TODO: Translate
branch_params.label = label;
branch_params.branch = mSpilloverMenu;
branch_params.font.style = "italic";