diff options
author | Josh Bell <josh@lindenlab.com> | 2008-03-14 19:27:38 +0000 |
---|---|---|
committer | Josh Bell <josh@lindenlab.com> | 2008-03-14 19:27:38 +0000 |
commit | 133a7b5fe2bcaaec8389b209cb5bd774ebc2ab63 (patch) | |
tree | d7a8f7846af7dc948d9e11c5a75dd830fb12465c /indra/llui | |
parent | a1cde743e755d826c86aeb006d2027ad2e5c8ce3 (diff) |
svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 --> release
QAR-364 - merge of maint-ui-9
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/llfloater.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 32ee0227d0..6597ef46da 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -185,6 +185,8 @@ public: // Defaults to destroy(). virtual void onClose(bool app_quitting) { destroy(); } + // This cannot be "const" until all derived floater canClose() + // methods are const as well. JC virtual BOOL canClose() { return TRUE; } virtual void setVisible(BOOL visible); |