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

Some clean-up after checking the differences between the pathfinding branch and viewer-release.

master
Todd Stinson 2012-06-26 12:27:08 -07:00
parent b3ccf0f2ad
commit 3f17205889
9 changed files with 1 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/CMakeLists.txt
View File

@ -1781,7 +1781,6 @@ endif (WINDOWS)
# To work around this, higher level modules should be listed before the modules
# that they depend upon. -brad
target_link_libraries(${VIEWER_BINARY_NAME}
${LLPATHING_LIBRARIES}
${UPDATER_LIBRARIES}
${GOOGLE_PERFTOOLS_LIBRARIES}
${LLAUDIO_LIBRARIES}

22
indra/newview/app_settings/cmd_line.xml
View File

@ -164,28 +164,6 @@
<string>UserLoginInfo</string>
</map>
<key>loginpage</key>
<map>
<key>desc</key>
<string>Login authentication page to use.</string>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>LoginPage</string>
</map>
<key>loginuri</key>
<map>
<key>desc</key>
<string>login server and CGI script to use</string>
<key>count</key>
<integer>1</integer>
<key>compose</key>
<boolean>true</boolean>
<key>map-to</key>
<string>CmdLineLoginURI</string>
</map>
<key>logmetrics</key>
<map>
<key>desc</key>

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

@ -157,36 +157,6 @@
is_running_function="Floater.IsOpen"
is_running_parameters="people"
/>
<command name="pathfinding_console"
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"
is_running_function="Floater.IsOpen"
is_running_parameters="pathfinding_console"
/>
<command name="pathfinding_characters"
available_in_toybox="false"
icon="Command_PF_Characters_Icon"
label_ref="Command_PF_Characters_Label"
tooltip_ref="Command_PF_Characters_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
execute_parameters="pathfinding_characters"
is_running_function="Floater.IsOpen"
is_running_parameters="pathfinding_characters"
/>
<command name="pathfinding_linksets"
available_in_toybox="false"
icon="Command_PF_Linksets_Icon"
label_ref="Command_PF_Linksets_Label"
tooltip_ref="Command_PF_Linksets_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
execute_parameters="pathfinding_linksets"
is_running_function="Floater.IsOpen"
is_running_parameters="pathfinding_linksets"
/>
<command name="picks"
available_in_toybox="true"
icon="Command_Picks_Icon"

1
indra/newview/lltoolbrush.cpp
View File

@ -52,7 +52,6 @@
#include "llworld.h"
#include "llappviewer.h"
#include "llparcel.h"
#include "llpathfindingmanager.h"
#include "llglheaders.h"

1
indra/newview/llviewerdisplay.cpp
View File

@ -77,7 +77,6 @@
#include "llwlparammanager.h"
#include "llwaterparammanager.h"
#include "llpostprocess.h"
#include "llpathfindingmanager.h"
extern LLPointer<LLViewerTexture> gStartTexture;

1
indra/newview/llviewerobject.cpp
View File

@ -100,7 +100,6 @@
#include "lltrans.h"
#include "llsdutil.h"
#include "llmediaentry.h"
#include "llpathfindingmanager.h"
//#define DEBUG_UPDATE_TYPE

3
indra/newview/skins/default/textures/textures.xml
View File

@ -140,10 +140,7 @@ with the same filename but different name
<texture name="Command_MiniMap_Icon" file_name="toolbar_icons/mini_map.png" preload="true" />
<texture name="Command_Move_Icon" file_name="toolbar_icons/move.png" preload="true" />
<texture name="Command_Outbox_Icon" file_name="toolbar_icons/outbox.png" preload="true" />
<texture name="Command_Pathfinding_Icon" file_name="toolbar_icons/land.png" preload="true" />
<texture name="Command_People_Icon" file_name="toolbar_icons/people.png" preload="true" />
<texture name="Command_PF_Characters_Icon" file_name="toolbar_icons/land.png" preload="true" />
<texture name="Command_PF_Linksets_Icon" file_name="toolbar_icons/land.png" preload="true" />
<texture name="Command_Picks_Icon" file_name="toolbar_icons/picks.png" preload="true" />
<texture name="Command_Places_Icon" file_name="toolbar_icons/places.png" preload="true" />
<texture name="Command_Preferences_Icon" file_name="toolbar_icons/preferences.png" preload="true" />

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

@ -1402,7 +1402,7 @@ even though the user gets a free copy.
height="10"
layout="topleft"
name="label position"
top_pad="5"
top_pad="10"
width="121">
Position (meters)
</text>

6
indra/newview/skins/default/xui/en/strings.xml
View File

@ -3832,10 +3832,7 @@ Try enclosing path to the editor with double quotes.
<string name="Command_MiniMap_Label">Mini-map</string>
<string name="Command_Move_Label">Walk / run / fly</string>
<string name="Command_Outbox_Label">Merchant outbox</string>
<string name="Command_Pathfinding_Label">Pathfinding</string>
<string name="Command_People_Label">People</string>
<string name="Command_PF_Characters_Label">Pathfinding Characters</string>
<string name="Command_PF_Linksets_Label">Pathfinding Linksets</string>
<string name="Command_Picks_Label">Picks</string>
<string name="Command_Places_Label">Places</string>
<string name="Command_Preferences_Label">Preferences</string>
@ -3861,10 +3858,7 @@ Try enclosing path to the editor with double quotes.
<string name="Command_MiniMap_Tooltip">Show nearby people</string>
<string name="Command_Move_Tooltip">Moving your avatar</string>
<string name="Command_Outbox_Tooltip">Transfer items to your marketplace for sale</string>
<string name="Command_Pathfinding_Tooltip">Information about pathfinding</string>
<string name="Command_People_Tooltip">Friends, groups, and nearby people</string>
<string name="Command_PF_Characters_Tooltip">Manipulation of pathfinding characters</string>
<string name="Command_PF_Linksets_Tooltip">Manipulation of pathfinding linksets</string>
<string name="Command_Picks_Tooltip">Places to show as favorites in your profile</string>
<string name="Command_Places_Tooltip">Places you've saved</string>
<string name="Command_Preferences_Tooltip">Preferences</string>