diff options
| -rw-r--r--[-rwxr-xr-x] | indra/cmake/CMakeLists.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/cmake/Copy3rdPartyLibs.cmake | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/cmake/FMOD.cmake | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/cmake/FindFMOD.cmake | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/CMakeLists.txt | 0 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/viewer_manifest.py | 0 |
7 files changed, 2 insertions, 1 deletions
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 6470836286..6470836286 100755..100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index e852cf463c..e852cf463c 100755..100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake index 96434e38fa..96434e38fa 100755..100644 --- a/indra/cmake/FMOD.cmake +++ b/indra/cmake/FMOD.cmake diff --git a/indra/cmake/FindFMOD.cmake b/indra/cmake/FindFMOD.cmake index e60b386027..e60b386027 100755..100644 --- a/indra/cmake/FindFMOD.cmake +++ b/indra/cmake/FindFMOD.cmake diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index bf885e5934..bf885e5934 100755..100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 5dd03783ad..c865dcf9a3 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -526,7 +526,8 @@ bool LLIMModel::LLIMSession::isOtherParticipantAvaline() void LLIMModel::LLIMSession::onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name) { - mHistoryFileName = av_name.mUsername; + // if username is empty, display names isn't enabled, use the display name + mHistoryFileName = av_name.mUsername.empty() ? av_name.mDisplayName : av_name.mUsername; } void LLIMModel::LLIMSession::buildHistoryFileName() diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 6861f02bfb..6861f02bfb 100755..100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py |