diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-07-30 10:15:48 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-07-30 10:15:48 -0400 |
| commit | 8d707f0ed26119fc2670c133ce79f06826619609 (patch) | |
| tree | f683614756b73c5ec0fd53673575e6b15ac6de2d /indra/newview | |
| parent | 19c0d6d4eaf21cbfc96d7057c11db35edf73f2fe (diff) | |
| parent | 966882b3d9bf3e77a435d21a0cd53eb168aad283 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -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 df8e127b1f..23e502c76f 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()) { |