diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 3fc3b01282e9745da838f9a5e3d29647a99e14c1..600e45d4bbc237ee0ec8d7017722b170dacc9e6e 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -120,7 +120,7 @@ void LLAvatarActions::requestFriendshipDialog(const LLUUID& id, const std::strin
LLNotificationsUtil::add("AddFriendWithMessage", args, payload, &callbackAddFriendWithMessage);
// add friend to recent people list
- LLRecentPeople::instance().add(id);
+ LLRecentPeople::instanceFast().add(id);
}
static void on_avatar_name_friendship(const LLUUID& id, const LLAvatarName av_name)
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 0954d79e5539ded0bc5b37fdda8637e4db48949a..7da87ed335a71d2d231d11a726ebe47b8204f800 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -302,9 +302,9 @@ void LLAvatarList::refresh()
{
// *NOTE: If you change the UI to show a different string,
// be sure to change the filter code below.
- if (LLRecentPeople::instance().isAvalineCaller(buddy_id))
+ if (LLRecentPeople::instanceFast().isAvalineCaller(buddy_id))
{
- const LLSD& call_data = LLRecentPeople::instance().getData(buddy_id);
+ const LLSD& call_data = LLRecentPeople::instanceFast().getData(buddy_id);
addAvalineItem(buddy_id, call_data["session_id"].asUUID(), call_data["call_number"].asString());
}
else
@@ -488,7 +488,7 @@ BOOL LLAvatarList::handleMouseDown(S32 x, S32 y, MASK mask)
S32 screen_x;
S32 screen_y;
localPointToScreen(x, y, &screen_x, &screen_y);
- LLToolDragAndDrop::getInstance()->setDragStart(screen_x, screen_y);
+ LLToolDragAndDrop::getInstanceFast()->setDragStart(screen_x, screen_y);
return LLFlatListViewEx::handleMouseDown(x, y, mask);
}
@@ -512,7 +512,7 @@ BOOL LLAvatarList::handleHover(S32 x, S32 y, MASK mask)
S32 screen_y;
localPointToScreen(x, y, &screen_x, &screen_y);
- if(LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y))
+ if(LLToolDragAndDrop::getInstanceFast()->isOverThreshold(screen_x, screen_y))
{
// First, create the global drag and drop object
std::vector<EDragAndDropType> types;
@@ -520,7 +520,7 @@ BOOL LLAvatarList::handleHover(S32 x, S32 y, MASK mask)
getSelectedUUIDs(cargo_ids);
types.resize(cargo_ids.size(), DAD_PERSON);
LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_PEOPLE;
- LLToolDragAndDrop::getInstance()->beginMultiDrag(types, cargo_ids, src);
+ LLToolDragAndDrop::getInstanceFast()->beginMultiDrag(types, cargo_ids, src);
}
}
@@ -586,7 +586,7 @@ void LLAvatarList::updateLastInteractionTimes()
{
// *TODO: error handling
LLAvatarListItem* item = static_cast<LLAvatarListItem*>(*it);
- S32 secs_since = now - (S32) LLRecentPeople::instance().getDate(item->getAvatarId()).secondsSinceEpoch();
+ S32 secs_since = now - (S32) LLRecentPeople::instanceFast().getDate(item->getAvatarId()).secondsSinceEpoch();
if (secs_since >= 0)
item->setLastInteractionTime(secs_since);
}
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp
index 6eea6cda01384c28634994f999d3ed22aff66bdd..6b1e762f5579dd9acb59e5975535633b69915439 100644
--- a/indra/newview/llfloaterimnearbychathandler.cpp
+++ b/indra/newview/llfloaterimnearbychathandler.cpp
@@ -585,7 +585,7 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
// Add sender to the recent people list.
// [RLVa:KB] - Checked: RLVa-2.0.0
if ( (!RlvActions::isRlvEnabled()) || (RlvActions::canShowName(RlvActions::SNC_DEFAULT, chat_msg.mFromID)) )
- LLRecentPeople::instance().add(chat_msg.mFromID);
+ LLRecentPeople::instanceFast().add(chat_msg.mFromID);
// [/RLVa:KB]
// LLRecentPeople::instance().add(chat_msg.mFromID);
}
diff --git a/indra/newview/llgiveinventory.cpp b/indra/newview/llgiveinventory.cpp
index c0306c2c145c353a0b3fe096ed0a7fad57f53744..cdab6093854138d1f6e330d696f5089f3e38ef0a 100644
--- a/indra/newview/llgiveinventory.cpp
+++ b/indra/newview/llgiveinventory.cpp
@@ -474,7 +474,7 @@ bool LLGiveInventory::commitGiveInventoryItem(const LLUUID& to_agent,
if ( (!RlvActions::isRlvEnabled()) ||
(RlvActions::canShowName(RlvActions::SNC_DEFAULT, to_agent)) || (im_session_id.notNull()) || (!RlvUtil::isNearbyAgent(to_agent)) || (RlvUIEnabler::hasOpenProfile(to_agent)) )
{
- LLRecentPeople::instance().add(to_agent);
+ LLRecentPeople::instanceFast().add(to_agent);
}
return true;
// [/RLVa:KB]
@@ -564,7 +564,7 @@ bool LLGiveInventory::commitGiveInventoryCategory(const LLUUID& to_agent,
if ( (!RlvActions::isRlvEnabled()) ||
(RlvActions::canShowName(RlvActions::SNC_DEFAULT, to_agent)) || (im_session_id.notNull()) || (!RlvUtil::isNearbyAgent(to_agent)) || (RlvUIEnabler::hasOpenProfile(to_agent)) )
{
- LLRecentPeople::instance().add(to_agent);
+ LLRecentPeople::instanceFast().add(to_agent);
}
// [/RLVa:KB]
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 1bfd430e08cdf1ffef5bae37b112c4f930eb5288..068728ba45d4f6d4c3bc3f04981e9f3ca49d54ce 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1217,7 +1217,7 @@ bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, co
//other places may be called from message history.
if( !from_id.isNull() &&
( session->isP2PSessionType() || session->isAdHocSessionType() ) )
- LLRecentPeople::instance().add(from_id);
+ LLRecentPeople::instanceFast().add(from_id);
// notify listeners
LLSD arg;
@@ -1508,7 +1508,7 @@ void LLIMModel::sendMessage(const std::string& utf8_text,
{
if( session == 0)//??? shouldn't really happen
{
- LLRecentPeople::instance().add(other_participant_id);
+ LLRecentPeople::instanceFast().add(other_participant_id);
return;
}
// IM_SESSION_INVITE means that this is an Ad-hoc incoming chat
@@ -1528,7 +1528,7 @@ void LLIMModel::sendMessage(const std::string& utf8_text,
// Add the recepient of the session.
if (!session->mInitialTargetIDs.empty())
{
- LLRecentPeople::instance().add(*(session->mInitialTargetIDs.begin()));
+ LLRecentPeople::instanceFast().add(*(session->mInitialTargetIDs.begin()));
}
}
}
@@ -1545,7 +1545,7 @@ void LLIMModel::addSpeakersToRecent(const LLUUID& im_session_id)
for(LLSpeakerMgr::speaker_list_t::iterator it = speaker_list.begin(); it != speaker_list.end(); it++)
{
const LLPointer<LLSpeaker>& speakerp = *it;
- LLRecentPeople::instance().add(speakerp->mID);
+ LLRecentPeople::instanceFast().add(speakerp->mID);
}
}
@@ -3247,7 +3247,7 @@ void LLIMMgr::inviteToSession(
// the call, the caller should be added to the recent list
// anyway. STORM-507.
if(type == IM_SESSION_P2P_INVITE)
- LLRecentPeople::instance().add(caller_id);
+ LLRecentPeople::instanceFast().add(caller_id);
mPendingInvitations[session_id.asString()] = LLSD();
}
diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp
index dfaf2e69f0f4dc01f9ecfa6311f048f1cb076340..28fee7d65fae18a38a1752a70dff24e4a4a89f11 100644
--- a/indra/newview/llinspect.cpp
+++ b/indra/newview/llinspect.cpp
@@ -110,7 +110,7 @@ BOOL LLInspect::handleToolTip(S32 x, S32 y, MASK mask)
{
//build LLInspector params to get correct tooltip setting, etc. background image
LLInspector::Params params;
- params.fillFrom(LLUICtrlFactory::instanceFast().getDefaultParams<LLInspector>());
+ params.fillFrom(LLUICtrlFactory::getDefaultParams<LLInspector>());
params.message = child_handler->getToolTip();
//set up delay if there is no visible tooltip at this moment
static LLUICachedControl<F32> tool_tip_delay("ToolTipDelay", 0.69999f);
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index a79af012fd28a9ab63d3ec15c92b396022573c8b..2d27540694148bae4712ecd10b35c1aa62e56d5e 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -100,7 +100,7 @@ class LLAvatarItemRecentComparator : public LLAvatarItemComparator
protected:
virtual bool doCompare(const LLAvatarListItem* avatar_item1, const LLAvatarListItem* avatar_item2) const
{
- LLRecentPeople& people = LLRecentPeople::instance();
+ LLRecentPeople& people = LLRecentPeople::instanceFast();
const LLDate& date1 = people.getDate(avatar_item1->getAvatarId());
const LLDate& date2 = people.getDate(avatar_item2->getAvatarId());
@@ -223,8 +223,8 @@ class LLAvatarItemRecentArrivalComparator : public LLAvatarItemNameComparator
virtual bool doCompare(const LLAvatarListItem* item1, const LLAvatarListItem* item2) const
{
- F32 arr_time1 = LLRecentPeople::instance().getArrivalTimeByID(item1->getAvatarId());
- F32 arr_time2 = LLRecentPeople::instance().getArrivalTimeByID(item2->getAvatarId());
+ F32 arr_time1 = LLRecentPeople::instanceFast().getArrivalTimeByID(item1->getAvatarId());
+ F32 arr_time2 = LLRecentPeople::instanceFast().getArrivalTimeByID(item2->getAvatarId());
if (arr_time1 == arr_time2)
{
@@ -528,7 +528,7 @@ class LLRecentListUpdater : public LLAvatarListUpdater, public boost::signals2::
LLRecentListUpdater(callback_t cb)
: LLAvatarListUpdater(cb, 0)
{
- LLRecentPeople::instance().setChangedCallback(boost::bind(&LLRecentListUpdater::update, this));
+ LLRecentPeople::instanceFast().setChangedCallback(boost::bind(&LLRecentListUpdater::update, this));
}
};
@@ -854,7 +854,7 @@ void LLPanelPeople::updateRecentList()
if (!mRecentList)
return;
- LLRecentPeople::instance().get(mRecentList->getIDs());
+ LLRecentPeople::instanceFast().get(mRecentList->getIDs());
mRecentList->setDirty();
}
@@ -1623,7 +1623,7 @@ bool LLPanelPeople::updateNearbyArrivalTime()
std::vector<LLVector3d> positions;
std::vector<LLUUID> uuids;
LLWorld::getInstanceFast()->getAvatars(&uuids, &positions, gAgent.getPositionGlobal(), ALControlCache::NearMeRange);
- LLRecentPeople::instance().updateAvatarsArrivalTime(uuids);
+ LLRecentPeople::instanceFast().updateAvatarsArrivalTime(uuids);
return LLApp::isExiting();
}
diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp
index 87051658696992fa6606ec726bf9ceea5c4e163b..850ad5f12aa18f7ecca6169924958592a3e5e7ad 100644
--- a/indra/newview/lltoastimpanel.cpp
+++ b/indra/newview/lltoastimpanel.cpp
@@ -247,7 +247,7 @@ void LLToastIMPanel::spawnGroupIconToolTip()
}
LLInspector::Params params;
- params.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
+ params.fillFrom(LLUICtrlFactory::getDefaultParams<LLInspector>());
params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_group", LLSD().with("group_id", mSessionID), FALSE));
params.delay_time(0.100f);
params.image(LLUI::getUIImage("Info_Small"));
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 4db532a43501bef71fd6b88368abbe0761a73e21..c7053062fb5b2a68987997a6af1745ab415df481 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1207,7 +1207,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
// [/RLVa:KB]
static const LLCachedControl<F32> av_inspector_tooltip_delay(gSavedSettings, "AvatarInspectorTooltipDelay");
LLInspector::Params p;
- p.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
+ p.fillFrom(LLUICtrlFactory::getDefaultParams<LLInspector>());
p.message(final_name);
p.image.name("Inspector_I");
p.click_callback(boost::bind(showAvatarInspector, hover_object->getID()));
@@ -1331,7 +1331,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
{
// [/RLVa:KB]
LLInspector::Params p;
- p.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
+ p.fillFrom(LLUICtrlFactory::getDefaultParams<LLInspector>());
p.message(tooltip_msg);
p.image.name("Inspector_I");
p.click_callback(boost::bind(showObjectInspector, hover_object->getID(), mHoverPick.mObjectFace));
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 0ceee440634e31dcaabc3c7cd6ce63f67ceb381b..f2a55e37052d94343848dda40636200ed5e41b9e 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -195,7 +195,7 @@ void accept_friendship_coro(std::string url, LLSD notification)
{
LL_DEBUGS("Friendship") << "Adding friend to list" << httpResults << LL_ENDL;
// add friend to recent people list
- LLRecentPeople::instance().add(payload["from_id"]);
+ LLRecentPeople::instanceFast().add(payload["from_id"]);
LLNotificationsUtil::add("FriendshipAcceptedByMe",
notification["substitutions"], payload);
@@ -293,7 +293,7 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
msg->sendReliable(LLHost(payload["sender"].asString()));
// add friend to recent people list
- LLRecentPeople::instance().add(payload["from_id"]);
+ LLRecentPeople::instanceFast().add(payload["from_id"]);
LLNotificationsUtil::add("FriendshipAcceptedByMe",
notification["substitutions"], payload);
}
@@ -1701,7 +1701,7 @@ void LLOfferInfo::sendReceiveResponse(bool accept, const LLUUID &destination_fol
bool fRlvCanShowName = (!RlvActions::isRlvEnabled()) ||
(RlvActions::canShowName(RlvActions::SNC_DEFAULT, mFromID)) || (!RlvUtil::isNearbyAgent(mFromID)) || (RlvUIEnabler::hasOpenIM(mFromID)) || (RlvUIEnabler::hasOpenProfile(mFromID));
if (fRlvCanShowName)
- LLRecentPeople::instance().add(mFromID);
+ LLRecentPeople::instanceFast().add(mFromID);
// [/RLVa:KB]
}
@@ -6668,7 +6668,7 @@ void send_lures(const LLSD& notification, const LLSD& response)
// Add the recepient to the recent people list.
// [RLVa:KB] - Checked: RLVa-2.0.1
if (fRlvCanShowName)
- LLRecentPeople::instance().add(target_id);
+ LLRecentPeople::instanceFast().add(target_id);
// [/RLVa:KB]
// LLRecentPeople::instance().add(target_id);
}
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index 039ce1fe8af61005891d919296794ebd02ef0ef2..74683a396e9d7d58fe66377658fa5922d83aac38 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -451,7 +451,7 @@ void LLVoiceChannelGroup::activate()
it!=session->mInitialTargetIDs.end();++it)
{
const LLUUID id = *it;
- LLRecentPeople::instance().add(id);
+ LLRecentPeople::instanceFast().add(id);
}
}
// If this ad-hoc is incoming then trying to get ids of people from mInitialTargetIDs
@@ -961,10 +961,10 @@ void LLVoiceChannelP2P::addToTheRecentPeopleList()
call_data["call_number"] = call_number;
call_data["date"] = LLDate::now();
- LLRecentPeople::instance().add(mOtherUserID, call_data);
+ LLRecentPeople::instanceFast().add(mOtherUserID, call_data);
}
else
{
- LLRecentPeople::instance().add(mOtherUserID);
+ LLRecentPeople::instanceFast().add(mOtherUserID);
}
}