diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-15 18:21:08 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-15 18:21:08 +0000 |
| commit | 7286516e9193e7549c9d8ecde65df85402443fab (patch) | |
| tree | 236b1c50e3f5ed5bfa85abb7d1d54cbc1a384d7b /indra/llui/lldockablefloater.cpp | |
| parent | 1bb68d936de2657c3bce3bbe64947f043b5f7333 (diff) | |
| parent | 398af7dd40a060cf9ad8d799df03d448c2f53a96 (diff) | |
viewer2 merge
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
| -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 |