diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-28 16:41:06 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-28 16:41:06 -0600 |
| commit | 746037362ed07af0c799caf22cf9e425744359a0 (patch) | |
| tree | 2e4c83fee5334da2071103fa4706ac4abb218490 /indra/newview/llviewermenu.cpp | |
| parent | 26a0c18e95d8d542016d89cc78b948438bc335cb (diff) | |
| parent | b414b5067e3e47da7d9baf490d94534b4c65a8eb (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index b25d622d17..9404d7ce6b 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -445,8 +445,7 @@ void init_menus() gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", upload_cost); gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", upload_cost); gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", upload_cost); - gMenuHolder->childSetLabelArg("Upload Model", "[COST]", upload_cost); - + gAFKMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Away", TRUE); gBusyMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Busy", TRUE); gAttachSubMenu = gMenuBarView->findChildMenuByName("Attach Object", TRUE); |