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/llpanelgroupgeneral.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/llpanelgroupgeneral.cpp')
| -rw-r--r-- | linden/indra/newview/llpanelgroupgeneral.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp index bb2c096..166cc04 100644 --- a/linden/indra/newview/llpanelgroupgeneral.cpp +++ b/linden/indra/newview/llpanelgroupgeneral.cpp | |||
| @@ -396,7 +396,7 @@ void LLPanelGroupGeneral::openProfile(void* data) | |||
| 396 | 396 | ||
| 397 | bool LLPanelGroupGeneral::needsApply(std::string& mesg) | 397 | bool LLPanelGroupGeneral::needsApply(std::string& mesg) |
| 398 | { | 398 | { |
| 399 | mesg = getUIString("group_info_unchanged"); | 399 | mesg = getString("group_info_unchanged"); |
| 400 | return mChanged || mGroupID.isNull(); | 400 | return mChanged || mGroupID.isNull(); |
| 401 | } | 401 | } |
| 402 | 402 | ||