diff options
author | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
---|---|---|
committer | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
commit | 0cdff2817bdc342e0ac8b3c8711e3f7a72f1f617 (patch) | |
tree | 0fbaca9292450f05588336eb6639b12d182156e1 /indra/newview/llviewermessage.cpp | |
parent | 03fa24f8aecc071bac920a400c122cbce0b029b4 (diff) | |
parent | 1743e6a81330824021667000f8acdd6cf64dbf1b (diff) |
Merge
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 903f4437a7..b048332e59 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3340,9 +3340,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: |