diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-07-28 09:48:18 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-07-28 09:48:18 -0400 |
| commit | f37d109e251a273a1b620c416cef3991981e6184 (patch) | |
| tree | 66403f3d3585d214137666e0cf5eeb656ee84df2 /indra/llui/llfloater.cpp | |
| parent | fd7bfb03c946b0190bf0965e19b1b679eac3c383 (diff) | |
| parent | 27cbfef0269146eb296bbd2b810a6d331e5cb7d2 (diff) | |
Automated merge with ssh://hg.lindenlab.com/nat/viewer-maint-1175
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 f20cc2452f..8ca1e685a9 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -232,7 +232,7 @@ void LLFloater::initClass() } // defaults for floater param block pulled from widgets/floater.xml -static LLWidgetNameRegistry::StaticRegistrar sRegisterFloaterParams(typeid(LLFloater::Params).name(), "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 |