diff options
| author | McCabe Maxsted | 2009-11-18 23:03:38 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-11-18 23:03:38 -0700 |
| commit | 1fde9651c1266edcfd9513bfd758986ebca0f6b2 (patch) | |
| tree | 55454b21ae759bc9d8fbe7cb2d802cffa48fadff /linden/indra/newview/llviewermenu.cpp | |
| parent | Removed old unused reference to gProductName in windows updater (diff) | |
| parent | Merge remote branch 'mccabe/next' into next (diff) | |
| download | meta-impy-1fde9651c1266edcfd9513bfd758986ebca0f6b2.zip meta-impy-1fde9651c1266edcfd9513bfd758986ebca0f6b2.tar.gz meta-impy-1fde9651c1266edcfd9513bfd758986ebca0f6b2.tar.bz2 meta-impy-1fde9651c1266edcfd9513bfd758986ebca0f6b2.tar.xz | |
Merge commit 'jacek/next' into next
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
| -rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index ecf6fcb..895f488 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
| @@ -676,6 +676,7 @@ void init_menus() | |||
| 676 | gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", upload_cost); | 676 | gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", upload_cost); |
| 677 | gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", upload_cost); | 677 | gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", upload_cost); |
| 678 | gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", upload_cost); | 678 | gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", upload_cost); |
| 679 | gMenuHolder->childSetLabelArg("ImportUpload", "[COST]", upload_cost); | ||
| 679 | 680 | ||
| 680 | gAFKMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Away", TRUE); | 681 | gAFKMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Away", TRUE); |
| 681 | gBusyMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Busy", TRUE); | 682 | gBusyMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Busy", TRUE); |