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

Merge branch 'release/maint-yz' of https://github.com/secondlife/viewer 

# Conflicts:
#	indra/llcommon/llsys.cpp
master
Ansariel 2024-04-10 10:06:16 +02:00
parent 2474e3ba1d 5118ba7adf
commit 1a8ad79713
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llsys.cpp
View File

@ -928,7 +928,7 @@ void LLMemoryInfo::stream(std::ostream& s) const
// Now stream stats
for (const auto& [key, value] : inMap(mStatsMap))
{
s << pfx << std::setw(narrow(key_width+1)) << (key + ':') << ' ';
s << pfx << std::setw(narrow<size_t>(key_width+1)) << (key + ':') << ' ';
if (value.isInteger())
s << std::setw(12) << value.asInteger();
else if (value.isReal())

13
indra/newview/llpanelprofilepicks.cpp
View File

@ -270,8 +270,6 @@ void LLPanelProfilePicks::onClickNewBtn()
select_tab(true).
label(pick_panel->getPickName()));
updateButtons();
pick_panel->addLocationChangedCallbacks();
}
void LLPanelProfilePicks::onClickDelete()
@ -841,10 +839,6 @@ void LLPanelProfilePick::onClickSave()
{
mParcelCallbackConnection.disconnect();
}
if (mLocationChanged)
{
onClickSetLocation();
}
sendUpdate();
mLocationChanged = false;
@ -892,13 +886,6 @@ void LLPanelProfilePick::processParcelInfo(const LLParcelData& parcel_data)
}
}
void LLPanelProfilePick::addLocationChangedCallbacks()
{
mRegionCallbackConnection = gAgent.addRegionChangedCallback([this]() { onClickSetLocation(); });
mParcelCallbackConnection = gAgent.addParcelChangedCallback([this]() { onClickSetLocation(); });
}
void LLPanelProfilePick::sendUpdate()
{
LLPickData pick_data;

2
indra/newview/llpanelprofilepicks.h
View File

@ -147,8 +147,6 @@ public:
void setParcelID(const LLUUID& parcel_id) override { mParcelId = parcel_id; }
void setErrorStatus(S32 status, const std::string& reason) override {};
void addLocationChangedCallbacks();
protected:
/**