diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-30 10:06:30 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-30 10:06:30 +0100 |
| commit | 966882b3d9bf3e77a435d21a0cd53eb168aad283 (patch) | |
| tree | d71f11ca8f227d787d2b5c5de56327d8e364fd2f /indra/newview | |
| parent | 7a4174447a0762dcab2769d1401295b78c9341fd (diff) | |
| parent | 45adf1d6124e72be55a5764a72a58cde8b7c85fe (diff) | |
merge from PE's viewer-release
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()) { |