diff options
author | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-10-04 20:47:54 +0100 |
---|---|---|
committer | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-10-04 20:47:54 +0100 |
commit | 0c1d6d7d9e89a6d3169621157bcba335ead477a9 (patch) | |
tree | c5523eeb99bcd8ee77cf28a1d6f5e5cef8b52f2c /indra/newview/llconversationmodel.h | |
parent | 02097397e06a6cf45c639823c7f633dffe3684e8 (diff) | |
parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) |
Merge v3.6.7 in
Diffstat (limited to 'indra/newview/llconversationmodel.h')
-rw-r--r--[-rwxr-xr-x] | indra/newview/llconversationmodel.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h index 8766585049..d8cdcdfc97 100755..100644 --- a/indra/newview/llconversationmodel.h +++ b/indra/newview/llconversationmodel.h @@ -252,11 +252,10 @@ public: const std::string& getName() const { return mEmpty; } const std::string& getFilterText() { return mEmpty; } void setModified(EFilterModified behavior = FILTER_RESTART) { } - - void setFilterCount(S32 count) { } - S32 getFilterCount() const { return 0; } - void decrementFilterCount() { } - + + void resetTime(S32 timeout) { } + bool isTimedOut() { return false; } + bool isDefault() const { return true; } bool isNotDefault() const { return false; } void markDefault() { } |