diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-30 10:09:05 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-30 10:09:05 +0100 |
| commit | 96099cff3851fa9546a4294ff23864c2d7e6b8c8 (patch) | |
| tree | a39f0797061585796a26ebcf28ea806c8006dcf0 /indra/newview/llviewermenu.cpp | |
| parent | 8996a338bd150c37fb2cafdefeba19b6eaf3bcc9 (diff) | |
| parent | 966882b3d9bf3e77a435d21a0cd53eb168aad283 (diff) | |
merge from viewer-release
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 090b7bba90..a83980dc23 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2411,6 +2411,8 @@ static void init_default_item_label(const std::string& item_name) boost::unordered_map<std::string, LLStringExplicit>::iterator it = sDefaultItemLabels.find(item_name); if (it == sDefaultItemLabels.end()) { + // *NOTE: This will not work for items of type LLMenuItemCheckGL because they return boolean value + // (doesn't seem to matter much ATM). LLStringExplicit default_label = gMenuHolder->childGetValue(item_name).asString(); if (!default_label.empty()) { |