diff options
Diffstat (limited to 'linden/indra/newview/llfloaterregioninfo.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterregioninfo.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp index 85fbfe1..70e975e 100644 --- a/linden/indra/newview/llfloaterregioninfo.cpp +++ b/linden/indra/newview/llfloaterregioninfo.cpp | |||
@@ -50,6 +50,7 @@ | |||
50 | #include "llcombobox.h" | 50 | #include "llcombobox.h" |
51 | #include "llfilepicker.h" | 51 | #include "llfilepicker.h" |
52 | #include "llfloatergodtools.h" // for send_sim_wide_deletes() | 52 | #include "llfloatergodtools.h" // for send_sim_wide_deletes() |
53 | #include "llfloatertopobjects.h" // added to fix SL-32336 | ||
53 | #include "llfloatergroups.h" | 54 | #include "llfloatergroups.h" |
54 | #include "llfloatertelehub.h" | 55 | #include "llfloatertelehub.h" |
55 | #include "lllineeditor.h" | 56 | #include "lllineeditor.h" |
@@ -885,6 +886,8 @@ void LLPanelRegionDebugInfo::onClickTopColliders(void* data) | |||
885 | strings_t strings; | 886 | strings_t strings; |
886 | strings.push_back("1"); // one physics step | 887 | strings.push_back("1"); // one physics step |
887 | LLUUID invoice(LLFloaterRegionInfo::getLastInvoice()); | 888 | LLUUID invoice(LLFloaterRegionInfo::getLastInvoice()); |
889 | LLFloaterTopObjects::show(); | ||
890 | LLFloaterTopObjects::clearList(); | ||
888 | self->sendEstateOwnerMessage(gMessageSystem, "colliders", invoice, strings); | 891 | self->sendEstateOwnerMessage(gMessageSystem, "colliders", invoice, strings); |
889 | } | 892 | } |
890 | 893 | ||
@@ -895,6 +898,8 @@ void LLPanelRegionDebugInfo::onClickTopScripts(void* data) | |||
895 | strings_t strings; | 898 | strings_t strings; |
896 | strings.push_back("6"); // top 5 scripts | 899 | strings.push_back("6"); // top 5 scripts |
897 | LLUUID invoice(LLFloaterRegionInfo::getLastInvoice()); | 900 | LLUUID invoice(LLFloaterRegionInfo::getLastInvoice()); |
901 | LLFloaterTopObjects::show(); | ||
902 | LLFloaterTopObjects::clearList(); | ||
898 | self->sendEstateOwnerMessage(gMessageSystem, "scripts", invoice, strings); | 903 | self->sendEstateOwnerMessage(gMessageSystem, "scripts", invoice, strings); |
899 | } | 904 | } |
900 | 905 | ||