diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 15:27:39 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 15:27:39 -0700 |
| commit | c320b4878ae9cd166594285a88437f0d5c333353 (patch) | |
| tree | d4b8f11a01bfbeb30cd8e8de96e8c12a1364ff47 /indra/newview/llviewermessage.cpp | |
| parent | 3ee73ee98d31e572e284371074b7cd4744005a29 (diff) | |
| parent | 33bd704c58fa707d0a4cc89216538c9d64d6e109 (diff) | |
merging in latest code
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 81cbc3b6c3..775280ca34 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3394,9 +3394,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: |