diff options
author | Nyx Linden <nyx@lindenlab.com> | 2013-04-08 17:03:24 -0400 |
---|---|---|
committer | Nyx Linden <nyx@lindenlab.com> | 2013-04-08 17:03:24 -0400 |
commit | b4c60f430332674e5dbdb672152e62d252e9a6e1 (patch) | |
tree | c9fb6805638fc95ea0ca2c3ef28a41e915ad7f18 /indra/newview/llviewerdisplayname.cpp | |
parent | 3e53ade13e7c9e70ba67a1e845696712081f7651 (diff) | |
parent | beeefb45269f45ea717f58b30a0985951ae23c20 (diff) |
merge. pulled in sunshine-stable.
Diffstat (limited to 'indra/newview/llviewerdisplayname.cpp')
-rw-r--r-- | indra/newview/llviewerdisplayname.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplayname.cpp b/indra/newview/llviewerdisplayname.cpp index 5d94756da3..3f836efdd3 100644 --- a/indra/newview/llviewerdisplayname.cpp +++ b/indra/newview/llviewerdisplayname.cpp @@ -86,7 +86,7 @@ void LLViewerDisplayName::set(const std::string& display_name, const set_name_sl // People API can return localized error messages. Indicate our // language preference via header. LLSD headers; - headers[HTTP_HEADER_ACCEPT_LANGUAGE] = LLUI::getLanguage(); + headers[HTTP_OUT_HEADER_ACCEPT_LANGUAGE] = LLUI::getLanguage(); // People API requires both the old and new value to change a variable. // Our display name will be in cache before the viewer's UI is available |