diff options
| -rw-r--r-- | BuildParams | 20 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/llimview.h | 2 | ||||
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 1 |
6 files changed, 36 insertions, 2 deletions
diff --git a/BuildParams b/BuildParams index 6b7d15f6cc..2e1b701493 100644 --- a/BuildParams +++ b/BuildParams @@ -104,6 +104,26 @@ gooey.viewer_grid = agni gooey.build_viewer_update_version_manager = false # ======================================== +# Display Names project +# ======================================== + +#viewer-identity-evolution.email = leyla@lindenlab.com +viewer-identity.build_Debug = false +viewer-identity.build_RelWithDebInfo = false +viewer-identity.build_viewer = true +viewer-identity.build_server = false +viewer-identity.build_server_tests = false +viewer-identity.build_Linux = true +viewer-identity.build_hg_bundle = true +viewer-identity.bulld_docs = true +viewer-identity.viewer_channel = "Second Life Project Viewer" +viewer-identity.login_channel = "Second Life Project Viewer" +viewer-identity.viewer_grid = aditi +viewer-identity.build_viewer_update_version_manager = false + + + +# ======================================== # palange # ======================================== diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 80f610bb2f..4c4e77a0bf 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7941,7 +7941,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>RenderInitError</key> <map> diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 070e384fa4..7109f9e21e 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -518,6 +518,11 @@ bool LLIMModel::LLIMSession::isOtherParticipantAvaline() return !mOtherParticipantIsAvatar; } +void LLIMModel::LLIMSession::onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name) +{ + mHistoryFileName = av_name.mUsername; +} + void LLIMModel::LLIMSession::buildHistoryFileName() { mHistoryFileName = mName; @@ -536,6 +541,12 @@ void LLIMModel::LLIMSession::buildHistoryFileName() //in case of incoming ad-hoc sessions mHistoryFileName = mName + " " + LLLogChat::timestamp(true) + " " + mSessionID.asString().substr(0, 4); } + + // look up username to use as the log name + if (isP2P()) + { + LLAvatarNameCache::get(mOtherParticipantID, boost::bind(&LLIMModel::LLIMSession::onAvatarNameCache, this, _1, _2)); + } } //static diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index c95f98f552..d566a4d03f 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -97,6 +97,8 @@ public: /** ad-hoc sessions involve sophisticated chat history file naming schemes */ void buildHistoryFileName(); + void onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name); + //*TODO make private static std::string generateHash(const std::set<LLUUID>& sorted_uuids); diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 6c45b7cc60..f8bf647670 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -878,7 +878,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l if (LLAvatarNameCache::useDisplayNames() && LLAvatarNameCache::get(hover_object->getID(), &av_name)) { - final_name = av_name.mDisplayName + " (" + av_name.mUsername + ")"; + final_name = av_name.getCompleteName(); } else { diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index df71f3f6fb..281f367345 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3214,6 +3214,7 @@ Change your display name? name="Cancel" text="Cancel"/> </form> + <unique/> </notification> <notification |