aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:37 -0500
committerJacek Antonelli2008-08-15 23:45:37 -0500
commit31ba05810c641f14e8ab5da8ad2aaf527779f6c1 (patch)
treec4b8d635dfb657fa4cfee7c285f8cadbf24afa90 /linden/indra/llcharacter
parentSecond Life viewer sources 1.19.1.1 (diff)
downloadmeta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.zip
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.gz
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.bz2
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.xz
Second Life viewer sources 1.19.1.2
Diffstat (limited to 'linden/indra/llcharacter')
-rw-r--r--linden/indra/llcharacter/llgesture.cpp2
-rw-r--r--linden/indra/llcharacter/llgesture.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llcharacter/llgesture.cpp b/linden/indra/llcharacter/llgesture.cpp
index c124ad0..60f0624 100644
--- a/linden/indra/llcharacter/llgesture.cpp
+++ b/linden/indra/llcharacter/llgesture.cpp
@@ -103,7 +103,7 @@ BOOL LLGesture::trigger(KEY key, MASK mask)
103} 103}
104 104
105 105
106BOOL LLGesture::trigger(const LLString &trigger_string) 106BOOL LLGesture::trigger(const std::string& trigger_string)
107{ 107{
108 llwarns << "Parent class trigger called: you probably didn't mean this." << llendl; 108 llwarns << "Parent class trigger called: you probably didn't mean this." << llendl;
109 return FALSE; 109 return FALSE;
diff --git a/linden/indra/llcharacter/llgesture.h b/linden/indra/llcharacter/llgesture.h
index 0e4b781..003d236 100644
--- a/linden/indra/llcharacter/llgesture.h
+++ b/linden/indra/llcharacter/llgesture.h
@@ -64,7 +64,7 @@ public:
64 virtual BOOL trigger(KEY key, MASK mask); 64 virtual BOOL trigger(KEY key, MASK mask);
65 65
66 // Triggers if case-insensitive substring matches (assumes string is lowercase) 66 // Triggers if case-insensitive substring matches (assumes string is lowercase)
67 virtual BOOL trigger(const LLString &string); 67 virtual BOOL trigger(const std::string &string);
68 68
69 // non-endian-neutral serialization 69 // non-endian-neutral serialization
70 U8 *serialize(U8 *buffer) const; 70 U8 *serialize(U8 *buffer) const;