diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-01-22 13:28:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-22 13:28:19 +0200 |
| commit | 5533f58d41443971d667de52c1e73bf24e429247 (patch) | |
| tree | b5f823454cf491c4a83ecc8cf987cf465854ca30 /indra/llui/llfloater.cpp | |
| parent | d0db6a49eb7c7dddcde2a340c8ad6c1f1af6e2cf (diff) | |
| parent | 8896239134a40f41d845c78551d24e005d691d7c (diff) | |
Merge develop into develop-linux
Merge pull request #5316 from RyeMutt/rye/devlinuxupdate
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index f609fe8105..da913ee9d6 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -239,7 +239,7 @@ void LLFloater::initClass() } // defaults for floater param block pulled from widgets/floater.xml -static LLWidgetNameRegistry::StaticRegistrar sRegisterFloaterParams(&typeid(LLFloater::Params), "floater"); +static LLWidgetNameRegistry::StaticRegistrar sRegisterFloaterParams(typeid(LLFloater::Params), "floater"); LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p) : LLPanel(), // intentionally do not pass params here, see initFromParams |