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/llfloaterabout.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 '')
| -rw-r--r-- | linden/indra/newview/llfloaterabout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp index 0486f57..4704c5b 100644 --- a/linden/indra/newview/llfloaterabout.cpp +++ b/linden/indra/newview/llfloaterabout.cpp | |||
| @@ -134,7 +134,7 @@ LLFloaterAbout::LLFloaterAbout() | |||
| 134 | server_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor")); | 134 | server_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor")); |
| 135 | 135 | ||
| 136 | const LLVector3d &pos = gAgent.getPositionGlobal(); | 136 | const LLVector3d &pos = gAgent.getPositionGlobal(); |
| 137 | LLUIString pos_text = getUIString("you_are_at"); | 137 | LLUIString pos_text = getString("you_are_at"); |
| 138 | pos_text.setArg("[POSITION]", | 138 | pos_text.setArg("[POSITION]", |
| 139 | llformat("%.1f, %.1f, %.1f ", pos.mdV[VX], pos.mdV[VY], pos.mdV[VZ])); | 139 | llformat("%.1f, %.1f, %.1f ", pos.mdV[VX], pos.mdV[VY], pos.mdV[VZ])); |
| 140 | support.append(pos_text); | 140 | support.append(pos_text); |