livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

meow-7.2.2
andreykproductengine 2018-06-13 20:28:26 +03:00
parent 83dcf6b10d
commit 5f890af707
6 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llcommon/indra_constants.h
View File

@ -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!!

7
indra/newview/llpanelpermissions.cpp
View File

@ -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;
}
}

2
indra/newview/llsidepaneltaskinfo.cpp
View File

@ -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;
}

6
indra/newview/lltoolpie.cpp
View File

@ -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;
}

4
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -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"

12
indra/newview/skins/default/xui/en/sidepanel_task_info.xml
View File

@ -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"