MAINT-8731 Click action to disable clicking objects, per-object in a linkset

6 files changed, 28 insertions, 4 deletions

diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h
index fda84aa5a8..a00a82aff0 100644
--- a/indra/llcommon/indra_constants.h
+++ b/indra/llcommon/indra_constants.h
@@ -323,6 +323,7 @@ const U8 CLICK_ACTION_OPEN = 4;
 const U8 CLICK_ACTION_PLAY = 5;
 const U8 CLICK_ACTION_OPEN_MEDIA = 6;
 const U8 CLICK_ACTION_ZOOM = 7;
+const U8 CLICK_ACTION_DISABLED = 8;
 // DO NOT CHANGE THE SEQUENCE OF THIS LIST!!
 
 
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index a7c53a7050..fc44ce340c 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -100,6 +100,10 @@ U8 string_value_to_click_action(std::string p_value)
 	{
 		return CLICK_ACTION_ZOOM;
 	}
+	if (p_value == "None")
+	{
+		return CLICK_ACTION_DISABLED;
+	}
 	return CLICK_ACTION_TOUCH;
 }
 
@@ -126,6 +130,9 @@ std::string click_action_to_string_value( U8 action)
 		case CLICK_ACTION_ZOOM:
 			return "Zoom";
 			break;
+		case CLICK_ACTION_DISABLED:
+			return "None";
+			break;
 	}
 }
 
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index f73722521a..f03c7abc4d 100644
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -1130,6 +1130,8 @@ static U8 string_value_to_click_action(std::string p_value)
 		return CLICK_ACTION_OPEN;
 	if (p_value == "Zoom")
 		return CLICK_ACTION_ZOOM;
+	if (p_value == "None")
+		return CLICK_ACTION_DISABLED;
 	return CLICK_ACTION_TOUCH;
 }
 
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index f473000657..6a8843cb44 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -300,6 +300,8 @@ BOOL LLToolPie::handleLeftClickPick()
 				}
 			}
 			return TRUE;			
+		case CLICK_ACTION_DISABLED:
+			return TRUE;
 		default:
 			// nothing
 			break;
@@ -463,6 +465,8 @@ ECursorType LLToolPie::cursorFromObject(LLViewerObject* object)
 	case CLICK_ACTION_OPEN_MEDIA: 
 		cursor = cursor_from_parcel_media(click_action);
 		break;
+	case CLICK_ACTION_DISABLED: 
+		break;
 	default:
 		break;
 	}
@@ -528,6 +532,8 @@ void LLToolPie::selectionPropertiesReceived()
 			case CLICK_ACTION_OPEN:
 				LLFloaterReg::showInstance("openobject");
 				break;
+			case CLICK_ACTION_DISABLED:
+				break;
 			default:
 				break;
 			}
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index ed3cc26851..bdcf3648fa 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1115,6 +1115,10 @@
                  label="Zoom"
                  name="Zoom"
                  value="Zoom" />
+                <combo_box.item
+                 label="None"
+                 name="None"
+                 value="None" />
             </combo_box>
             <check_box
              height="23"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index b84dce222f..9f12e50fd1 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -292,10 +292,14 @@
                  label="Open"
                  name="Open"
                  value="Open" />
-       <combo_box.item
-          label="Zoom"
-          name="Zoom"
-          value="Zoom" />
+                <combo_box.item
+                 label="Zoom"
+                 name="Zoom"
+                 value="Zoom" />
+                <combo_box.item
+                 label="None"
+                 name="None"
+                 value="Zoom" />
             </combo_box>
 	 <panel
          border="false"