diff options
author | prep <prep@lindenlab.com> | 2012-11-28 16:36:34 -0500 |
---|---|---|
committer | prep <prep@lindenlab.com> | 2012-11-28 16:36:34 -0500 |
commit | e0432f98ee515f9777604aa784d28b63d2abfe40 (patch) | |
tree | 398fcae43d9904bde2112a7085c7ef7c1a926100 /indra/newview/llviewermessage.cpp | |
parent | bf87920fc91e2ca2b8d9f6f2656ad632c3005164 (diff) | |
parent | f5a47417fde70f78b99744386c6da0bcf78e60d5 (diff) |
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-x | indra/newview/llviewermessage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 2a904d393a..a3291b3463 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3332,9 +3332,9 @@ public : { } - static boost::intrusive_ptr<ChatTranslationReceiver> build(const std::string &from_lang, const std::string &to_lang, const std::string &mesg, const LLChat &chat, const LLSD &toast_args) + static ChatTranslationReceiver* build(const std::string &from_lang, const std::string &to_lang, const std::string &mesg, const LLChat &chat, const LLSD &toast_args) { - return boost::intrusive_ptr<ChatTranslationReceiver>(new ChatTranslationReceiver(from_lang, to_lang, mesg, chat, toast_args)); + return new ChatTranslationReceiver(from_lang, to_lang, mesg, chat, toast_args); } protected: |