diff options
| author | Armin Weatherwax | 2011-01-25 23:17:51 +0100 |
|---|---|---|
| committer | Armin Weatherwax | 2011-01-25 23:17:51 +0100 |
| commit | 424cf142a4512de878cae37021b08132d12ae489 (patch) | |
| tree | ba47d01c484d9eaaa62d6c38695930ba07c95fcb /linden/indra/newview/llnetmap.cpp | |
| parent | Henri Beauchamp: Display Names support v4 (diff) | |
| download | meta-impy-424cf142a4512de878cae37021b08132d12ae489.zip meta-impy-424cf142a4512de878cae37021b08132d12ae489.tar.gz meta-impy-424cf142a4512de878cae37021b08132d12ae489.tar.bz2 meta-impy-424cf142a4512de878cae37021b08132d12ae489.tar.xz | |
Add an UI for Display name settings to prefs general, make the setting more intuitive
instead: of 0 legacy only , 1 both and 2 display names only we use
now: 0 legacy, 1 display names only and 2 both
Diffstat (limited to 'linden/indra/newview/llnetmap.cpp')
| -rw-r--r-- | linden/indra/newview/llnetmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp index 438478f..06257f0 100644 --- a/linden/indra/newview/llnetmap.cpp +++ b/linden/indra/newview/llnetmap.cpp | |||
| @@ -652,7 +652,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec | |||
| 652 | if (LLAvatarNameCache::get(mClosestAgentToCursor, &avatar_name)) | 652 | if (LLAvatarNameCache::get(mClosestAgentToCursor, &avatar_name)) |
| 653 | { | 653 | { |
| 654 | result = TRUE; | 654 | result = TRUE; |
| 655 | if (LLAvatarNameCache::useDisplayNames() == 2) | 655 | if (LLAvatarNameCache::useDisplayNames() == 1) |
| 656 | { | 656 | { |
| 657 | fullname = avatar_name.mDisplayName; | 657 | fullname = avatar_name.mDisplayName; |
| 658 | } | 658 | } |