diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp index d7801b6ddc16f86bbf7620fffb698f626641dbb8..27df8418f3e30de68ef6ff6fda3993fa95dd82ad 100644 --- a/indra/llmessage/llassetstorage.cpp +++ b/indra/llmessage/llassetstorage.cpp @@ -209,11 +209,6 @@ LLBaseDownloadRequest::LLBaseDownloadRequest(const LLUUID &uuid, const LLAssetTy mTime = LLMessageSystem::getMessageTimeSeconds(TRUE); } -// virtual -LLBaseDownloadRequest::~LLBaseDownloadRequest() -{ -} - // virtual LLBaseDownloadRequest* LLBaseDownloadRequest::getCopy() { @@ -236,11 +231,6 @@ LLAssetRequest::LLAssetRequest(const LLUUID &uuid, const LLAssetType::EType type { } -// virtual -LLAssetRequest::~LLAssetRequest() -{ -} - // virtual LLSD LLAssetRequest::getTerseDetails() const { @@ -285,11 +275,6 @@ LLInvItemRequest::LLInvItemRequest(const LLUUID &uuid, const LLAssetType::EType { } -// virtual -LLInvItemRequest::~LLInvItemRequest() -{ -} - LLBaseDownloadRequest* LLInvItemRequest::getCopy() { return new LLInvItemRequest(*this); @@ -306,11 +291,6 @@ LLEstateAssetRequest::LLEstateAssetRequest(const LLUUID &uuid, const LLAssetType { } -// Virtual -LLEstateAssetRequest::~LLEstateAssetRequest() -{ -} - LLBaseDownloadRequest* LLEstateAssetRequest::getCopy() { return new LLEstateAssetRequest(*this); diff --git a/indra/llmessage/llassetstorage.h b/indra/llmessage/llassetstorage.h index c799d8eefc5b147f6acfd55d8e7296ea0564f301..921ab05d7de97627916ad341b423e551fbd7bc95 100644 --- a/indra/llmessage/llassetstorage.h +++ b/indra/llmessage/llassetstorage.h @@ -104,7 +104,7 @@ class LLBaseDownloadRequest { public: LLBaseDownloadRequest(const LLUUID &uuid, const LLAssetType::EType at); - virtual ~LLBaseDownloadRequest(); + virtual ~LLBaseDownloadRequest() = default; LLUUID getUUID() const { return mUUID; } LLAssetType::EType getType() const { return mType; } @@ -135,7 +135,7 @@ class LLAssetRequest : public LLBaseDownloadRequest { public: LLAssetRequest(const LLUUID &uuid, const LLAssetType::EType at); - virtual ~LLAssetRequest(); + virtual ~LLAssetRequest() = default; void setTimeout(F64Seconds timeout) { mTimeout = timeout; } @@ -170,7 +170,7 @@ class LLInvItemRequest : public LLBaseDownloadRequest { public: LLInvItemRequest(const LLUUID &uuid, const LLAssetType::EType at); - virtual ~LLInvItemRequest(); + virtual ~LLInvItemRequest() = default; virtual LLBaseDownloadRequest* getCopy(); }; @@ -179,7 +179,7 @@ class LLEstateAssetRequest : public LLBaseDownloadRequest { public: LLEstateAssetRequest(const LLUUID &uuid, const LLAssetType::EType at, EstateAssetType et); - virtual ~LLEstateAssetRequest(); + virtual ~LLEstateAssetRequest() = default; LLAssetType::EType getAType() const { return mType; } diff --git a/indra/llmessage/llbuffer.cpp b/indra/llmessage/llbuffer.cpp index cfe38605ad559988f1948183f644d558b74160bc..8706e11adf96331b2d6458d71f09ce7956aade5d 100644 --- a/indra/llmessage/llbuffer.cpp +++ b/indra/llmessage/llbuffer.cpp @@ -54,10 +54,6 @@ LLSegment::LLSegment(S32 channel, U8* data, S32 data_len) : { } -LLSegment::~LLSegment() -{ -} - bool LLSegment::isOnChannel(S32 channel) const { return (mChannel == channel); diff --git a/indra/llmessage/llbuffer.h b/indra/llmessage/llbuffer.h index 7617adb663193893382a5ad7ca2899e3e07ded59..96a000f169cad0408a72d1d1f4d5aa90d1f7e4d0 100644 --- a/indra/llmessage/llbuffer.h +++ b/indra/llmessage/llbuffer.h @@ -77,7 +77,7 @@ class LLSegment public: LLSegment(); LLSegment(S32 channel, U8* data, S32 data_len); - ~LLSegment(); + ~LLSegment() = default; /** * @brief Check if this segment is on the given channel.