diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-06-11 10:07:05 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-06-11 10:07:05 -0400 |
commit | de037486613d9560f3a9835621ef35e6fcc77378 (patch) | |
tree | a5ada9ac285f3d84f99e91f2e41a4c062691145e /indra/newview/llnetmap.cpp | |
parent | f8b1823c8a2ae2ec139d5a4f5dd1f50f9f0f6ad0 (diff) | |
parent | 3d1aac4f5c369e9d402c41f1c790d9015f7c7773 (diff) |
Merge branch 'release/luau-scripting' into lua-login
Diffstat (limited to 'indra/newview/llnetmap.cpp')
-rw-r--r-- | indra/newview/llnetmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index d8ac641e56..d85426b41a 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -128,7 +128,7 @@ LLNetMap::~LLNetMap() BOOL LLNetMap::postBuild() { - LLUICtrl::CommitCallbackRegistry::ScopedRegistrar commitRegistrar; + LLUICtrl::ScopedRegistrarHelper commitRegistrar; LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enableRegistrar; enableRegistrar.add("Minimap.Zoom.Check", boost::bind(&LLNetMap::isZoomChecked, this, _2)); |