Add Touch to object ui menus

indra/newview/llviewermenu.cpp

@@ -1792,12 +1792,12 @@ class LLObjectTouch : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		handle_object_touch(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject(), LLToolPie::getInstance()->getPick());
+		handle_object_touch(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject(), &LLToolPie::getInstance()->getPick());
 		return true;
 	}
 };
 
-void handle_object_touch(LLViewerObject* object, const LLPick const* pick);
+void handle_object_touch(LLViewerObject* object, const LLPickInfo* const pick)
 {
 	if (!object) return;
 
@@ -1817,7 +1817,7 @@ void handle_object_touch(LLViewerObject* object, const LLPick const* pick);
 	send_ObjectGrab_message(object, false, pick);
 }
 
-bool enable_object_touch(LLViewerObject* obj, const LLVector3& offset)
+bool enable_object_touch(LLViewerObject* obj, const LLVector3& offset = LLVector3::zero)
 {
 	bool new_value = obj && obj->flagHandleTouch();
 // [RLVa:KB] - Checked: 2010-11-12 (RLVa-1.2.1g) | Added: RLVa-1.2.1g
@@ -1832,12 +1832,11 @@ bool enable_object_touch(LLViewerObject* obj, const LLVector3& offset)
 
 bool enable_object_touch(const LLSD& userdata)
 {
-	LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
-
 	std::string touch_text;
 
 	// Update label based on the node touch name if available.
-	LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
+	auto selection = LLSelectMgr::getInstance()->getSelection();
+	LLSelectNode* node = selection->getFirstRootNode();
 	if (node && node->mValid && !node->mTouchName.empty())
 	{
 		touch_text = node->mTouchName;
@@ -1850,7 +1849,7 @@ bool enable_object_touch(const LLSD& userdata)
 	gMenuHolder->childSetText("Object Touch", touch_text);
 	gMenuHolder->childSetText("Attachment Object Touch", touch_text);
 
-	return enable_object_touch(obj, LLToolPie::getInstance()->getPick().mObjectOffset);
+	return enable_object_touch(selection->getPrimaryObject(), LLToolPie::getInstance()->getPick().mObjectOffset);
 };
 
 // One object must have touch sensor
@@ -9699,6 +9698,26 @@ class ListObjectEnablePay : public view_listener_t
 	}
 };
 
+class ListObjectTouch : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		handle_object_touch(gObjectList.findObject(LFIDBearer::getActiveSelectedID()));
+		return true;
+	}
+};
+
+// One object must have touch sensor
+class ListObjectEnableTouch : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		const auto& ids = LFIDBearer::getActiveSelectedIDs();
+		gMenuHolder->findControl(userdata["control"].asString())->setValue(ids.size() == 1 && enable_object_touch(gObjectList.findObject(ids[0])));
+		return true;
+	}
+};
+
 class MediaCtrlCopyURL : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -10097,6 +10116,8 @@ void initialize_menus()
 	addMenu(new ListObjectSit, "List.Object.Sit");
 	addMenu(new ListObjectPay, "List.Object.Pay");
 	addMenu(new ListObjectEnablePay, "List.Object.EnablePay");
+	addMenu(new ListObjectTouch, "List.Object.Touch");
+	addMenu(new ListObjectEnableTouch, "List.Object.EnableTouch");
 
 	add_radar_listeners();
 

indra/newview/llviewermenu.h

@@ -38,8 +38,10 @@
 class LLUICtrl;
 class LLView;
 class LLParcelSelection;
+class LLPickInfo;
 class LLObjectSelection;
 class LLSelectNode;
+class LLViewerObject;
 
 void pre_init_menus();
 void init_menus();
@@ -95,7 +97,7 @@ void exchange_callingcard(const LLUUID& dest_id);
 void handle_gestures(void*);
 void handle_sit_down(void*);
 void handle_object_build(void*);
-void handle_object_touch();
+void handle_object_touch(LLViewerObject*, const LLPickInfo* const = nullptr);
 bool enable_object_open();
 void handle_object_open();
 
@@ -133,7 +135,7 @@ void handle_toggle_flycam();
 void handle_fake_away_status(void*);
 
 void handle_object_sit_or_stand();
-void handle_give_money_dialog(class LLViewerObject*);
+void handle_give_money_dialog(LLViewerObject*);
 bool enable_pay_object(LLViewerObject*);
 bool enable_buy_object();
 void handle_go_to(const LLVector3d& pos);

indra/newview/skins/default/xui/en-us/menu_objects_list.xml

@@ -24,6 +24,10 @@
     <on_click function="List.Object.Pay"/>
     <on_visible function="List.Object.EnablePay"/>
   </menu_item_call>
+  <menu_item_call label="Touch" name="Touch">
+    <on_click function="List.Object.Touch"/>
+    <on_visible function="List.Object.EnableTouch"/>
+  </menu_item_call>
   <menu_item_separator/>
   <menu_item_call label="Copy Key" name="Copy Key">
     <on_click function="List.CopyUUIDs"/>

indra/newview/skins/default/xui/en-us/menu_url_objectim.xml

@@ -64,6 +64,10 @@
       <on_click function="List.Object.Pay"/>
       <on_visible function="List.Object.EnablePay"/>
     </menu_item_call>
+    <menu_item_call label="Touch" name="Touch">
+      <on_click function="List.Object.Touch"/>
+      <on_visible function="List.Object.EnableTouch"/>
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call