diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-07-20 20:18:12 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-07-20 20:18:12 -0700 |
| commit | 95da8c81f3d5afd8d888589398028883e6647333 (patch) | |
| tree | c05f27cff294a5ad1a508cc2c8716bc696c8f9ce /indra/llui/llfloater.h | |
| parent | 4dc0850da7469906e5ad052da71830b05005295b (diff) | |
| parent | fecf706f1be58f76df81f8bc1a4a5f3307cee6ff (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 5b7b020881..9aae1afc62 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -253,7 +253,7 @@ public: LLHandle<LLFloater> getHandle() const { return mHandle; } const LLSD& getKey() { return mKey; } - BOOL matchesKey(const LLSD& key) { return mSingleInstance || KeyCompare::equate(key, mKey); } + virtual bool matchesKey(const LLSD& key) { return mSingleInstance || KeyCompare::equate(key, mKey); } const std::string& getInstanceName() { return mInstanceName; } |