Skip to content

Fix map search bug causing duplicate requests properly #4040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2025
Merged

Fix map search bug causing duplicate requests properly #4040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions indra/newview/llfloaterworldmap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,12 @@ bool LLFloaterWorldMap::postBuild()
F32 slider_zoom = mMapView->getZoom();
mZoomSlider->setValue(slider_zoom);

mTrackCtrlsPanel = getChild<LLPanel>("layout_panel_4");
mSearchButton = getChild<LLButton>("DoSearch");

getChild<LLPanel>("expand_btn_panel")->setMouseDownCallback(boost::bind(&LLFloaterWorldMap::onExpandCollapseBtn, this));

setDefaultBtn(NULL);
mTrackCtrlsPanel->setDefaultBtn(nullptr);

onChangeMaturity();

Expand Down Expand Up @@ -728,7 +731,7 @@ void LLFloaterWorldMap::trackAvatar( const LLUUID& avatar_id, const std::string&
{
LLTracker::stopTracking(false);
}
setDefaultBtn("Teleport");
mTrackCtrlsPanel->setDefaultBtn(mTeleportButton);
}

void LLFloaterWorldMap::trackLandmark( const LLUUID& landmark_item_id )
Expand Down Expand Up @@ -773,7 +776,7 @@ void LLFloaterWorldMap::trackLandmark( const LLUUID& landmark_item_id )
{
LLTracker::stopTracking(false);
}
setDefaultBtn("Teleport");
mTrackCtrlsPanel->setDefaultBtn(mTeleportButton);
}


Expand All @@ -782,15 +785,15 @@ void LLFloaterWorldMap::trackEvent(const LLItemInfo &event_info)
mShowParcelInfo = false;
mTrackedStatus = LLTracker::TRACKING_LOCATION;
LLTracker::trackLocation(event_info.getGlobalPosition(), event_info.getName(), event_info.getToolTip(), LLTracker::LOCATION_EVENT);
setDefaultBtn("Teleport");
mTrackCtrlsPanel->setDefaultBtn(mTeleportButton);
}

void LLFloaterWorldMap::trackGenericItem(const LLItemInfo &item)
{
mShowParcelInfo = false;
mTrackedStatus = LLTracker::TRACKING_LOCATION;
LLTracker::trackLocation(item.getGlobalPosition(), item.getName(), item.getToolTip(), LLTracker::LOCATION_ITEM);
setDefaultBtn("Teleport");
mTrackCtrlsPanel->setDefaultBtn(mTeleportButton);
}

void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
Expand All @@ -804,7 +807,7 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
S32 world_x = S32(pos_global.mdV[0] / 256);
S32 world_y = S32(pos_global.mdV[1] / 256);
LLWorldMapMessage::getInstance()->sendMapBlockRequest(world_x, world_y, world_x, world_y, true);
setDefaultBtn("");
mTrackCtrlsPanel->setDefaultBtn(nullptr);

// clicked on a non-region - turn off coord display
enableTeleportCoordsDisplay( false );
Expand All @@ -818,7 +821,7 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
LLTracker::stopTracking(false);
LLWorldMap::getInstance()->setTracking(pos_global);
LLWorldMap::getInstance()->setTrackingInvalid();
setDefaultBtn("");
mTrackCtrlsPanel->setDefaultBtn(nullptr);

// clicked on a down region - turn off coord display
enableTeleportCoordsDisplay( false );
Expand Down Expand Up @@ -849,7 +852,7 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
// we have a valid region - turn on coord display
enableTeleportCoordsDisplay( true );

setDefaultBtn("Teleport");
mTrackCtrlsPanel->setDefaultBtn(mTeleportButton);
}

// enable/disable teleport destination coordinates
Expand Down Expand Up @@ -964,7 +967,7 @@ void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S3
local_pos.mV[VZ] = (F32)z_coord;
LLVector3d global_pos = sim_info->getGlobalPos(local_pos);
trackLocation(global_pos);
setDefaultBtn("Teleport");
mTrackCtrlsPanel->setDefaultBtn(mTeleportButton);
}
else
{
Expand Down Expand Up @@ -1375,11 +1378,11 @@ void LLFloaterWorldMap::updateSearchEnabled()
if (childHasKeyboardFocus("location") &&
mLocationEditor->getValue().asString().length() > 0)
{
setDefaultBtn("DoSearch");
mTrackCtrlsPanel->setDefaultBtn(mSearchButton);
}
else
{
setDefaultBtn(NULL);
mTrackCtrlsPanel->setDefaultBtn(nullptr);
}
}

Expand Down Expand Up @@ -1800,7 +1803,7 @@ void LLFloaterWorldMap::onCommitSearchResult()

mLocationEditor->setValue(sim_name);
trackLocation(pos_global);
setDefaultBtn("Teleport");
mTrackCtrlsPanel->setDefaultBtn(mTeleportButton);
break;
}
}
Expand Down
3 changes: 3 additions & 0 deletions indra/newview/llfloaterworldmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ class LLFloaterWorldMap : public LLFloater
LLButton* mShowDestinationButton = nullptr;
LLButton* mCopySlurlButton = nullptr;
LLButton* mGoHomeButton = nullptr;
LLButton* mSearchButton = nullptr;

LLCheckBoxCtrl* mPeopleCheck = nullptr;
LLCheckBoxCtrl* mInfohubCheck = nullptr;
Expand All @@ -245,6 +246,8 @@ class LLFloaterWorldMap : public LLFloater

LLSliderCtrl* mZoomSlider = nullptr;

LLPanel* mTrackCtrlsPanel = nullptr;

boost::signals2::connection mTeleportFinishConnection;
};

Expand Down
11 changes: 4 additions & 7 deletions indra/newview/skins/default/xui/en/floater_world_map.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,20 +532,17 @@
width="16" />
<search_editor
follows="top|right"
search_button_visible="false"
search_button_visible="false"
height="22"
text_readonly_color="DkGray"
text_readonly_color="DkGray"
label="Regions by Name"
layout="topleft"
top_delta="-2"
left_pad="7"
name="location"
select_on_focus="true"
tool_tip="Type the name of a region"
width="152">
<search_editor.commit_callback
function="WMap.Location" />
</search_editor>
width="152"/>
<button
follows="top|right"
height="23"
Expand All @@ -556,7 +553,7 @@
name="DoSearch"
tool_tip="Search for region"
width="62">
<button.mouse_down_callback
<button.commit_callback
function="WMap.Location" />
</button>
<button
Expand Down
Loading