diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/newview/lltoolbar.cpp | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to 'linden/indra/newview/lltoolbar.cpp')
| -rw-r--r-- | linden/indra/newview/lltoolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/lltoolbar.cpp b/linden/indra/newview/lltoolbar.cpp index fb23567..98ad5ff 100644 --- a/linden/indra/newview/lltoolbar.cpp +++ b/linden/indra/newview/lltoolbar.cpp | |||
| @@ -340,7 +340,7 @@ void LLToolBar::updateCommunicateList() | |||
| 340 | } | 340 | } |
| 341 | } | 341 | } |
| 342 | communicate_button->addSeparator(ADD_TOP); | 342 | communicate_button->addSeparator(ADD_TOP); |
| 343 | communicate_button->add(getUIString("Redock Windows"), LLSD("redock"), ADD_TOP); | 343 | communicate_button->add(getString("Redock Windows"), LLSD("redock"), ADD_TOP); |
| 344 | communicate_button->addSeparator(ADD_TOP); | 344 | communicate_button->addSeparator(ADD_TOP); |
| 345 | communicate_button->add(LLFloaterMute::getInstance()->getShortTitle(), LLSD("mute list"), ADD_TOP); | 345 | communicate_button->add(LLFloaterMute::getInstance()->getShortTitle(), LLSD("mute list"), ADD_TOP); |
| 346 | 346 | ||