summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerdisplayname.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llviewerdisplayname.cpp b/indra/newview/llviewerdisplayname.cpp
index a6ac2587db..4122a112e5 100644
--- a/indra/newview/llviewerdisplayname.cpp
+++ b/indra/newview/llviewerdisplayname.cpp
@@ -148,6 +148,8 @@ public:
}
};
+#include "llsdserialize.h"
+
class LLDisplayNameUpdate : public LLHTTPNode
{
/*virtual*/ void post(
@@ -164,6 +166,15 @@ class LLDisplayNameUpdate : public LLHTTPNode
// Inject the new name data into cache
LLAvatarName av_name;
av_name.fromLLSD( name_data );
+
+ // Name expiration time may be provided in headers, or we may use a
+ // default value
+ // JAMESDEBUG TODO: get actual headers out of ResponsePtr
+ //LLSD headers = response->mHeaders;
+ LLSD headers;
+ av_name.mExpires =
+ LLAvatarNameCache::nameExpirationFromHeaders(headers);
+
LLAvatarNameCache::insert(agent_id, av_name);
// force name tag to update