diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-11 18:43:03 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-11 18:43:03 +0200 |
| commit | d79617dd2753ee11f74a6969bac3cce4cf4831f3 (patch) | |
| tree | ceb52c4da6cb24a4e19b5069d89098ebfd06d555 /indra/llui/llfloaterreg.cpp | |
| parent | 2265efdaf3462be1c60696f064ff8a5e75342112 (diff) | |
| parent | ef2decdbe9fd2add86f1117f423b680a3b79f927 (diff) | |
Merge branch 'SL-14862' into DRTVWR-527-maint
# Conflicts:
# indra/newview/llviewerstats.cpp
Diffstat (limited to 'indra/llui/llfloaterreg.cpp')
| -rw-r--r-- | indra/llui/llfloaterreg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 85e07fc6a6..7c0933f554 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -32,6 +32,7 @@ #include "llfloater.h" #include "llmultifloater.h" #include "llfloaterreglistener.h" +#include "lluiusage.h" //******************************************************* @@ -472,7 +473,6 @@ void LLFloaterReg::toggleInstanceOrBringToFront(const LLSD& sdname, const LLSD& std::string name = sdname.asString(); LLFloater* instance = getInstance(name, key); - if (!instance) { LL_DEBUGS() << "Unable to get instance of floater '" << name << "'" << LL_ENDL; |