diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:02:26 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:02:26 +0200 |
| commit | 7f315b1552dd01e0ee2ff58e84f1fc87fa675cdf (patch) | |
| tree | b48d3f2d1e5b27ad6edd3263411f364e6ceb2428 /indra/llui/llui.cpp | |
| parent | 31a074c3c41cd96f9656ec7510c6eff7ebec440e (diff) | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 6f16745bd3..3f3ec7ee8b 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -173,6 +173,7 @@ mHelpImpl(NULL) reg.add("Floater.Toggle", boost::bind(&LLFloaterReg::toggleInstance, _2, LLSD())); reg.add("Floater.ToggleOrBringToFront", boost::bind(&LLFloaterReg::toggleInstanceOrBringToFront, _2, LLSD())); reg.add("Floater.Show", boost::bind(&LLFloaterReg::showInstance, _2, LLSD(), FALSE)); + reg.add("Floater.ShowOrBringToFront", boost::bind(&LLFloaterReg::showInstanceOrBringToFront, _2, LLSD())); reg.add("Floater.Hide", boost::bind(&LLFloaterReg::hideInstance, _2, LLSD())); // Button initialization callback for toggle buttons |