From b5936a4b1d8780b5b8cd425998eacd2c64ffa693 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 3 Apr 2008 19:21:14 +0000 Subject: 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release) --- indra/llcharacter/llgesture.cpp | 2 +- indra/llcharacter/llgesture.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llcharacter') diff --git a/indra/llcharacter/llgesture.cpp b/indra/llcharacter/llgesture.cpp index ee2396321d..283a06e37f 100644 --- a/indra/llcharacter/llgesture.cpp +++ b/indra/llcharacter/llgesture.cpp @@ -103,7 +103,7 @@ BOOL LLGesture::trigger(KEY key, MASK mask) } -BOOL LLGesture::trigger(const LLString &trigger_string) +BOOL LLGesture::trigger(const std::string& trigger_string) { llwarns << "Parent class trigger called: you probably didn't mean this." << llendl; return FALSE; diff --git a/indra/llcharacter/llgesture.h b/indra/llcharacter/llgesture.h index 34fdcd01c4..bab7fd0cc0 100644 --- a/indra/llcharacter/llgesture.h +++ b/indra/llcharacter/llgesture.h @@ -64,7 +64,7 @@ public: virtual BOOL trigger(KEY key, MASK mask); // Triggers if case-insensitive substring matches (assumes string is lowercase) - virtual BOOL trigger(const LLString &string); + virtual BOOL trigger(const std::string &string); // non-endian-neutral serialization U8 *serialize(U8 *buffer) const; -- cgit v1.3