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

MAINT-1654 FIXED object context menu redraws and repositions some time after being opened.

meow-7.2.2
andreykproductengine 2014-12-31 14:06:05 +02:00
parent 6dc7f0ad82
commit 8bd2873879
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewermenu.cpp
View File

@ -3418,6 +3418,11 @@ bool enable_object_select_in_pathfinding_linksets()
return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLSelectMgr::getInstance()->selectGetEditableLinksets();
}
bool visible_object_select_in_pathfinding_linksets()
{
return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion();
}
bool enable_object_select_in_pathfinding_characters()
{
return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLSelectMgr::getInstance()->selectGetViewableCharacters();
@ -11073,6 +11078,7 @@ void initialize_menus()
enable.add("VisibleBuild", boost::bind(&enable_object_build));
commit.add("Pathfinding.Linksets.Select", boost::bind(&LLFloaterPathfindingLinksets::openLinksetsWithSelectedObjects));
enable.add("EnableSelectInPathfindingLinksets", boost::bind(&enable_object_select_in_pathfinding_linksets));
enable.add("VisibleSelectInPathfindingLinksets", boost::bind(&visible_object_select_in_pathfinding_linksets));
commit.add("Pathfinding.Characters.Select", boost::bind(&LLFloaterPathfindingCharacters::openCharactersWithSelectedObjects));
enable.add("EnableSelectInPathfindingCharacters", boost::bind(&enable_object_select_in_pathfinding_characters));
enable.add("EnableBridgeFunction", boost::bind(&enable_bridge_function)); // <FS:CR>

2
indra/newview/skins/default/xui/en/menu_object.xml
View File

@ -182,7 +182,7 @@
<menu_item_call.on_enable
function="EnableSelectInPathfindingLinksets"/>
<menu_item_call.on_visible
function="EnableSelectInPathfindingLinksets"/>
function="VisibleSelectInPathfindingLinksets"/>
</menu_item_call>
<menu_item_call
label="Show in characters"