summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/CMakeLists.txt1
-rw-r--r--indra/newview/app_settings/cmd_line.xml22
-rw-r--r--indra/newview/app_settings/commands.xml30
-rw-r--r--indra/newview/app_settings/settings.xml44
-rw-r--r--indra/newview/llfloaterpathfindingconsole.cpp6
-rw-r--r--indra/newview/llfloaterpathfindingobjects.cpp23
-rw-r--r--indra/newview/llpathfindingnavmeshzone.cpp2
-rw-r--r--indra/newview/lltoolbrush.cpp1
-rw-r--r--indra/newview/llviewerdisplay.cpp1
-rw-r--r--indra/newview/llviewerobject.cpp1
-rw-r--r--indra/newview/skins/default/textures/textures.xml3
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml2
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml6
13 files changed, 42 insertions, 100 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index ac0b0c0351..a78c9931e5 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -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}
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index 2853c7383d..711191128b 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -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>
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index cb6bdc627f..73df064ab2 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -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"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f144e9f007..0f3ae89fa8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13595,10 +13595,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>RetrieveNeighboringRegion</key>
+ <key>PathfindingRetrieveNeighboringRegion</key>
<map>
<key>Comment</key>
- <string>Download a neighboring region when visualize a navmesh (default val 99 is for the current region).</string>
+ <string>Download a neighboring region when visualizing a pathfinding navmesh (default val 99 means do not download neighbors).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -13609,7 +13609,7 @@
<key>PathfindingNavMeshClear</key>
<map>
<key>Comment</key>
- <string>Background color</string>
+ <string>Background color when displaying pathfinding navmesh.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13625,7 +13625,7 @@
<key>PathfindingWalkable</key>
<map>
<key>Comment</key>
- <string>Walkable color</string>
+ <string>Color of walkable objects when displaying pathfinding navmesh object types.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13641,7 +13641,7 @@
<key>PathfindingObstacle</key>
<map>
<key>Comment</key>
- <string>Obstacle color</string>
+ <string>Color of static obstacle objects when displaying pathfinding navmesh object types.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13657,7 +13657,7 @@
<key>PathfindingMaterial</key>
<map>
<key>Comment</key>
- <string>Material volume color</string>
+ <string>Color of material volumes when displaying pathfinding navmesh object types.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13673,7 +13673,7 @@
<key>PathfindingExclusion</key>
<map>
<key>Comment</key>
- <string>Exclusion volume color</string>
+ <string>Color of exclusion volumes when displaying pathfinding navmesh object types.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13689,7 +13689,7 @@
<key>PathfindingConnectedEdge</key>
<map>
<key>Comment</key>
- <string>Connected edge color</string>
+ <string>Color of a connected (crossable) edge when displaying pathfinding navmesh.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13705,7 +13705,7 @@
<key>PathfindingBoundaryEdge</key>
<map>
<key>Comment</key>
- <string>Boundary edge color</string>
+ <string>Color of a boundary (non-crossable) edge when displaying pathfinding navmesh.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13721,7 +13721,7 @@
<key>PathfindingHeatColorBase</key>
<map>
<key>Comment</key>
- <string>Least walkable heat map color</string>
+ <string>Color of the least walkable value when displaying the pathfinding navmesh as a heatmap.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13737,7 +13737,7 @@
<key>PathfindingHeatColorMax</key>
<map>
<key>Comment</key>
- <string>Most walkable heat map color</string>
+ <string>Color of the most walkable value when displaying the pathfinding navmesh as a heatmap.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13753,7 +13753,7 @@
<key>PathfindingFaceColor</key>
<map>
<key>Comment</key>
- <string>Nav mesh color?</string>
+ <string>Color of the faces when displaying the default view of the pathfinding navmesh.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13766,10 +13766,10 @@
<real>1.0</real>
</array>
</map>
- <key>PathfindingStarValidColor</key>
+ <key>PathfindingTestPathValidEndColor</key>
<map>
<key>Comment</key>
- <string>yay!</string>
+ <string>Color of the pathfinding test-pathing tool end-point when the path is valid.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13782,10 +13782,10 @@
<real>1.0</real>
</array>
</map>
- <key>PathfindingStarInvalidColor</key>
+ <key>PathfindingTestPathInvalidEndColor</key>
<map>
<key>Comment</key>
- <string>yay!</string>
+ <string>Color of the pathfinding test-pathing tool end-point when the path is invalid.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13801,7 +13801,7 @@
<key>PathfindingTestPathColor</key>
<map>
<key>Comment</key>
- <string>yay!</string>
+ <string>Color of the pathfinding test-path when the path is valid.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13817,7 +13817,7 @@
<key>PathfindingAmbiance</key>
<map>
<key>Comment</key>
- <string>Ambiance of lit pathfinding displays.</string>
+ <string>Ambiance of lit pathfinding navmesh displays.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13829,7 +13829,7 @@
<key>PathfindingXRayTint</key>
<map>
<key>Comment</key>
- <string>Amount to darken/lighten x-ray lines in pathfinding display</string>
+ <string>Amount to darken/lighten x-ray lines in pathfinding display.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13853,7 +13853,7 @@
<key>PathfindingXRayWireframe</key>
<map>
<key>Comment</key>
- <string>Render pathfinding xray as a wireframe.</string>
+ <string>Render pathfinding navmesh xray as a wireframe.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13865,7 +13865,7 @@
<key>PathfindingLineWidth</key>
<map>
<key>Comment</key>
- <string>Width of volume outlines in pathfinding display.</string>
+ <string>Width of volume outlines in pathfinding navmesh display.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -13922,7 +13922,7 @@
<key>PathfindingWaterColor</key>
<map>
<key>Comment</key>
- <string>yay!</string>
+ <string>Color of water plane when displaying pathfinding navmesh.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 2cf7f3aeb1..c2d19bfb9a 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -70,7 +70,7 @@
#define SET_SHAPE_RENDER_FLAG(_flag,_type) _flag |= (1U << _type)
-#define CONTROL_NAME_RETRIEVE_NEIGHBOR "RetrieveNeighboringRegion"
+#define CONTROL_NAME_RETRIEVE_NEIGHBOR "PathfindingRetrieveNeighboringRegion"
#define CONTROL_NAME_WALKABLE_OBJECTS "PathfindingWalkable"
#define CONTROL_NAME_STATIC_OBSTACLE_OBJECTS "PathfindingObstacle"
#define CONTROL_NAME_MATERIAL_VOLUMES "PathfindingMaterial"
@@ -80,8 +80,8 @@
#define CONTROL_NAME_HEATMAP_MIN "PathfindingHeatColorBase"
#define CONTROL_NAME_HEATMAP_MAX "PathfindingHeatColorMax"
#define CONTROL_NAME_NAVMESH_FACE "PathfindingFaceColor"
-#define CONTROL_NAME_TEST_PATH_VALID_END "PathfindingStarValidColor"
-#define CONTROL_NAME_TEST_PATH_INVALID_END "PathfindingStarInvalidColor"
+#define CONTROL_NAME_TEST_PATH_VALID_END "PathfindingTestPathValidEndColor"
+#define CONTROL_NAME_TEST_PATH_INVALID_END "PathfindingTestPathInvalidEndColor"
#define CONTROL_NAME_TEST_PATH "PathfindingTestPathColor"
#define CONTROL_NAME_WATER "PathfindingWaterColor"
diff --git a/indra/newview/llfloaterpathfindingobjects.cpp b/indra/newview/llfloaterpathfindingobjects.cpp
index 9bfbc582bd..eb18fa00d5 100644
--- a/indra/newview/llfloaterpathfindingobjects.cpp
+++ b/indra/newview/llfloaterpathfindingobjects.cpp
@@ -57,9 +57,10 @@
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
#include "llviewerregion.h"
-#include "v4color.h"
#include "pipeline.h"
-#include "llfloaterreg.h"
+#include "v3dmath.h"
+#include "v3math.h"
+#include "v4color.h"
#define DEFAULT_BEACON_WIDTH 6
@@ -488,14 +489,20 @@ void LLFloaterPathfindingObjects::teleportToSelectedObject()
std::vector<LLScrollListItem*>::const_reference selectedItemRef = selectedItems.front();
const LLScrollListItem *selectedItem = selectedItemRef;
llassert(mObjectList != NULL);
- const LLPathfindingObjectPtr objectPtr = mObjectList->find(selectedItem->getUUID().asString());
- const LLVector3 &objectLocation = objectPtr->getLocation();
-
- LLViewerRegion* region = gAgent.getRegion();
- if (region != NULL)
+ LLVector3d teleportLocation;
+ LLViewerObject *viewerObject = gObjectList.findObject(selectedItem->getUUID());
+ if (viewerObject == NULL)
+ {
+ // If we cannot find the object in the viewer list, teleport to the last reported position
+ const LLPathfindingObjectPtr objectPtr = mObjectList->find(selectedItem->getUUID().asString());
+ teleportLocation = gAgent.getPosGlobalFromAgent(objectPtr->getLocation());
+ }
+ else
{
- gAgent.teleportRequest(region->getHandle(), objectLocation, true);
+ // If we can find the object in the viewer list, teleport to the known current position
+ teleportLocation = viewerObject->getPositionGlobal();
}
+ gAgent.teleportViaLocationLookAt(teleportLocation);
}
}
diff --git a/indra/newview/llpathfindingnavmeshzone.cpp b/indra/newview/llpathfindingnavmeshzone.cpp
index d8670062e9..ee81762792 100644
--- a/indra/newview/llpathfindingnavmeshzone.cpp
+++ b/indra/newview/llpathfindingnavmeshzone.cpp
@@ -71,7 +71,7 @@ void LLPathfindingNavMeshZone::initialize()
NavMeshLocationPtr centerNavMeshPtr(new NavMeshLocation(CENTER_REGION, boost::bind(&LLPathfindingNavMeshZone::handleNavMeshLocation, this)));
mNavMeshLocationPtrs.push_back(centerNavMeshPtr);
- U32 neighborRegionDir = gSavedSettings.getU32("RetrieveNeighboringRegion");
+ U32 neighborRegionDir = gSavedSettings.getU32("PathfindingRetrieveNeighboringRegion");
if (neighborRegionDir != CENTER_REGION)
{
NavMeshLocationPtr neighborNavMeshPtr(new NavMeshLocation(neighborRegionDir, boost::bind(&LLPathfindingNavMeshZone::handleNavMeshLocation, this)));
diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp
index 4ef2a26535..aba43a9715 100644
--- a/indra/newview/lltoolbrush.cpp
+++ b/indra/newview/lltoolbrush.cpp
@@ -52,7 +52,6 @@
#include "llworld.h"
#include "llappviewer.h"
#include "llparcel.h"
-#include "llpathfindingmanager.h"
#include "llglheaders.h"
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index a3661fd15d..9a45d40b65 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -77,7 +77,6 @@
#include "llwlparammanager.h"
#include "llwaterparammanager.h"
#include "llpostprocess.h"
-#include "llpathfindingmanager.h"
extern LLPointer<LLViewerTexture> gStartTexture;
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 2c4392ad33..8d658adc8f 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -100,7 +100,6 @@
#include "lltrans.h"
#include "llsdutil.h"
#include "llmediaentry.h"
-#include "llpathfindingmanager.h"
//#define DEBUG_UPDATE_TYPE
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index b76f04d17f..66bd519dbc 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -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" />
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index c49ce90e6b..a2fc16ac01 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -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>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1f168b0ccd..142103f03b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 07:26:15 +0000