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

More simplifications

meow-7.2.2
Ansariel 2022-11-01 16:21:27 +01:00
parent c047a29b1e
commit 492a208b75
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llpanelprofile.cpp
View File

@ -2245,8 +2245,7 @@ void LLPanelProfileSecondLife::onSaveDescriptionChanges()
// floater is dead, so panels are dead as well
return;
}
LLPanel *panel = floater_profile->findChild<LLPanel>(PANEL_PROFILE_VIEW, TRUE);
auto *panel_profile = dynamic_cast<LLPanelProfile*>(panel);
LLPanelProfile* panel_profile = floater_profile->findChild<LLPanelProfile>(PANEL_PROFILE_VIEW, TRUE);
if (!panel_profile)
{
LL_WARNS() << PANEL_PROFILE_VIEW << " not found" << LL_ENDL;
@ -2262,7 +2261,7 @@ void LLPanelProfileSecondLife::onSaveDescriptionChanges()
LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesUpdate(&avatar_data);
}
}
}
}
#endif
// </FS:Beq>
@ -2482,7 +2481,7 @@ void LLPanelProfileSecondLife::onCommitProfileImage(const LLUUID& id)
else
{
// <FS:Beq> Make OpenSim profiles work again
#ifdef OPENSIM
#ifdef OPENSIM
if(LLGridManager::getInstance()->isInOpenSim())
{
mImageId = id;
@ -2572,6 +2571,7 @@ void LLPanelProfileWeb::apply(LLAvatarData* data)
}
#endif
// </FS:Beq>
void LLPanelProfileWeb::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name)
{
mAvatarNameCacheConnection.disconnect();
@ -2869,7 +2869,7 @@ void LLPanelProfileFirstLife::onCommitPhoto(const LLUUID& id)
else
{
// <FS:Beq> Make OpenSim profiles work again
#ifdef OPENSIM
#ifdef OPENSIM
if(LLGridManager::getInstance()->isInOpenSim())
{
mImageId = id;
@ -2925,8 +2925,7 @@ void LLPanelProfileFirstLife::onSaveDescriptionChanges()
// floater is dead, so panels are dead as well
return;
}
LLPanel *panel = floater_profile->findChild<LLPanel>(PANEL_PROFILE_VIEW, TRUE);
auto *panel_profile = dynamic_cast<LLPanelProfile*>(panel);
LLPanelProfile* panel_profile = floater_profile->findChild<LLPanelProfile>(PANEL_PROFILE_VIEW, TRUE);
if (!panel_profile)
{
LL_WARNS() << PANEL_PROFILE_VIEW << " not found" << LL_ENDL;
@ -2941,7 +2940,7 @@ void LLPanelProfileFirstLife::onSaveDescriptionChanges()
LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesUpdate(&avatar_data);
}
}
}
}
#endif
// </FS:Beq>
@ -3015,7 +3014,7 @@ void LLPanelProfileFirstLife::resetData()
auto show_image_buttons = getSelfProfile();
#ifdef OPENSIM
std::string cap_url = gAgent.getRegionCapability(PROFILE_IMAGE_UPLOAD_CAP);
if( cap_url.empty() && LLGridManager::instance().isInOpenSim() )
if (cap_url.empty() && LLGridManager::instance().isInOpenSim())
{
show_image_buttons = false;
}
@ -3069,10 +3068,10 @@ void LLPanelProfileNotes::updateData()
boost::bind(request_avatar_properties_coro, cap_url, avatar_id));
}
// <FS:Beq> Restore UDO profiles
#ifdef OPENSIM
#ifdef OPENSIM
else
{
LLAvatarPropertiesProcessor::getInstance()->sendAvatarNotesRequest(avatar_id);
LLAvatarPropertiesProcessor::getInstance()->sendAvatarNotesRequest(avatar_id);
}
#endif
// </FS:Beq>
@ -3273,7 +3272,7 @@ void LLPanelProfile::updateData()
// <FS:Beq> Restore UDP profiles
else
{
LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(avatar_id);
LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(avatar_id);
}
// </FS:Beq>
}