From e36f38e08853de1586902261e294a640fd2aa9ec Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 1 Nov 2021 06:09:58 -0400
Subject: [PATCH] Speed up profile floater data loading
---
indra/newview/llagentpicksinfo.cpp | 6 ++--
indra/newview/llappearancemgr.cpp | 2 +-
indra/newview/llavatariconctrl.cpp | 4 +--
indra/newview/llavatarpropertiesprocessor.cpp | 22 +++++++-------
indra/newview/llinspectavatar.cpp | 4 +--
indra/newview/llpanelavatar.cpp | 6 ++--
indra/newview/llpanelclassified.cpp | 8 ++---
indra/newview/llpanelpick.cpp | 12 ++++----
indra/newview/llpanelprofile.cpp | 28 ++++++++---------
indra/newview/llpanelprofileclassifieds.cpp | 22 +++++++-------
indra/newview/llpanelprofilepicks.cpp | 30 +++++++++----------
indra/newview/llvoavatar.cpp | 4 +--
12 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/indra/newview/llagentpicksinfo.cpp b/indra/newview/llagentpicksinfo.cpp
index 799060eeab1..d1adc184447 100644
--- a/indra/newview/llagentpicksinfo.cpp
+++ b/indra/newview/llagentpicksinfo.cpp
@@ -38,18 +38,18 @@ class LLAgentPicksInfo::LLAgentPicksObserver : public LLAvatarPropertiesObserver
public:
LLAgentPicksObserver()
{
- LLAvatarPropertiesProcessor::getInstance()->addObserver(gAgent.getID(), this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->addObserver(gAgent.getID(), this);
}
~LLAgentPicksObserver()
{
if (LLAvatarPropertiesProcessor::instanceExists())
- LLAvatarPropertiesProcessor::getInstance()->removeObserver(gAgent.getID(), this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->removeObserver(gAgent.getID(), this);
}
void sendAgentPicksRequest()
{
- LLAvatarPropertiesProcessor::getInstance()->sendAvatarPicksRequest(gAgent.getID());
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendAvatarPicksRequest(gAgent.getID());
}
typedef boost::function<void(LLAvatarPicks*)> server_respond_callback_t;
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index bf07180d762..0a0f76c118b 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -4066,7 +4066,7 @@ void LLAppearanceMgr::serverAppearanceUpdateCoro(LLCoreHttpUtil::HttpCoroutineAd
// through the UDP and be handled in LLVOAvatar::processAvatarAppearance
// this should ensure that we receive a new canonical COF from the sim
// host. Hopefully it will return before the timeout.
- LLAvatarPropertiesProcessor::getInstance()->sendAvatarTexturesRequest(gAgent.getID());
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendAvatarTexturesRequest(gAgent.getID());
bRetry = true;
// Wait for a 1/2 second before trying again. Just to keep from asking too quickly.
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index f07a746c274..46aa6958ff8 100644
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -204,7 +204,7 @@ LLAvatarIconCtrl::~LLAvatarIconCtrl()
{
if (mAvatarId.notNull())
{
- LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarId, this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->removeObserver(mAvatarId, this);
// Name callbacks will be automatically disconnected since LLUICtrl is trackable
}
@@ -220,7 +220,7 @@ void LLAvatarIconCtrl::setValue(const LLSD& value)
if (value.isUUID())
{
LLAvatarPropertiesProcessor* app =
- LLAvatarPropertiesProcessor::getInstance();
+ LLAvatarPropertiesProcessor::getInstanceFast();
if (mAvatarId.notNull())
{
app->removeObserver(mAvatarId, this);
diff --git a/indra/newview/llavatarpropertiesprocessor.cpp b/indra/newview/llavatarpropertiesprocessor.cpp
index c929fe8b887..987b0a7efa4 100644
--- a/indra/newview/llavatarpropertiesprocessor.cpp
+++ b/indra/newview/llavatarpropertiesprocessor.cpp
@@ -296,7 +296,7 @@ void LLAvatarPropertiesProcessor::processAvatarPropertiesReply(LLMessageSystem*
{
msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_CharterMember, avatar_data.caption_text);
}
- LLAvatarPropertiesProcessor* self = getInstance();
+ LLAvatarPropertiesProcessor* self = getInstanceFast();
// Request processed, no longer pending
self->removePendingRequest(avatar_data.avatar_id, APT_PROPERTIES);
self->notifyObservers(avatar_data.avatar_id,&avatar_data,APT_PROPERTIES);
@@ -323,7 +323,7 @@ void LLAvatarPropertiesProcessor::processAvatarInterestsReply(LLMessageSystem* m
msg->getStringFast( _PREHASH_PropertiesData, _PREHASH_SkillsText, interests_data.skills_text );
msg->getStringFast( _PREHASH_PropertiesData, _PREHASH_LanguagesText, interests_data.languages_text );
- LLAvatarPropertiesProcessor* self = getInstance();
+ LLAvatarPropertiesProcessor* self = getInstanceFast();
// Request processed, no longer pending
self->removePendingRequest(interests_data.avatar_id, APT_INTERESTS_INFO);
self->notifyObservers(interests_data.avatar_id, &interests_data, APT_INTERESTS_INFO);
@@ -348,7 +348,7 @@ void LLAvatarPropertiesProcessor::processAvatarClassifiedsReply(LLMessageSystem*
classifieds.classifieds_list.push_back(data);
}
- LLAvatarPropertiesProcessor* self = getInstance();
+ LLAvatarPropertiesProcessor* self = getInstanceFast();
// Request processed, no longer pending
self->removePendingRequest(classifieds.target_id, APT_CLASSIFIEDS);
self->notifyObservers(classifieds.target_id,&classifieds,APT_CLASSIFIEDS);
@@ -376,7 +376,7 @@ void LLAvatarPropertiesProcessor::processClassifiedInfoReply(LLMessageSystem* ms
msg->getU8Fast(_PREHASH_Data, _PREHASH_ClassifiedFlags, c_info.flags);
msg->getS32Fast(_PREHASH_Data, _PREHASH_PriceForListing, c_info.price_for_listing);
- LLAvatarPropertiesProcessor* self = getInstance();
+ LLAvatarPropertiesProcessor* self = getInstanceFast();
// Request processed, no longer pending
self->removePendingRequest(c_info.creator_id, APT_CLASSIFIED_INFO);
self->notifyObservers(c_info.creator_id, &c_info, APT_CLASSIFIED_INFO);
@@ -391,7 +391,7 @@ void LLAvatarPropertiesProcessor::processAvatarNotesReply(LLMessageSystem* msg,
msg->getUUIDFast(_PREHASH_Data, _PREHASH_TargetID, avatar_notes.target_id);
msg->getStringFast(_PREHASH_Data, _PREHASH_Notes, avatar_notes.notes);
- LLAvatarPropertiesProcessor* self = getInstance();
+ LLAvatarPropertiesProcessor* self = getInstanceFast();
// Request processed, no longer pending
self->removePendingRequest(avatar_notes.target_id, APT_NOTES);
self->notifyObservers(avatar_notes.target_id,&avatar_notes,APT_NOTES);
@@ -414,7 +414,7 @@ void LLAvatarPropertiesProcessor::processAvatarPicksReply(LLMessageSystem* msg,
avatar_picks.picks_list.push_back(std::make_pair(pick_id,pick_name));
}
- LLAvatarPropertiesProcessor* self = getInstance();
+ LLAvatarPropertiesProcessor* self = getInstanceFast();
// Request processed, no longer pending
self->removePendingRequest(avatar_picks.target_id, APT_PICKS);
self->notifyObservers(avatar_picks.target_id,&avatar_picks,APT_PICKS);
@@ -445,7 +445,7 @@ void LLAvatarPropertiesProcessor::processPickInfoReply(LLMessageSystem* msg, voi
msg->getS32Fast(_PREHASH_Data, _PREHASH_SortOrder, pick_data.sort_order);
msg->getBOOLFast(_PREHASH_Data, _PREHASH_Enabled, pick_data.enabled);
- LLAvatarPropertiesProcessor* self = getInstance();
+ LLAvatarPropertiesProcessor* self = getInstanceFast();
// don't need to remove pending request as we don't track pick info
self->notifyObservers(pick_data.creator_id, &pick_data, APT_PICK_INFO);
}
@@ -470,7 +470,7 @@ void LLAvatarPropertiesProcessor::processAvatarGroupsReply(LLMessageSystem* msg,
avatar_groups.group_list.push_back(group_data);
}
- LLAvatarPropertiesProcessor* self = getInstance();
+ LLAvatarPropertiesProcessor* self = getInstanceFast();
self->removePendingRequest(avatar_groups.avatar_id, APT_GROUPS);
self->notifyObservers(avatar_groups.avatar_id,&avatar_groups,APT_GROUPS);
}
@@ -546,8 +546,8 @@ void LLAvatarPropertiesProcessor::sendPickDelete( const LLUUID& pick_id )
msg->addUUIDFast(_PREHASH_PickID, pick_id);
gAgent.sendReliableMessage();
- LLAgentPicksInfo::getInstance()->requestNumberOfPicks();
- LLAgentPicksInfo::getInstance()->decrementNumberOfPicks();
+ LLAgentPicksInfo::getInstanceFast()->requestNumberOfPicks();
+ LLAgentPicksInfo::getInstanceFast()->decrementNumberOfPicks();
}
void LLAvatarPropertiesProcessor::sendClassifiedDelete(const LLUUID& classified_id)
@@ -620,7 +620,7 @@ void LLAvatarPropertiesProcessor::sendPickInfoUpdate(const LLPickData* new_pick)
msg->addBOOLFast(_PREHASH_Enabled, new_pick->enabled);
gAgent.sendReliableMessage();
- LLAgentPicksInfo::getInstance()->requestNumberOfPicks();
+ LLAgentPicksInfo::getInstanceFast()->requestNumberOfPicks();
}
void LLAvatarPropertiesProcessor::sendClassifiedInfoUpdate(const LLAvatarClassifiedInfo* c_data)
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index cb19071e82d..c702326dfd8 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -119,7 +119,7 @@ class LLFetchAvatarData : public LLAvatarPropertiesObserver
mInspector(inspector)
{
LLAvatarPropertiesProcessor* processor =
- LLAvatarPropertiesProcessor::getInstance();
+ LLAvatarPropertiesProcessor::getInstanceFast();
// register ourselves as an observer
processor->addObserver(mAvatarID, this);
// send a request (duplicates will be suppressed inside the avatar
@@ -130,7 +130,7 @@ class LLFetchAvatarData : public LLAvatarPropertiesObserver
~LLFetchAvatarData()
{
// remove ourselves as an observer
- LLAvatarPropertiesProcessor::getInstance()->
+ LLAvatarPropertiesProcessor::getInstanceFast()->
removeObserver(mAvatarID, this);
}
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index c4c6255d2e9..1b3994dc7bd 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -81,7 +81,7 @@ LLPanelProfileTab::~LLPanelProfileTab()
{
if(getAvatarId().notNull())
{
- LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->removeObserver(getAvatarId(),this);
}
}
@@ -91,10 +91,10 @@ void LLPanelProfileTab::setAvatarId(const LLUUID& avatar_id)
{
if (getAvatarId().notNull())
{
- LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarId, this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->removeObserver(mAvatarId, this);
}
mAvatarId = avatar_id;
- LLAvatarPropertiesProcessor::getInstance()->addObserver(getAvatarId(), this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->addObserver(getAvatarId(), this);
mSelfProfile = (getAvatarId() == gAgentID);
}
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index 183000ceac2..4e8ed45d5e0 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -156,7 +156,7 @@ void LLPanelClassifiedInfo::onOpen(const LLSD& key)
if(getAvatarId().notNull())
{
- LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(), this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->removeObserver(getAvatarId(), this);
}
setAvatarId(avatar_id);
@@ -173,8 +173,8 @@ void LLPanelClassifiedInfo::onOpen(const LLSD& key)
LL_INFOS() << "Opening classified [" << getClassifiedName() << "] (" << getClassifiedId() << ")" << LL_ENDL;
- LLAvatarPropertiesProcessor::getInstance()->addObserver(getAvatarId(), this);
- LLAvatarPropertiesProcessor::getInstance()->sendClassifiedInfoRequest(getClassifiedId());
+ LLAvatarPropertiesProcessor::getInstanceFast()->addObserver(getAvatarId(), this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendClassifiedInfoRequest(getClassifiedId());
gGenericDispatcher.addHandler("classifiedclickthrough", &sClassifiedClickThrough);
if (gAgent.getRegion())
@@ -256,7 +256,7 @@ void LLPanelClassifiedInfo::processProperties(void* data, EAvatarProcessorType t
setInfoLoaded(true);
- LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(), this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->removeObserver(getAvatarId(), this);
}
}
}
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 40326cfb39b..a813417846e 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -96,11 +96,11 @@ LLPanelPickInfo::LLPanelPickInfo()
LLPanelPickInfo::~LLPanelPickInfo()
{
- LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(), this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->removeObserver(getAvatarId(), this);
if (mParcelId.notNull())
{
- LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelId, this);
+ LLRemoteParcelInfoProcessor::getInstanceFast()->removeObserver(mParcelId, this);
}
}
@@ -114,7 +114,7 @@ void LLPanelPickInfo::onOpen(const LLSD& key)
if(getAvatarId().notNull())
{
- LLAvatarPropertiesProcessor::getInstance()->removeObserver(
+ LLAvatarPropertiesProcessor::getInstanceFast()->removeObserver(
getAvatarId(), this);
}
@@ -128,9 +128,9 @@ void LLPanelPickInfo::onOpen(const LLSD& key)
setPickDesc(key["pick_desc"]);
setSnapshotId(key["snapshot_id"]);
- LLAvatarPropertiesProcessor::getInstance()->addObserver(
+ LLAvatarPropertiesProcessor::getInstanceFast()->addObserver(
getAvatarId(), this);
- LLAvatarPropertiesProcessor::getInstance()->sendPickInfoRequest(
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendPickInfoRequest(
getAvatarId(), getPickId());
}
@@ -333,7 +333,7 @@ void LLPanelPickInfo::onClickTeleport()
void LLPanelPickInfo::onClickBack()
{
- LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(), this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->removeObserver(getAvatarId(), this);
}
//////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index fb6248910cd..e4425888f1d 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -151,7 +151,7 @@ class LLAgentHandler : public LLCommandHandler
if (verb == "pay")
{
- if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableAvatarPay"))
+ if (!LLUI::getInstanceFast()->mSettingGroups["config"]->getBOOL("EnableAvatarPay"))
{
LLNotificationsUtil::add("NoAvatarPay", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit"));
return true;
@@ -304,7 +304,7 @@ BOOL LLPanelProfileSecondLife::postBuild()
mGroupList->setDoubleClickCallback(boost::bind(&LLPanelProfileSecondLife::openGroupProfile, this));
mGroupList->setReturnCallback(boost::bind(&LLPanelProfileSecondLife::openGroupProfile, this));
- LLVoiceClient::getInstance()->addObserver((LLVoiceClientStatusObserver*)this);
+ LLVoiceClient::getInstanceFast()->addObserver((LLVoiceClientStatusObserver*)this);
mCopyMenuButton->setMenu("menu_name_field.xml", LLMenuButton::MP_BOTTOM_RIGHT);
mRlvBehaviorConn = gRlvHandler.setBehaviourToggleCallback([this](ERlvBehaviour eBhvr, ERlvParamType eParam) { if (eBhvr == RLV_BHVR_SHOWWORLDMAP) updateButtons(); });
@@ -319,7 +319,7 @@ void LLPanelProfileSecondLife::onOpen(const LLSD& key)
resetData();
LLUUID avatar_id = getAvatarId();
- LLAvatarPropertiesProcessor::getInstance()->addObserver(avatar_id, this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->addObserver(avatar_id, this);
BOOL own_profile = getSelfProfile();
@@ -376,7 +376,7 @@ void LLPanelProfileSecondLife::apply(LLAvatarData* data)
data->about_text = mDescriptionEdit->getValue().asString();
data->allow_publish = mShowInSearchCheckbox->getValue();
- LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesUpdate(data);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendAvatarPropertiesUpdate(data);
}
}
@@ -386,7 +386,7 @@ void LLPanelProfileSecondLife::updateData()
if (!getIsLoading() && avatar_id.notNull() && !(getSelfProfile() && !getEmbedded()))
{
setIsLoading();
- LLAvatarPropertiesProcessor::getInstance()->sendAvatarGroupsRequest(avatar_id);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendAvatarGroupsRequest(avatar_id);
}
}
@@ -495,7 +495,7 @@ void LLPanelProfileSecondLife::fillCommonData(const LLAvatarData* avatar_data)
{
// Refresh avatar id in cache with new info to prevent re-requests
// and to make sure icons in text will be up to date
- LLAvatarIconIDCache::getInstance()->add(avatar_data->avatar_id, avatar_data->image_id);
+ LLAvatarIconIDCache::getInstanceFast()->add(avatar_data->avatar_id, avatar_data->image_id);
LLStringUtil::format_map_t args;
{
@@ -715,8 +715,8 @@ void LLPanelProfileSecondLife::processOnlineStatus(bool online)
mStatusText->setValue(status);
mStatusText->setColor(online ?
- LLUIColorTable::instance().getColor("StatusUserOnline") :
- LLUIColorTable::instance().getColor("StatusUserOffline"));
+ LLUIColorTable::instanceFast().getColor("StatusUserOnline") :
+ LLUIColorTable::instanceFast().getColor("StatusUserOffline"));
}
void LLPanelProfileSecondLife::updateButtons()
@@ -1101,7 +1101,7 @@ void LLPanelProfileInterests::apply()
interests_data.skills_text = mSkillsEditor->getText();
interests_data.languages_text = mLanguagesEditor->getText();
- LLAvatarPropertiesProcessor::getInstance()->sendInterestsInfoUpdate(&interests_data);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendInterestsInfoUpdate(&interests_data);
}
}
@@ -1243,7 +1243,7 @@ void LLPanelProfileNotes::updateData()
if (!getIsLoading() && avatar_id.notNull())
{
setIsLoading();
- LLAvatarPropertiesProcessor::getInstance()->sendAvatarNotesRequest(avatar_id);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendAvatarNotesRequest(avatar_id);
}
}
@@ -1304,7 +1304,7 @@ void LLPanelProfileNotes::onCommitNotes()
if (getIsLoaded())
{
std::string notes = mNotesEditor->getValue().asString();
- LLAvatarPropertiesProcessor::getInstance()->sendNotes(getAvatarId(),notes);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendNotes(getAvatarId(),notes);
}
}
@@ -1375,7 +1375,7 @@ void LLPanelProfileNotes::applyRights()
rights |= LLRelationship::GRANT_MODIFY_OBJECTS;
}
- LLAvatarPropertiesProcessor::getInstance()->sendFriendRights(getAvatarId(), rights);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendFriendRights(getAvatarId(), rights);
}
void LLPanelProfileNotes::updateWarning()
@@ -1420,7 +1420,7 @@ void LLPanelProfileNotes::processProperties(void* data, EAvatarProcessorType typ
mCharacterLimitWarning->setVisible(FALSE);
}
- LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->removeObserver(getAvatarId(),this);
}
}
}
@@ -1583,7 +1583,7 @@ void LLPanelProfile::updateData()
if (!getIsLoading() && avatar_id.notNull())
{
setIsLoading();
- LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(avatar_id);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendAvatarPropertiesRequest(avatar_id);
}
}
diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp
index ea055aacf36..7f0af756263 100644
--- a/indra/newview/llpanelprofileclassifieds.cpp
+++ b/indra/newview/llpanelprofileclassifieds.cpp
@@ -90,7 +90,7 @@ class LLClassifiedHandler : public LLCommandHandler, public LLAvatarPropertiesOb
return true;
}
- if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableClassifieds"))
+ if (!LLUI::getInstanceFast()->mSettingGroups["config"]->getBOOL("EnableClassifieds"))
{
LLNotificationsUtil::add("NoClassifieds", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit"));
return true;
@@ -123,8 +123,8 @@ class LLClassifiedHandler : public LLCommandHandler, public LLAvatarPropertiesOb
{
mRequestVerb = verb;
mClassifiedIds.insert(classified_id);
- LLAvatarPropertiesProcessor::getInstance()->addObserver(LLUUID(), this);
- LLAvatarPropertiesProcessor::getInstance()->sendClassifiedInfoRequest(classified_id);
+ LLAvatarPropertiesProcessor::getInstanceFast()->addObserver(LLUUID(), this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendClassifiedInfoRequest(classified_id);
return true;
}
else if (verb == "edit")
@@ -180,7 +180,7 @@ class LLClassifiedHandler : public LLCommandHandler, public LLAvatarPropertiesOb
// remove our observer now that we're done
mClassifiedIds.erase(c_info->classified_id);
- LLAvatarPropertiesProcessor::getInstance()->removeObserver(LLUUID(), this);
+ LLAvatarPropertiesProcessor::getInstanceFast()->removeObserver(LLUUID(), this);
}
};
LLClassifiedHandler gClassifiedHandler;
@@ -320,7 +320,7 @@ void LLPanelProfileClassifieds::callbackDeleteClassified(const LLSD& notificatio
if (classified_id.notNull())
{
- LLAvatarPropertiesProcessor::getInstance()->sendClassifiedDelete(classified_id);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendClassifiedDelete(classified_id);
}
updateButtons();
@@ -421,7 +421,7 @@ void LLPanelProfileClassifieds::updateData()
mNoItemsLabel->setValue(LLTrans::getString("PicksClassifiedsLoadingText"));
mNoItemsLabel->setVisible(TRUE);
- LLAvatarPropertiesProcessor::getInstance()->sendAvatarClassifiedsRequest(avatar_id);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendAvatarClassifiedsRequest(avatar_id);
}
}
@@ -615,7 +615,7 @@ void LLPanelProfileClassified::onOpen(const LLSD& key)
LLUUID snapshot_id = LLUUID::null;
std::string desc;
- LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+ LLParcel* parcel = LLViewerParcelMgr::getInstanceFast()->getAgentParcel();
if(parcel)
{
desc = parcel->getDesc();
@@ -660,7 +660,7 @@ void LLPanelProfileClassified::onOpen(const LLSD& key)
LL_INFOS() << "Opening classified [" << getClassifiedName() << "] (" << getClassifiedId() << ")" << LL_ENDL;
- LLAvatarPropertiesProcessor::getInstance()->sendClassifiedInfoRequest(getClassifiedId());
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendClassifiedInfoRequest(getClassifiedId());
gGenericDispatcher.addHandler("classifiedclickthrough", &sClassifiedClickThrough);
@@ -847,7 +847,7 @@ void LLPanelProfileClassified::onCancelClick()
else
{
// Reload data to undo changes to forms
- LLAvatarPropertiesProcessor::getInstance()->sendClassifiedInfoRequest(getClassifiedId());
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendClassifiedInfoRequest(getClassifiedId());
}
setInfoLoaded(false);
@@ -1229,7 +1229,7 @@ void LLPanelProfileClassified::sendUpdate()
c_data.flags = getFlags();
c_data.price_for_listing = getPriceForListing();
- LLAvatarPropertiesProcessor::getInstance()->sendClassifiedInfoUpdate(&c_data);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendClassifiedInfoUpdate(&c_data);
if(isNew())
{
@@ -1269,7 +1269,7 @@ std::string LLPanelProfileClassified::makeClassifiedName()
{
std::string name;
- LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+ LLParcel* parcel = LLViewerParcelMgr::getInstanceFast()->getAgentParcel();
if(parcel)
{
name = parcel->getName();
diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
index 63212af472c..efd1e03d68b 100644
--- a/indra/newview/llpanelprofilepicks.cpp
+++ b/indra/newview/llpanelprofilepicks.cpp
@@ -73,7 +73,7 @@ class LLPickHandler : public LLCommandHandler
return true;
}
- if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnablePicks"))
+ if (!LLUI::getInstanceFast()->mSettingGroups["config"]->getBOOL("EnablePicks"))
{
LLNotificationsUtil::add("NoPicks", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit"));
return true;
@@ -235,7 +235,7 @@ void LLPanelProfilePicks::callbackDeletePick(const LLSD& notification, const LLS
if (pick_id.notNull())
{
- LLAvatarPropertiesProcessor::getInstance()->sendPickDelete(pick_id);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendPickDelete(pick_id);
}
updateButtons();
@@ -353,14 +353,14 @@ void LLPanelProfilePicks::updateData()
mNoItemsLabel->setValue(LLTrans::getString("PicksClassifiedsLoadingText"));
mNoItemsLabel->setVisible(TRUE);
- LLAvatarPropertiesProcessor::getInstance()->sendAvatarPicksRequest(avatar_id);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendAvatarPicksRequest(avatar_id);
}
}
bool LLPanelProfilePicks::canAddNewPick()
{
- return (!LLAgentPicksInfo::getInstance()->isPickLimitReached() &&
- mTabContainer->getTabCount() < LLAgentPicksInfo::getInstance()->getMaxNumberOfPicks() &&
+ return (!LLAgentPicksInfo::getInstanceFast()->isPickLimitReached() &&
+ mTabContainer->getTabCount() < LLAgentPicksInfo::getInstanceFast()->getMaxNumberOfPicks() &&
RlvActions::canShowLocation());
}
@@ -400,7 +400,7 @@ LLPanelProfilePick::~LLPanelProfilePick()
{
if (mParcelId.notNull())
{
- LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelId, this);
+ LLRemoteParcelInfoProcessor::getInstanceFast()->removeObserver(mParcelId, this);
}
}
@@ -422,7 +422,7 @@ void LLPanelProfilePick::setAvatarId(const LLUUID& avatar_id)
LLUUID parcel_id = LLUUID::null, snapshot_id = LLUUID::null;
std::string pick_name, pick_desc, region_name;
- LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+ LLParcel* parcel = LLViewerParcelMgr::getInstanceFast()->getAgentParcel();
if (parcel)
{
parcel_id = parcel->getID();
@@ -447,7 +447,7 @@ void LLPanelProfilePick::setAvatarId(const LLUUID& avatar_id)
}
else
{
- LLAvatarPropertiesProcessor::getInstance()->sendPickInfoRequest(getAvatarId(), getPickId());
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendPickInfoRequest(getAvatarId(), getPickId());
enableSaveButton(FALSE);
}
@@ -643,7 +643,7 @@ void LLPanelProfilePick::onClickSetLocation()
std::string parcel_name, region_name;
- LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+ LLParcel* parcel = LLViewerParcelMgr::getInstanceFast()->getAgentParcel();
if (parcel)
{
mParcelId = parcel->getID();
@@ -681,10 +681,10 @@ void LLPanelProfilePick::sendParcelInfoRequest()
{
if (mRequestedId.notNull())
{
- LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mRequestedId, this);
+ LLRemoteParcelInfoProcessor::getInstanceFast()->removeObserver(mRequestedId, this);
}
- LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelId, this);
- LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelId);
+ LLRemoteParcelInfoProcessor::getInstanceFast()->addObserver(mParcelId, this);
+ LLRemoteParcelInfoProcessor::getInstanceFast()->sendParcelInfoRequest(mParcelId);
mRequestedId = mParcelId;
}
@@ -699,7 +699,7 @@ void LLPanelProfilePick::processParcelInfo(const LLParcelData& parcel_data)
if (mParcelId.notNull())
{
- LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelId, this);
+ LLRemoteParcelInfoProcessor::getInstanceFast()->removeObserver(mParcelId, this);
}
}
@@ -729,14 +729,14 @@ void LLPanelProfilePick::sendUpdate()
pick_data.sort_order = 0;
pick_data.enabled = TRUE;
- LLAvatarPropertiesProcessor::getInstance()->sendPickInfoUpdate(&pick_data);
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendPickInfoUpdate(&pick_data);
if(mNewPick)
{
// Assume a successful create pick operation, make new number of picks
// available immediately. Actual number of picks will be requested in
// LLAvatarPropertiesProcessor::sendPickInfoUpdate and updated upon server respond.
- LLAgentPicksInfo::getInstance()->incrementNumberOfPicks();
+ LLAgentPicksInfo::getInstanceFast()->incrementNumberOfPicks();
}
}
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index a66291f9103..74ef7dd3344 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8266,7 +8266,7 @@ void LLVOAvatar::updateRuthTimer(bool loading)
<< "( Head : " << isTextureDefined(TEX_HEAD_BAKED) << " )."
<< LL_ENDL;
- LLAvatarPropertiesProcessor::getInstance()->sendAvatarTexturesRequest(getID());
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendAvatarTexturesRequest(getID());
mRuthTimer.reset();
}
}
@@ -9461,7 +9461,7 @@ void LLVOAvatar::applyParsedAppearanceMessage(LLAppearanceMessageContents& conte
{
// re-request appearance, hoping that it comes back with a shape next time
LL_INFOS() << "Re-requesting AvatarAppearance for object: " << getID() << LL_ENDL;
- LLAvatarPropertiesProcessor::getInstance()->sendAvatarTexturesRequest(getID());
+ LLAvatarPropertiesProcessor::getInstanceFast()->sendAvatarTexturesRequest(getID());
mRuthTimer.reset();
}
else
--
GitLab