Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove old pointless code

Browse Source 
Somehow fixed my BOM crash
This commit is contained in:
Liru Færs
2019-10-11 03:42:20 -04:00
parent 7c24e67c50
commit 7c89a8b178
3 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llinventorybridge.cpp
View File

@@ -5994,9 +5994,6 @@ void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attach
return; return;
} }
LL_DEBUGS("Avatar") << "ATT add rez request for " << item->getName() << " id " << item_id << LL_ENDL;
gAgentAvatarp->addAttachmentRequest(item_id);
S32 attach_pt = 0; S32 attach_pt = 0;
if (isAgentAvatarValid() && attachment) if (isAgentAvatarValid() && attachment)
{ {

30
indra/newview/llvoavatarself.cpp
View File

@@ -1066,34 +1066,6 @@ BOOL LLVOAvatarSelf::isWearingAttachment(const LLUUID& inv_item_id) const
return FALSE; return FALSE;
} }
//-----------------------------------------------------------------------------
BOOL LLVOAvatarSelf::attachmentWasRequested(const LLUUID& inv_item_id) const
{
constexpr F32 REQUEST_EXPIRATION_SECONDS = 5.0; // any request older than this is ignored/removed.
auto it = mAttachmentRequests.find(inv_item_id);
if (it != mAttachmentRequests.end())
{
if (it->second.getElapsedTimeF32() > REQUEST_EXPIRATION_SECONDS)
mAttachmentRequests.erase(it);
else
return TRUE;
}
return FALSE;
}
//-----------------------------------------------------------------------------
void LLVOAvatarSelf::addAttachmentRequest(const LLUUID& inv_item_id)
{
LLTimer current_time;
mAttachmentRequests[inv_item_id] = current_time;
}
//-----------------------------------------------------------------------------
void LLVOAvatarSelf::removeAttachmentRequest(const LLUUID& inv_item_id)
{
mAttachmentRequests.erase(inv_item_id);
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// getWornAttachment() // getWornAttachment()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -1182,8 +1154,6 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view
{ {
const LLUUID& attachment_id = viewer_object->getAttachmentItemID(); const LLUUID& attachment_id = viewer_object->getAttachmentItemID();
LLAppearanceMgr::instance().registerAttachment(attachment_id); LLAppearanceMgr::instance().registerAttachment(attachment_id);
// Clear any pending requests once the attachment arrives.
removeAttachmentRequest(attachment_id);
updateLODRiggedAttachments(); updateLODRiggedAttachments();
// [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a) | Modified: RLVa-1.2.1a // [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a) | Modified: RLVa-1.2.1a

5
indra/newview/llvoavatarself.h
View File

@@ -298,9 +298,6 @@ protected:
public: public:
void updateAttachmentVisibility(U32 camera_mode); void updateAttachmentVisibility(U32 camera_mode);
BOOL isWearingAttachment(const LLUUID& inv_item_id) const; BOOL isWearingAttachment(const LLUUID& inv_item_id) const;
BOOL attachmentWasRequested(const LLUUID& inv_item_id) const;
void addAttachmentRequest(const LLUUID& inv_item_id);
void removeAttachmentRequest(const LLUUID& inv_item_id);
LLViewerObject* getWornAttachment(const LLUUID& inv_item_id); LLViewerObject* getWornAttachment(const LLUUID& inv_item_id);
bool getAttachedPointName(const LLUUID& inv_item_id, std::string& name) const; bool getAttachedPointName(const LLUUID& inv_item_id, std::string& name) const;
// [RLVa:KB] - Checked: 2009-12-18 (RLVa-1.1.0i) | Added: RLVa-1.1.0i // [RLVa:KB] - Checked: 2009-12-18 (RLVa-1.1.0i) | Added: RLVa-1.1.0i
@@ -316,8 +313,6 @@ public:
boost::signals2::connection setAttachmentCallback(const attachment_signal_t::slot_type& cb); boost::signals2::connection setAttachmentCallback(const attachment_signal_t::slot_type& cb);
// [/RLVa:KB] // [/RLVa:KB]
private: private:
// Track attachments that have been requested but have not arrived yet.
mutable std::map<LLUUID,LLTimer> mAttachmentRequests;
// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7) // [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
attachment_signal_t* mAttachmentSignal; attachment_signal_t* mAttachmentSignal;
// [/RLVa:KB] // [/RLVa:KB]