SL-18837: Merge branch 'main' into actions

1 files changed, 4 insertions, 0 deletions

diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h
index 3138249c7a..b73401e50d 100644
--- a/indra/newview/llfloatertopobjects.h
+++ b/indra/newview/llfloatertopobjects.h
@@ -30,6 +30,7 @@
 #include "llfloater.h"
 
 class LLUICtrl;
+class LLScrollListCtrl;
 
 // Bits for simulator performance query flags
 enum LAND_STAT_FLAGS
@@ -75,6 +76,7 @@ private:
 	void initColumns(LLCtrlListInterface *list);
 
 	void onCommitObjectsList();
+    void onSelectionChanged();
 	static void onDoubleClickObjectsList(void* data);
 	void onClickShowBeacon();
 
@@ -90,6 +92,7 @@ private:
 	void onGetByParcelName();
 
 	void showBeacon();
+    void teleportToSelectedObject();
 
 private:
 	std::string mMethod;
@@ -106,6 +109,7 @@ private:
 	F32 mtotalScore;
 
 	static LLFloaterTopObjects* sInstance;
+    LLScrollListCtrl* mObjectsScrollList;
 };
 
 #endif