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

Renaming the XUI files for the pathfinding console to setup.

meow-7.2.2
Todd Stinson 2012-02-01 18:14:04 -08:00
parent 1156cfc490
commit beadc65fe4
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/app_settings/commands.xml
View File

@ -155,15 +155,15 @@
is_running_function="Floater.IsOpen"
is_running_parameters="people"
/>
<command name="pathfinding_console"
<command name="pathfinding_setup"
available_in_toybox="false"
icon="Command_Pathfinding_Icon"
label_ref="Command_Pathfinding_Label"
tooltip_ref="Command_Pathfinding_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
execute_parameters="pathfinding_console"
execute_parameters="pathfinding_setup"
is_running_function="Floater.IsOpen"
is_running_parameters="pathfinding_console"
is_running_parameters="pathfinding_setup"
/>
<command name="pathfinding_linksets"
available_in_toybox="false"

2
indra/newview/llviewerfloaterreg.cpp
View File

@ -245,8 +245,8 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("outgoing_call", "floater_outgoing_call.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLOutgoingCallDialog>);
LLFloaterPayUtil::registerFloater();
LLFloaterReg::add("pathfinding_console", "floater_pathfinding_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingSetup>);
LLFloaterReg::add("pathfinding_linksets", "floater_pathfinding_linksets.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingLinksets>);
LLFloaterReg::add("pathfinding_setup", "floater_pathfinding_setup.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingSetup>);
LLFloaterReg::add("people", "floater_people.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
LLFloaterReg::add("places", "floater_places.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);

2
indra/newview/llviewerwindow.cpp
View File

@ -964,7 +964,7 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK
MASK currentKeyMask = gKeyboard->currentMask(TRUE);
if ( !(currentKeyMask & MASK_ALT) )
{
LLFloaterPathfindingSetup* pFloater = LLFloaterReg::getTypedInstance<LLFloaterPathfindingSetup>("pathfinding_console");
LLFloaterPathfindingSetup* pFloater = LLFloaterReg::getTypedInstance<LLFloaterPathfindingSetup>("pathfinding_setup");
if ( pFloater )
{
//The floater takes care of determining what stage - essentially where the data goes into the pathing packet(start or end)

0
indra/newview/skins/default/xui/en/floater_pathfinding_console.xml → indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
View File

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

@ -943,7 +943,7 @@
name="pathfinding_menu_item">
<menu_item_call.on_click
function="Floater.ToggleOrBringToFront"
parameter="pathfinding_console" />
parameter="pathfinding_setup" />
</menu_item_call>
<menu_item_separator/>