diff options
| author | Callum Linden <callum@lindenlab.com> | 2023-01-20 16:23:41 -0800 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2023-01-20 16:23:41 -0800 |
| commit | cbb7480ca76cbe11c40f05a269583201dd044796 (patch) | |
| tree | 8ce39d5a975d66a5c6a38e47460c2330f15a087e /indra/newview/llviewermenu.cpp | |
| parent | 80bc32c3efe77b49adcd4cc00320ce5523f90fb9 (diff) | |
| parent | 12204b210e5279b0bfba5601d34195739cab6ab8 (diff) | |
Fix merge conflicts after auto merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index c796ed30f7..6a0cf00a07 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -9568,6 +9568,10 @@ void initialize_menus() //Develop (clear cache immediately) commit.add("Develop.ClearCache", boost::bind(&handle_cache_clear_immediately) ); + // Develop (Fonts debugging) + commit.add("Develop.Fonts.Dump", boost::bind(&LLFontGL::dumpFonts)); + commit.add("Develop.Fonts.DumpTextures", boost::bind(&LLFontGL::dumpFontTextures)); + // Admin >Object view_listener_t::addMenu(new LLAdminForceTakeCopy(), "Admin.ForceTakeCopy"); view_listener_t::addMenu(new LLAdminHandleObjectOwnerSelf(), "Admin.HandleObjectOwnerSelf"); |