diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-04 12:21:59 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-04 12:21:59 +0100 |
| commit | 0a55a522a65d2e59b736c3c53feba0a0bbf865d0 (patch) | |
| tree | d3b863060ca415270b0afdc8c97a99653f9e08cf /indra | |
| parent | 4e966c1b15dc9f6abe7cf8e23fd2c8b1c5f8b929 (diff) | |
| parent | ec06fa16ec73d033ac70f9896f382aa4af993403 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 12007f7b52..46a7215707 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -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"; |