diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-16 13:20:05 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-16 13:20:05 +0200 |
| commit | 07a5274e8cb051b74d955690799c2e5ae90e5ff5 (patch) | |
| tree | f5bef8e3f88a5186bd90db897110e51794c5a086 /indra/llui | |
| parent | f808bafa663b5b855cbb26af552bbca1caa4c026 (diff) | |
| parent | e3367fad368660bf40db29a82237475a9f2dfdbd (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index a94f0206a6..0492ab0f25 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -95,7 +95,7 @@ void LLDockableFloater::toggleInstance(const LLSD& sdname) LLDockableFloater* instance = dynamic_cast<LLDockableFloater*> (LLFloaterReg::findInstance(name)); // if floater closed or docked - if (instance == NULL || instance != NULL && instance->isDocked()) + if (instance == NULL || (instance && instance->isDocked())) { LLFloaterReg::toggleInstance(name, key); // restore button toggle state |