diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index dc87689432efe5bd136a458abc64f5a3a7b6e8f4..9ddef697d1b3a67f9d7557d725cb4d632c3d6255 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -980,8 +980,8 @@ public:
{
LL_INFOS() << "created callback" << LL_ENDL;
}
- /* virtual */ void fire(const LLUUID& inv_item)
- {
+ /* virtual */ void fire(const LLUUID& inv_item) override
+ {
LL_INFOS() << "One item created " << inv_item.asString() << LL_ENDL;
LLConstPointer<LLInventoryObject> item = gInventory.getItem(inv_item);
mItemsToLink.push_back(item);
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 4a5b09f5f07841116aaef8a1c0d1ca9ec0d180e4..4c4cd5223f32e70112c182985f0014a2a66acb04 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -121,7 +121,7 @@ public:
}
/*virtual*/
- BOOL tick()
+ BOOL tick() override
{
if(mEventTimer.hasExpired())
{
@@ -144,7 +144,7 @@ public:
// requests will be throttled from a non-trusted browser
LLAppearanceHandler() : LLCommandHandler("appearance", UNTRUSTED_THROTTLE) {}
- bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+ bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) override
{
// support secondlife:///app/appearance/show, but for now we just
// make all secondlife:///app/appearance SLapps behave this way
@@ -181,17 +181,17 @@ public:
F32 retry_after = DEFAULT_RETRY_AFTER_INTERVAL,
S32 max_retries = DEFAULT_MAX_RETRIES
):
- mDstCatID(dst_cat_id),
+ LLEventTimer(5.0),
mTrackingPhase(phase_name),
+ mDstCatID(dst_cat_id),
mOnCompletionFunc(on_completion_func),
mOnFailureFunc(on_failure_func),
mRetryAfter(retry_after),
mMaxRetries(max_retries),
mPendingRequests(0),
mFailCount(0),
- mCompletionOrFailureCalled(false),
mRetryCount(0),
- LLEventTimer(5.0)
+ mCompletionOrFailureCalled(false)
{
if (!mTrackingPhase.empty())
{
@@ -300,7 +300,7 @@ public:
// virtual
// Will be deleted after returning true - only safe to do this if all callbacks have fired.
- BOOL tick()
+ BOOL tick() override
{
// mPendingRequests will be zero if all requests have been
// responded to. mWaitTimes.empty() will be true if we have
@@ -400,8 +400,8 @@ public:
{
sInstanceCount--;
}
-
- virtual bool requestOperation(const LLUUID& item_id)
+
+ bool requestOperation(const LLUUID& item_id) override
{
LLViewerInventoryItem *item = gInventory.getItem(item_id);
llassert(item);
@@ -438,7 +438,7 @@ public:
{}
// virtual
- void fire(const LLUUID& id)
+ void fire(const LLUUID& id) override
{
// Wear the inventory category.
LLInventoryCategory* cat = gInventory.getCategory(id);
@@ -460,7 +460,7 @@ public:
}
// virtual
- void fire(const LLUUID& id)
+ void fire(const LLUUID& id) override
{
if (mCB)
{
@@ -578,8 +578,8 @@ struct LLFoundData
mName(name),
mAssetType(asset_type),
mWearableType(wearable_type),
- mIsReplacement(is_replacement),
- mWearable( NULL ) {}
+ mWearable( NULL ),
+ mIsReplacement(is_replacement) {}
LLUUID mItemID;
LLUUID mAssetID;
@@ -2713,8 +2713,8 @@ class LLDeferredCOFLinkObserver: public LLInventoryObserver
public:
LLDeferredCOFLinkObserver(const LLUUID& item_id, LLPointer<LLInventoryCallback> cb, const std::string& description):
mItemID(item_id),
- mCallback(cb),
- mDescription(description)
+ mDescription(description),
+ mCallback(cb)
{
}
@@ -2722,8 +2722,8 @@ public:
{
}
- /* virtual */ void changed(U32 mask)
- {
+ /* virtual */ void changed(U32 mask) override
+ {
const LLInventoryItem *item = gInventory.getItem(mItemID);
if (item)
{
@@ -2909,8 +2909,8 @@ public:
{
}
- /* virtual */ void fire(const LLUUID& item_id)
- {
+ /* virtual */ void fire(const LLUUID& item_id) override
+ {
// just removed cof link, "(wear)" suffix depends on presence of link, so update label
gInventory.addChangedMask(LLInventoryObserver::LABEL, mItemID);
if (mCB.notNull())
@@ -4016,11 +4016,11 @@ bool LLAppearanceMgr::mActive = true;
LLAppearanceMgr::LLAppearanceMgr():
mAttachmentInvLinkEnabled(false),
mOutfitIsDirty(false),
- mOutfitLocked(false),
- mInFlightTimer(),
mIsInUpdateAppearanceFromCOF(false),
- mOutstandingAppearanceBakeRequest(false),
- mRerequestAppearanceBake(false)
+ mOutstandingAppearanceBakeRequest(false),
+ mRerequestAppearanceBake(false),
+ mOutfitLocked(false),
+ mInFlightTimer()
{
LLOutfitObserver& outfit_observer = LLOutfitObserver::instance();
// unlock outfit on save operation completed
@@ -4139,7 +4139,8 @@ public:
~CallAfterCategoryFetchStage2()
{
}
- virtual void done()
+
+ void done() override
{
LL_INFOS() << this << " done with incomplete " << mIncomplete.size()
<< " complete " << mComplete.size() << " calling callable" << LL_ENDL;
@@ -4163,7 +4164,8 @@ public:
~CallAfterCategoryFetchStage1()
{
}
- virtual void done()
+
+ void done() override
{
// What we do here is get the complete information on the
// items in the requested category, and set up an observer
@@ -4290,7 +4292,7 @@ public:
LLWearFolderHandler() : LLCommandHandler("wear_folder", UNTRUSTED_BLOCK) { }
bool handle(const LLSD& tokens, const LLSD& query_map,
- LLMediaCtrl* web)
+ LLMediaCtrl* web) override
{
LLSD::UUID folder_uuid;
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index e7323b8f80af4f7ec61d203949894b739e16c561..82486103924abc0cfaeb26c94bf8c65f4790c5da 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -65,48 +65,51 @@ public:
virtual ~LLConversationItem();
// Stub those things we won't really be using in this conversation context
- virtual const std::string& getName() const { return mName; }
- virtual const std::string& getDisplayName() const { return mName; }
- virtual const std::string& getSearchableName() const { return mName; }
- virtual std::string getSearchableDescription() const { return LLStringUtil::null; }
- virtual std::string getSearchableCreatorName() const { return LLStringUtil::null; }
- virtual std::string getSearchableUUIDString() const {return LLStringUtil::null;}
+ const std::string& getName() const override { return mName; }
+ const std::string& getDisplayName() const override { return mName; }
+ const std::string& getSearchableName() const override { return mName; }
+ std::string getSearchableDescription() const override { return LLStringUtil::null; }
+ std::string getSearchableCreatorName() const override { return LLStringUtil::null; }
+ std::string getSearchableUUIDString() const override {return LLStringUtil::null;}
virtual const LLUUID& getUUID() const { return mUUID; }
virtual time_t getCreationDate() const { return 0; }
- virtual LLPointer<LLUIImage> getIcon() const { return NULL; }
+ LLPointer<LLUIImage> getIcon() const override { return NULL; }
virtual LLPointer<LLUIImage> getOpenIcon() const { return getIcon(); }
- virtual LLFontGL::StyleFlags getLabelStyle() const { return LLFontGL::NORMAL; }
- virtual std::string getLabelSuffix() const { return LLStringUtil::null; }
- virtual BOOL isItemRenameable() const { return TRUE; }
- virtual BOOL renameItem(const std::string& new_name) { mName = new_name; mNeedsRefresh = true; return TRUE; }
- virtual BOOL isItemMovable( void ) const { return FALSE; }
- virtual BOOL isItemRemovable( void ) const { return FALSE; }
+ LLFontGL::StyleFlags getLabelStyle() const override { return LLFontGL::NORMAL; }
+ std::string getLabelSuffix() const override { return LLStringUtil::null; }
+ BOOL isItemRenameable() const override { return TRUE; }
+
+ BOOL renameItem(const std::string& new_name) override
+ { mName = new_name; mNeedsRefresh = true; return TRUE; }
+
+ BOOL isItemMovable( void ) const override { return FALSE; }
+ BOOL isItemRemovable( void ) const override { return FALSE; }
virtual BOOL isItemInTrash( void) const { return FALSE; }
- virtual BOOL removeItem() { return FALSE; }
- virtual void removeBatch(std::vector<LLFolderViewModelItem*>& batch) { }
- virtual void move( LLFolderViewModelItem* parent_listener ) { }
- virtual BOOL isItemCopyable() const { return FALSE; }
- virtual BOOL copyToClipboard() const { return FALSE; }
- virtual BOOL cutToClipboard() { return FALSE; }
- virtual BOOL isClipboardPasteable() const { return FALSE; }
- virtual void pasteFromClipboard() { }
- virtual void pasteLinkFromClipboard() { }
- virtual void buildContextMenu(LLMenuGL& menu, U32 flags) { }
+ BOOL removeItem() override { return FALSE; }
+ void removeBatch(std::vector<LLFolderViewModelItem*>& batch) override { }
+ void move( LLFolderViewModelItem* parent_listener ) override { }
+ BOOL isItemCopyable() const override { return FALSE; }
+ BOOL copyToClipboard() const override { return FALSE; }
+ BOOL cutToClipboard() override { return FALSE; }
+ BOOL isClipboardPasteable() const override { return FALSE; }
+ void pasteFromClipboard() override { }
+ void pasteLinkFromClipboard() override { }
+ void buildContextMenu(LLMenuGL& menu, U32 flags) override { }
virtual BOOL isUpToDate() const { return TRUE; }
- virtual bool hasChildren() const { return FALSE; }
+ bool hasChildren() const override { return FALSE; }
- virtual bool potentiallyVisible() { return true; }
- virtual bool filter( LLFolderViewFilter& filter) { return false; }
- virtual bool descendantsPassedFilter(S32 filter_generation = -1) { return true; }
- virtual void setPassedFilter(bool passed, S32 filter_generation, std::string::size_type string_offset = std::string::npos, std::string::size_type string_size = 0) { }
- virtual bool passedFilter(S32 filter_generation = -1) { return true; }
+ bool potentiallyVisible() override { return true; }
+ bool filter( LLFolderViewFilter& filter) override { return false; }
+ bool descendantsPassedFilter(S32 filter_generation = -1) override { return true; }
+ void setPassedFilter(bool passed, S32 filter_generation, std::string::size_type string_offset = std::string::npos, std::string::size_type string_size = 0) override { }
+ bool passedFilter(S32 filter_generation = -1) override { return true; }
// The action callbacks
virtual void performAction(LLInventoryModel* model, std::string action);
- virtual void openItem( void );
- virtual void closeItem( void );
+ void openItem( void ) override;
+ void closeItem( void ) override;
virtual void previewItem( void );
- virtual void selectItem(void) { }
+ void selectItem(void) override { }
virtual void showProperties(void);
// Methods used in sorting (see LLConversationSort::operator())
@@ -118,10 +121,10 @@ public:
// performed, and will set drop to TRUE if a drop is
// requested.
// Returns TRUE if a drop is possible/happened, FALSE otherwise.
- virtual BOOL dragOrDrop(MASK mask, BOOL drop,
+ BOOL dragOrDrop(MASK mask, BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
- std::string& tooltip_msg) { return FALSE; }
+ std::string& tooltip_msg) override { return FALSE; }
// bool hasSameValues(std::string name, const LLUUID& uuid) { return ((name == mName) && (uuid == mUUID)); }
bool hasSameValue(const LLUUID& uuid) { return (uuid == mUUID); }
@@ -154,8 +157,8 @@ public:
LLConversationItemSession(std::string display_name, const LLUUID& uuid, LLFolderViewModelInterface& root_view_model);
LLConversationItemSession(const LLUUID& uuid, LLFolderViewModelInterface& root_view_model);
- /*virtual*/ bool hasChildren() const;
- LLPointer<LLUIImage> getIcon() const { return NULL; }
+ /*virtual*/ bool hasChildren() const override;
+ LLPointer<LLUIImage> getIcon() const override { return NULL; }
void setSessionID(const LLUUID& session_id) { mUUID = session_id; mNeedsRefresh = true; }
void addParticipant(LLConversationItemParticipant* participant);
void updateName(LLConversationItemParticipant* participant);
@@ -171,14 +174,14 @@ public:
bool isLoaded() { return mIsLoaded; }
- void buildContextMenu(LLMenuGL& menu, U32 flags);
+ void buildContextMenu(LLMenuGL& menu, U32 flags) override;
void addVoiceOptions(menuentry_vec_t& items);
- virtual const bool getTime(F64& time) const;
+ const bool getTime(F64& time) const override;
void dumpDebugData(bool dump_children = false);
private:
- /*virtual*/ void onAvatarNameCache(const LLAvatarName& av_name);
+ /*virtual*/ void onAvatarNameCache(const LLAvatarName& av_name) override;
bool mIsLoaded; // true if at least one participant has been added to the session, false otherwise
};
@@ -188,8 +191,8 @@ class LLConversationItemParticipant : public LLConversationItem
public:
LLConversationItemParticipant(std::string display_name, const LLUUID& uuid, LLFolderViewModelInterface& root_view_model);
LLConversationItemParticipant(const LLUUID& uuid, LLFolderViewModelInterface& root_view_model);
-
- virtual const std::string& getDisplayName() const { return mDisplayName; }
+
+ const std::string& getDisplayName() const override { return mDisplayName; }
bool isVoiceMuted();
bool isModerator() const { return mIsModerator; }
@@ -198,9 +201,10 @@ public:
void setTimeNow() { mLastActiveTime = LLFrameTimer::getElapsedSeconds(); mNeedsRefresh = true; }
void setDistance(F64 dist) { mDistToAgent = dist; mNeedsRefresh = true; }
- void buildContextMenu(LLMenuGL& menu, U32 flags);
+ void buildContextMenu(LLMenuGL& menu, U32 flags) override;
- virtual const bool getDistanceToAgent(F64& dist) const { dist = mDistToAgent; return (dist >= 0.0); }
+ const bool getDistanceToAgent(F64& dist) const override
+ { dist = mDistToAgent; return (dist >= 0.0); }
void updateName(); // get from the cache (do *not* fetch) and update the avatar name
LLConversationItemSession* getParentSession();
@@ -211,7 +215,7 @@ public:
void setGroupBanVisible(bool visible) { mDisplayGroupBanOptions = visible; }
private:
- void onAvatarNameCache(const LLAvatarName& av_name); // callback used by fetchAvatarName
+ void onAvatarNameCache(const LLAvatarName& av_name) override; // callback used by fetchAvatarName
void updateName(const LLAvatarName& av_name);
bool mIsModerator; // default is false
@@ -240,32 +244,32 @@ public:
LLConversationFilter() { mEmpty.clear(); }
~LLConversationFilter() {}
- bool check(const LLFolderViewModelItem* item) { return true; }
- bool checkFolder(const LLFolderViewModelItem* folder) const { return true; }
- void setEmptyLookupMessage(const std::string& message) { }
- std::string getEmptyLookupMessage() const { return mEmpty; }
- bool showAllResults() const { return true; }
- std::string::size_type getStringMatchOffset(LLFolderViewModelItem* item) const { return std::string::npos; }
- std::string::size_type getFilterStringSize() const { return 0; }
+ bool check(const LLFolderViewModelItem* item) override { return true; }
+ bool checkFolder(const LLFolderViewModelItem* folder) const override { return true; }
+ void setEmptyLookupMessage(const std::string& message) override { }
+ std::string getEmptyLookupMessage() const override { return mEmpty; }
+ bool showAllResults() const override { return true; }
+ std::string::size_type getStringMatchOffset(LLFolderViewModelItem* item) const override { return std::string::npos; }
+ std::string::size_type getFilterStringSize() const override { return 0; }
- bool isActive() const { return false; }
- bool isModified() const { return false; }
- void clearModified() { }
- const std::string& getName() const { return mEmpty; }
- const std::string& getFilterText() { return mEmpty; }
- void setModified(EFilterModified behavior = FILTER_RESTART) { }
-
- void resetTime(S32 timeout) { }
- bool isTimedOut() { return false; }
+ bool isActive() const override { return false; }
+ bool isModified() const override { return false; }
+ void clearModified() override { }
+ const std::string& getName() const override { return mEmpty; }
+ const std::string& getFilterText() override { return mEmpty; }
+ void setModified(EFilterModified behavior = FILTER_RESTART) override { }
+
+ void resetTime(S32 timeout) override { }
+ bool isTimedOut() override { return false; }
- bool isDefault() const { return true; }
- bool isNotDefault() const { return false; }
- void markDefault() { }
- void resetDefault() { }
+ bool isDefault() const override { return true; }
+ bool isNotDefault() const override { return false; }
+ void markDefault() override { }
+ void resetDefault() override { }
- S32 getCurrentGeneration() const { return 0; }
- S32 getFirstSuccessGeneration() const { return 0; }
- S32 getFirstRequiredGeneration() const { return 0; }
+ S32 getCurrentGeneration() const override { return 0; }
+ S32 getFirstSuccessGeneration() const override { return 0; }
+ S32 getFirstRequiredGeneration() const override { return 0; }
private:
std::string mEmpty;
};
@@ -297,9 +301,9 @@ public:
: base_t(new LLConversationSort(), new LLConversationFilter())
{}
- void sort(LLFolderViewFolder* folder);
- bool contentsReady() { return true; } // *TODO : we need to check that participants names are available somewhat
- bool startDrag(std::vector<LLFolderViewModelItem*>& items) { return false; } // We do not allow drag of conversation items
+ void sort(LLFolderViewFolder* folder) override;
+ bool contentsReady() override { return true; } // *TODO : we need to check that participants names are available somewhat
+ bool startDrag(std::vector<LLFolderViewModelItem*>& items) override { return false; } // We do not allow drag of conversation items
private:
};
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp
index 222bccb6b818b0b75612f2a6b2e47c07f552a31b..daaa8f952899305608e3231c56bb0451e0fb04b6 100644
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@@ -92,8 +92,8 @@ namespace Details
LLEventPollImpl::LLEventPollImpl(const LLHost &sender) :
mDone(false),
mHttpRequest(),
- mHttpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID),
mHttpOptions(),
+ mHttpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID),
mSenderIp(),
mCounter(sNextCounter++)
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index a9a7734cb2ee7059721a8c86426ac171e4eb499f..b0ee32e2b7fc520061018391e6e8087e414de03c 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -160,7 +160,7 @@ class LLFavoriteLandmarkButton : public LLButton
{
public:
- BOOL handleToolTip(S32 x, S32 y, MASK mask)
+ BOOL handleToolTip(S32 x, S32 y, MASK mask) override
{
std::string region_name = mLandmarkInfoGetter.getName();
@@ -179,8 +179,8 @@ public:
return TRUE;
}
- /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask)
- {
+ /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) override
+ {
LLFavoritesBarCtrl* fb = dynamic_cast<LLFavoritesBarCtrl*>(getParent());
if (fb)
@@ -194,7 +194,7 @@ public:
void setLandmarkID(const LLUUID& id){ mLandmarkInfoGetter.setLandmarkID(id); }
const LLUUID& getLandmarkId() const { return mLandmarkInfoGetter.getLandmarkId(); }
- void onMouseEnter(S32 x, S32 y, MASK mask)
+ void onMouseEnter(S32 x, S32 y, MASK mask) override
{
if (LLToolDragAndDrop::getInstance()->hasMouseCapture())
{
@@ -224,7 +224,7 @@ private:
class LLFavoriteLandmarkMenuItem : public LLMenuItemCallGL
{
public:
- BOOL handleToolTip(S32 x, S32 y, MASK mask)
+ BOOL handleToolTip(S32 x, S32 y, MASK mask) override
{
std::string region_name = mLandmarkInfoGetter.getName();
if (!region_name.empty())
@@ -239,21 +239,21 @@ public:
void setLandmarkID(const LLUUID& id){ mLandmarkInfoGetter.setLandmarkID(id); }
- virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask)
+ BOOL handleMouseDown(S32 x, S32 y, MASK mask) override
{
if (mMouseDownSignal)
(*mMouseDownSignal)(this, x, y, mask);
return LLMenuItemCallGL::handleMouseDown(x, y, mask);
}
- virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask)
+ BOOL handleMouseUp(S32 x, S32 y, MASK mask) override
{
if (mMouseUpSignal)
(*mMouseUpSignal)(this, x, y, mask);
return LLMenuItemCallGL::handleMouseUp(x, y, mask);
}
- virtual BOOL handleHover(S32 x, S32 y, MASK mask)
+ BOOL handleHover(S32 x, S32 y, MASK mask) override
{
if (fb)
{
@@ -285,11 +285,11 @@ private:
class LLFavoriteLandmarkToggleableMenu : public LLToggleableMenu
{
public:
- virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
- std::string& tooltip_msg)
+ std::string& tooltip_msg) override
{
*accept = ACCEPT_NO;
return TRUE;
@@ -314,7 +314,7 @@ class LLItemCopiedCallback : public LLInventoryCallback
public:
LLItemCopiedCallback(S32 sortField): mSortField(sortField) {}
- virtual void fire(const LLUUID& inv_item)
+ void fire(const LLUUID& inv_item) override
{
LLViewerInventoryItem* item = gInventory.getItem(inv_item);
@@ -374,16 +374,16 @@ LLFavoritesBarCtrl::Params::Params()
LLFavoritesBarCtrl::LLFavoritesBarCtrl(const LLFavoritesBarCtrl::Params& p)
: LLUICtrl(p),
- mFont(p.font.isProvided() ? p.font() : LLFontGL::getFontSansSerifSmall()),
mOverflowMenuHandle(),
mContextMenuHandle(),
+ mFont(p.font.isProvided() ? p.font() : LLFontGL::getFontSansSerifSmall()),
+ mUpdateDropDownItems(true),
+ mRestoreOverflowMenu(false),
mImageDragIndication(p.image_drag_indication),
mShowDragMarker(FALSE),
- mLandingTab(NULL),
- mLastTab(NULL),
- mTabsHighlightEnabled(TRUE)
- , mUpdateDropDownItems(true)
-, mRestoreOverflowMenu(false)
+ mLandingTab(NULL)
+ , mLastTab(NULL)
+, mTabsHighlightEnabled(TRUE)
{
// Register callback for menus with current registrar (will be parent panel's registrar)
LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Favorites.DoToSelected",
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 363b3429b0e3fb3c3df357992d49dd4780ff5e16..5abccdafbc41d226b12bf62ea1e416a56612a733 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -102,7 +102,7 @@ S32 LLFloaterLand::sLastTab = 0;
class LLParcelSelectionObserver : public LLParcelObserver
{
public:
- virtual void changed() { LLFloaterLand::refreshAll(); }
+ void changed() override { LLFloaterLand::refreshAll(); }
};
// class needed to get full access to textbox inside checkbox, because LLCheckBoxCtrl::setLabel() has string as its argument.
@@ -122,8 +122,8 @@ class LLPanelLandExperiences
{
public:
LLPanelLandExperiences(LLSafeHandle<LLParcelSelection>& parcelp);
- virtual BOOL postBuild();
- void refresh();
+ BOOL postBuild() override;
+ void refresh() override;
void experienceAdded(const LLUUID& id, U32 xp_type, U32 access_type);
void experienceRemoved(const LLUUID& id, U32 access_type);
@@ -1127,7 +1127,6 @@ void LLPanelLandGeneral::onClickStopSellLand()
LLPanelLandObjects::LLPanelLandObjects(LLParcelSelectionHandle& parcel)
: LLPanel(),
- mParcel(parcel),
mParcelObjectBonus(NULL),
mSWTotalObjects(NULL),
mObjectContribution(NULL),
@@ -1149,7 +1148,8 @@ LLPanelLandObjects::LLPanelLandObjects(LLParcelSelectionHandle& parcel)
mOwnerList(NULL),
mFirstReply(TRUE),
mSelectedCount(0),
- mSelectedIsGroup(FALSE)
+ mSelectedIsGroup(FALSE),
+ mParcel(parcel)
{
}
diff --git a/indra/newview/llfloaterlinkreplace.cpp b/indra/newview/llfloaterlinkreplace.cpp
index 43de761712651c6ee2d55409ee014323315c2477..2cfa3eb784f1dacea793dbf71b44e00541357611 100644
--- a/indra/newview/llfloaterlinkreplace.cpp
+++ b/indra/newview/llfloaterlinkreplace.cpp
@@ -40,9 +40,9 @@
LLFloaterLinkReplace::LLFloaterLinkReplace(const LLSD& key)
: LLFloater(key),
LLEventTimer(gSavedSettings.getF32("LinkReplaceBatchPauseTime")),
- mRemainingItems(0),
mSourceUUID(LLUUID::null),
mTargetUUID(LLUUID::null),
+ mRemainingItems(0),
mBatchSize(gSavedSettings.getU32("LinkReplaceBatchSize"))
{
mEventTimer.stop();
diff --git a/indra/newview/llfloaterlinkreplace.h b/indra/newview/llfloaterlinkreplace.h
index dd5c3012061fd89313b8b42afdf23182ff1b692e..e267541a5b9907e9be73bd3839e7619ff5dca3b8 100644
--- a/indra/newview/llfloaterlinkreplace.h
+++ b/indra/newview/llfloaterlinkreplace.h
@@ -56,17 +56,17 @@ public:
return mDADSignal.connect(cb);
}
- virtual BOOL postBuild()
+ BOOL postBuild() override
{
setEnabled(FALSE);
return LLLineEditor::postBuild();
}
- virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
- std::string& tooltip_msg);
+ std::string& tooltip_msg) override;
LLUUID getItemID() const { return mItemID; }
void setItem(LLInventoryItem* item);
@@ -86,10 +86,10 @@ public:
LLFloaterLinkReplace(const LLSD& key);
virtual ~LLFloaterLinkReplace();
- BOOL postBuild();
- virtual void onOpen(const LLSD& key);
+ BOOL postBuild() override;
+ void onOpen(const LLSD& key) override;
- virtual BOOL tick();
+ BOOL tick() override;
private:
void checkEnableStart();
diff --git a/indra/newview/llfloateroutfitphotopreview.cpp b/indra/newview/llfloateroutfitphotopreview.cpp
index 952f26d95ea2c9e99591ee542720a0e64fb140d6..1b14a7b52517833cc027acfc6185744d4f2a1458 100644
--- a/indra/newview/llfloateroutfitphotopreview.cpp
+++ b/indra/newview/llfloateroutfitphotopreview.cpp
@@ -62,10 +62,10 @@ const S32 CLIENT_RECT_VPAD = 4;
LLFloaterOutfitPhotoPreview::LLFloaterOutfitPhotoPreview(const LLSD& key)
: LLPreview(key),
- mUpdateDimensions(TRUE),
- mImage(NULL),
mOutfitID(LLUUID()),
+ mImage(NULL),
mImageOldBoostLevel(LLGLTexture::BOOST_NONE),
+ mUpdateDimensions(TRUE),
mExceedLimits(FALSE)
{
updateImageID();
diff --git a/indra/newview/llfloaterpreviewtrash.h b/indra/newview/llfloaterpreviewtrash.h
index 465c0c677fc6db4089171e2ea55110265c295052..61634d904cf748d4e8568017676fd74de882c338 100644
--- a/indra/newview/llfloaterpreviewtrash.h
+++ b/indra/newview/llfloaterpreviewtrash.h
@@ -39,7 +39,7 @@ public:
LLFloaterPreviewTrash(const LLSD& key);
~LLFloaterPreviewTrash();
- /*virtual*/ BOOL postBuild();
+ /*virtual*/ BOOL postBuild() override;
protected:
void onClickEmpty();
diff --git a/indra/newview/llfloaterregiondebugconsole.cpp b/indra/newview/llfloaterregiondebugconsole.cpp
index 9eaaaad397eafaec6f653ae16f39842032670019..3fe054cac0b73bacd8331c4afe8c0375201072ec 100644
--- a/indra/newview/llfloaterregiondebugconsole.cpp
+++ b/indra/newview/llfloaterregiondebugconsole.cpp
@@ -79,7 +79,7 @@ namespace
void post(
LLHTTPNode::ResponsePtr reponse,
const LLSD& context,
- const LLSD& input) const
+ const LLSD& input) const override
{
LL_INFOS() << "Received response from the debug console: "
<< input << LL_ENDL;
diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp
index 9d2e4102da70ceb0e2bdfbb43055762ddf4949ec..8fd1cc032c8da0f34537bb70495a3c4ca2e86e0d 100644
--- a/indra/newview/llinspectobject.cpp
+++ b/indra/newview/llinspectobject.cpp
@@ -224,7 +224,7 @@ void LLInspectObject::onOpen(const LLSD& data)
// Mark this as a transient selection
struct SetTransient : public LLSelectedNodeFunctor
{
- bool apply(LLSelectNode* node)
+ bool apply(LLSelectNode* node) override
{
node->setTransient(TRUE);
return true;
diff --git a/indra/newview/llinspectremoteobject.cpp b/indra/newview/llinspectremoteobject.cpp
index 9143a9bd881532cead9dc8803354bcae1fe0aa78..096d9708abf0b516b49e5ed483b5948179dd89e1 100644
--- a/indra/newview/llinspectremoteobject.cpp
+++ b/indra/newview/llinspectremoteobject.cpp
@@ -54,8 +54,8 @@ public:
LLInspectRemoteObject(const LLSD& object_id);
virtual ~LLInspectRemoteObject() {};
- /*virtual*/ BOOL postBuild(void);
- /*virtual*/ void onOpen(const LLSD& avatar_id);
+ /*virtual*/ BOOL postBuild(void) override;
+ /*virtual*/ void onOpen(const LLSD& avatar_id) override;
void onClickMap();
void onClickBlock();
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index e5c99a92e4e66c55d2fda6e06cec6b7ede312b54..7f0f4f60e20edf8de077092a88777908eae96f9c 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -143,7 +143,8 @@ public:
LLRightClickInventoryFetchDescendentsObserver(const uuid_vec_t& ids) : LLInventoryFetchDescendentsObserver(ids) {}
~LLRightClickInventoryFetchDescendentsObserver() {}
virtual void execute(bool clear_observer = false);
- virtual void done()
+
+ void done() override
{
execute(true);
}
@@ -165,7 +166,8 @@ public:
// we've downloaded all the items, so repaint the dialog
LLFolderBridge::staticFolderOptionsMenu();
}
- virtual void done()
+
+ void done() override
{
execute(true);
}
@@ -178,11 +180,11 @@ public:
LLInvFVBridge::LLInvFVBridge(LLInventoryPanel* inventory,
LLFolderView* root,
const LLUUID& uuid) :
- mUUID(uuid),
+ LLFolderViewModelItemInventory(inventory->getRootViewModel()),
mRoot(root),
+ mUUID(uuid),
mInvType(LLInventoryType::IT_NONE),
- mIsLink(FALSE),
- LLFolderViewModelItemInventory(inventory->getRootViewModel())
+ mIsLink(FALSE)
{
mInventoryPanel = inventory->getInventoryPanelHandle();
const LLInventoryObject* obj = getInventoryObject();
@@ -2237,11 +2239,13 @@ class LLIsItemRemovable : public LLFolderViewFunctor
{
public:
LLIsItemRemovable() : mPassed(TRUE) {}
- virtual void doFolder(LLFolderViewFolder* folder)
+
+ void doFolder(LLFolderViewFolder* folder) override
{
mPassed &= folder->getViewModelItem()->isItemRemovable();
}
- virtual void doItem(LLFolderViewItem* item)
+
+ void doItem(LLFolderViewItem* item) override
{
mPassed &= item->getViewModelItem()->isItemRemovable();
}
@@ -3061,7 +3065,7 @@ public:
LLInventoryCopyAndWearObserver(const LLUUID& cat_id, int count, bool folder_added=false, bool replace=false) :
mCatID(cat_id), mContentsCount(count), mFolderAdded(folder_added), mReplace(replace){}
virtual ~LLInventoryCopyAndWearObserver() {}
- virtual void changed(U32 mask);
+ void changed(U32 mask) override;
protected:
LLUUID mCatID;
@@ -5530,7 +5534,8 @@ class LLCallingCardObserver : public LLFriendObserver
public:
LLCallingCardObserver(LLCallingCardBridge* bridge) : mBridgep(bridge) {}
virtual ~LLCallingCardObserver() { mBridgep = NULL; }
- virtual void changed(U32 mask)
+
+ void changed(U32 mask) override
{
mBridgep->refreshFolderViewItem();
if (mask & LLFriendObserver::ONLINE)
@@ -7003,7 +7008,7 @@ class LLTextureBridgeAction: public LLInvFVBridgeAction
{
friend class LLInvFVBridgeAction;
public:
- virtual void doIt()
+ void doIt() override
{
if (getItem())
{
@@ -7020,7 +7025,7 @@ class LLSoundBridgeAction: public LLInvFVBridgeAction
{
friend class LLInvFVBridgeAction;
public:
- virtual void doIt()
+ void doIt() override
{
LLViewerInventoryItem* item = getItem();
if (item)
@@ -7038,7 +7043,7 @@ class LLLandmarkBridgeAction: public LLInvFVBridgeAction
{
friend class LLInvFVBridgeAction;
public:
- virtual void doIt()
+ void doIt() override
{
LLViewerInventoryItem* item = getItem();
if (item)
@@ -7064,7 +7069,7 @@ class LLCallingCardBridgeAction: public LLInvFVBridgeAction
{
friend class LLInvFVBridgeAction;
public:
- virtual void doIt()
+ void doIt() override
{
LLViewerInventoryItem* item = getItem();
if (item && item->getCreatorUUID().notNull())
@@ -7084,7 +7089,7 @@ class LLNotecardBridgeAction
{
friend class LLInvFVBridgeAction;
public:
- virtual void doIt()
+ void doIt() override
{
LLViewerInventoryItem* item = getItem();
if (item)
@@ -7102,7 +7107,7 @@ class LLGestureBridgeAction: public LLInvFVBridgeAction
{
friend class LLInvFVBridgeAction;
public:
- virtual void doIt()
+ void doIt() override
{
LLViewerInventoryItem* item = getItem();
if (item)
@@ -7121,7 +7126,7 @@ class LLAnimationBridgeAction: public LLInvFVBridgeAction
{
friend class LLInvFVBridgeAction;
public:
- virtual void doIt()
+ void doIt() override
{
LLViewerInventoryItem* item = getItem();
if (item)
@@ -7139,7 +7144,7 @@ class LLObjectBridgeAction: public LLInvFVBridgeAction
{
friend class LLInvFVBridgeAction;
public:
- virtual void doIt()
+ void doIt() override
{
/*
LLFloaterReg::showInstance("properties", mUUID);
@@ -7155,7 +7160,7 @@ class LLLSLTextBridgeAction: public LLInvFVBridgeAction
{
friend class LLInvFVBridgeAction;
public:
- virtual void doIt()
+ void doIt() override
{
LLViewerInventoryItem* item = getItem();
if (item)
@@ -7173,7 +7178,7 @@ class LLWearableBridgeAction: public LLInvFVBridgeAction
{
friend class LLInvFVBridgeAction;
public:
- virtual void doIt()
+ void doIt() override
{
wearOnAvatar();
}
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index e4babb99faff88606098f1d7c30ec8a87dc2e7bf..ca112b1bee1a2f4ad3fe2202150315d97d4e71e0 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -78,9 +78,9 @@ LLInventoryFilter::LLInventoryFilter(const Params& p)
mCurrentGeneration(0),
mFirstRequiredGeneration(0),
mFirstSuccessGeneration(0),
+ mEmptyLookupMessage("InventoryNoMatchingItems"),
mSearchType(SEARCHTYPE_NAME),
- mFilterCreatorType(FILTERCREATOR_ALL),
- mEmptyLookupMessage("InventoryNoMatchingItems")
+ mFilterCreatorType(FILTERCREATOR_ALL)
{
// copy mFilterOps into mDefaultFilterOps
markDefault();
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 2c2c4085ef3d98d1a2440a209913b1a2ef420a79..b713c3c1261e047e7d841c8bad232864a771390a 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -439,7 +439,7 @@ void copy_inventory_category(LLInventoryModel* model,
class LLInventoryCollectAllItems : public LLInventoryCollectFunctor
{
public:
- virtual bool operator()(LLInventoryCategory* cat, LLInventoryItem* item)
+ bool operator()(LLInventoryCategory* cat, LLInventoryItem* item) override
{
return true;
}
@@ -1925,8 +1925,8 @@ bool LLFindWearables::operator()(LLInventoryCategory* cat,
}
LLFindWearablesEx::LLFindWearablesEx(bool is_worn, bool include_body_parts)
-: mIsWorn(is_worn)
-, mIncludeBodyParts(include_body_parts)
+: mIncludeBodyParts(include_body_parts)
+, mIsWorn(is_worn)
{}
bool LLFindWearablesEx::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 9a3ac8ab23938907a0a88e0c6402e39e18c6267b..88969923cd78cd4b07d27e4a03c5eeb42e871989 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -139,7 +139,6 @@ LLInventoryModel gInventory;
// Default constructor
LLInventoryModel::LLInventoryModel()
: // These are now ordered, keep them that way.
- mBacklinkMMap(),
mIsAgentInvUsable(false),
mRootFolderID(),
mLibraryRootFolderID(),
@@ -148,6 +147,7 @@ LLInventoryModel::LLInventoryModel()
mItemMap(),
mParentChildCategoryTree(),
mParentChildItemTree(),
+ mBacklinkMMap(),
mLastItem(nullptr),
mIsNotifyObservers(FALSE),
mModifyMask(LLInventoryObserver::ALL),
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index cc764b1152946f48185e89192af54beafd27b4da..f659a22b932191a2ab48d626b58d2f083b8cb64b 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -112,8 +112,8 @@ public:
LLAddLandmarkObserver(LLLocationInputCtrl* input) : mInput(input) {}
private:
- /*virtual*/ void done()
- {
+ /*virtual*/ void done() override
+ {
const uuid_set_t& added = gInventory.getAddedIDs();
for (uuid_set_t::const_iterator it = added.begin(); it != added.end(); ++it)
{
@@ -145,8 +145,8 @@ public:
LLRemoveLandmarkObserver(LLLocationInputCtrl* input) : mInput(input) {}
private:
- /*virtual*/ void changed(U32 mask)
- {
+ /*virtual*/ void changed(U32 mask) override
+ {
if (mask & (~(LLInventoryObserver::LABEL|
LLInventoryObserver::INTERNAL|
LLInventoryObserver::ADD|
@@ -166,8 +166,8 @@ public:
LLParcelChangeObserver(LLLocationInputCtrl* input) : mInput(input) {}
private:
- /*virtual*/ void changed()
- {
+ /*virtual*/ void changed() override
+ {
if (mInput)
{
mInput->refreshParcelIcons();
@@ -190,35 +190,35 @@ LLLocationInputCtrl::Params::Params()
add_landmark_image_disabled("add_landmark_image_disabled"),
add_landmark_image_hover("add_landmark_image_hover"),
add_landmark_image_selected("add_landmark_image_selected"),
- add_landmark_hpad("add_landmark_hpad", 0),
+ maturity_help_topic("maturity_help_topic"),
icon_hpad("icon_hpad", 0),
+ add_landmark_hpad("add_landmark_hpad", 0),
+ maturity_button("maturity_button"),
add_landmark_button("add_landmark_button"),
for_sale_button("for_sale_button"),
info_button("info_button"),
- maturity_button("maturity_button"),
voice_icon("voice_icon"),
fly_icon("fly_icon"),
push_icon("push_icon"),
build_icon("build_icon"),
scripts_icon("scripts_icon"),
damage_icon("damage_icon"),
- damage_text("damage_text"),
see_avatars_icon("see_avatars_icon"),
- maturity_help_topic("maturity_help_topic"),
pathfinding_dirty_icon("pathfinding_dirty_icon"),
pathfinding_disabled_icon("pathfinding_disabled_icon"),
- lightshare_icon("lightshare_icon")
+ lightshare_icon("lightshare_icon"),
+ damage_text("damage_text")
{
}
LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
: LLComboBox(p),
- mIconHPad(p.icon_hpad),
- mAddLandmarkHPad(p.add_landmark_hpad),
mLocationContextMenu(NULL),
mAddLandmarkBtn(NULL),
mForSaleBtn(NULL),
mInfoBtn(NULL),
+ mIconHPad(p.icon_hpad),
+ mAddLandmarkHPad(p.add_landmark_hpad),
mRegionCrossingSlot(),
mLightshareChangedSlot(),
mNavMeshSlot(),
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index ca1898d22fe39b2c46e406ba6d43778494ac684b..dc3ff6e708c0e7ee3287dc1b5e111662d46ce5e7 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -2293,7 +2293,7 @@ BOOL LLManipTranslate::canAffectSelection()
{
struct f : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* objectp)
+ bool apply(LLViewerObject* objectp) override
{
LLViewerObject *root_object = (objectp == NULL) ? NULL : objectp->getRootEdit();
return objectp->permMove() && !objectp->isPermanentEnforced() &&
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp
index 6038d17a22d1b58bc60dd2690da68eb28c10415b..3db1fc12ad5556392302ee016f814c6a6f21e232 100644
--- a/indra/newview/llmaterialmgr.cpp
+++ b/indra/newview/llmaterialmgr.cpp
@@ -77,8 +77,8 @@ public:
virtual ~LLMaterialHttpHandler();
protected:
- virtual void onSuccess(LLCore::HttpResponse * response, const LLSD &content);
- virtual void onFailure(LLCore::HttpResponse * response, LLCore::HttpStatus status);
+ void onSuccess(LLCore::HttpResponse * response, const LLSD &content) override;
+ void onFailure(LLCore::HttpResponse * response, LLCore::HttpStatus status) override;
private:
std::string mMethod;
@@ -140,9 +140,9 @@ LLMaterialMgr::LLMaterialMgr():
{
LLAppCoreHttp & app_core_http(LLAppViewer::instance()->getAppCoreHttp());
- mHttpRequest = LLCore::HttpRequest::ptr_t(new LLCore::HttpRequest());
- mHttpHeaders = LLCore::HttpHeaders::ptr_t(new LLCore::HttpHeaders());
- mHttpOptions = LLCore::HttpOptions::ptr_t(new LLCore::HttpOptions());
+ mHttpRequest = boost::make_shared<LLCore::HttpRequest>();
+ mHttpHeaders = boost::make_shared<LLCore::HttpHeaders>();
+ mHttpOptions = boost::make_shared<LLCore::HttpOptions>();
mHttpPolicy = app_core_http.getPolicy(LLAppCoreHttp::AP_MATERIALS);
mMaterials.insert(std::pair<LLMaterialID, LLMaterialPtr>(LLMaterialID::null, LLMaterialPtr(NULL)));
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index f5712d95ac6abbc742c3a1c8fb9f9e2cdbb93882..a883e3eca186c0d931e7650e17da7bd5c9aca44b 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -809,8 +809,8 @@ LLMeshRepoThread::LLMeshRepoThread()
mHttpPolicyClass(LLCore::HttpRequest::DEFAULT_POLICY_ID),
mHttpLegacyPolicyClass(LLCore::HttpRequest::DEFAULT_POLICY_ID),
mHttpLargePolicyClass(LLCore::HttpRequest::DEFAULT_POLICY_ID),
- mLegacyGetMeshVersion(0),
- mHttpPriority(0)
+ mHttpPriority(0),
+ mLegacyGetMeshVersion(0)
{
LLAppCoreHttp & app_core_http(LLAppViewer::instance()->getAppCoreHttp());
@@ -3272,9 +3272,9 @@ void LLMeshPhysicsShapeHandler::processData(LLCore::BufferArray * /* body */, S3
LLMeshRepository::LLMeshRepository()
: mMeshMutex(nullptr),
mMeshThreadCount(0),
- mLegacyGetMeshVersion(0),
mThread(nullptr),
- mDecompThread(nullptr)
+ mDecompThread(nullptr),
+ mLegacyGetMeshVersion(0)
{
}
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index c07f4b656bbb5ceeb1661e7ab80151ddc240596e..c72da078cfedb7fddc1ec1b92401595a4757b892 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -84,6 +84,8 @@ const F64 COARSEUPDATE_MAX_Z = 1020.0;
LLNetMap::LLNetMap (const Params & p)
: LLUICtrl (p),
mUpdateNow(false),
+ mUpdateObjectImage(false),
+ mUpdateParcelImage(false),
mBackgroundColor (p.bg_color()),
mScale( MAP_SCALE_MID ),
mPixelsPerMeter( MAP_SCALE_MID / REGION_WIDTH_METERS ),
@@ -94,8 +96,6 @@ LLNetMap::LLNetMap (const Params & p)
mCurPan(0.f, 0.f),
mStartPan(0.f, 0.f),
mMouseDown(0, 0),
- mUpdateObjectImage(false),
- mUpdateParcelImage(false),
mObjectImageCenterGlobal( gAgentCamera.getCameraPositionGlobal() ),
mObjectRawImagep(),
mObjectImagep(),
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index d567570e30c4274ab5a2d3cb92e7a03db4d7de85..fe170012ffc96d18db9cec10d518481809239416 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -62,16 +62,15 @@ static LLPanelInjector<LLOutfitGallery> t_outfit_gallery("outfit_gallery");
LLOutfitGallery::LLOutfitGallery(const LLOutfitGallery::Params& p)
: LLOutfitListBase(),
- mTexturesObserver(NULL),
- mOutfitsObserver(NULL),
mScrollPanel(NULL),
mGalleryPanel(NULL),
- mGalleryCreated(false),
- mRowCount(0),
- mItemsAddedCount(0),
mOutfitLinkPending(NULL),
mOutfitRenamePending(NULL),
mSnapshotFolderID(NULL),
+ mGalleryCreated(false),
+ mRowCount(0),
+ mItemsAddedCount(0),
+ mTextureSelected(NULL),
mRowPanelHeight(p.row_panel_height),
mVerticalGap(p.vertical_gap),
mHorizontalGap(p.horizontal_gap),
@@ -81,21 +80,22 @@ LLOutfitGallery::LLOutfitGallery(const LLOutfitGallery::Params& p)
mItemsInRow(p.items_in_row),
mRowPanWidthFactor(p.row_panel_width_factor),
mGalleryWidthFactor(p.gallery_width_factor),
- mTextureSelected(NULL)
+ mTexturesObserver(NULL),
+ mOutfitsObserver(NULL)
{
updateGalleryWidth();
}
LLOutfitGallery::Params::Params()
: row_panel_height("row_panel_height", 180),
+ row_panel_width_factor("row_panel_width_factor", 166),
+ gallery_width_factor("gallery_width_factor", 163),
vertical_gap("vertical_gap", 10),
horizontal_gap("horizontal_gap", 10),
item_width("item_width", 150),
item_height("item_height", 175),
item_horizontal_gap("item_horizontal_gap", 16),
- items_in_row("items_in_row", 3),
- row_panel_width_factor("row_panel_width_factor", 166),
- gallery_width_factor("gallery_width_factor", 163)
+ items_in_row("items_in_row", 3)
{
addSynonym(row_panel_height, "row_height");
}
@@ -655,12 +655,12 @@ static LLDefaultChildRegistry::Register<LLOutfitGalleryItem> r("outfit_gallery_i
LLOutfitGalleryItem::LLOutfitGalleryItem(const Params& p)
: LLPanel(p),
mTexturep(NULL),
- mIconPreviewOutfit(nullptr),
+ mUUID(LLUUID()),
+ mIconPreviewOutfit(nullptr),
mSelected(false),
mWorn(false),
mDefaultImage(true),
- mOutfitName(""),
- mUUID(LLUUID())
+ mOutfitName("")
{
buildFromFile("panel_outfit_gallery_item.xml");
}
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index 41ce0f0db9c9bde4b0026719c622e1896ead5df0..15c3104c0e1c9feacd5d364b0c6a8c668c4d5d3f 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -94,11 +94,11 @@ public:
class LLPanelFace : public LLPanel
{
public:
- virtual BOOL postBuild();
+ BOOL postBuild() override;
LLPanelFace();
virtual ~LLPanelFace();
- void refresh();
+ void refresh() override;
LLMaterialPtr createDefaultMaterial(LLMaterialPtr current_material)
{
@@ -229,9 +229,10 @@ private:
LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc > edit(data);
struct LLSelectedTEEditMaterial : public LLSelectedTEMaterialFunctor
{
- LLSelectedTEEditMaterial(LLPanelFace* panel, LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc >* editp) : _panel(panel), _edit(editp) {}
+ LLSelectedTEEditMaterial(LLPanelFace* panel, LLMaterialEditFunctor< DataType, SetValueType, MaterialEditFunc >* editp) : _edit(editp), _panel(panel) {}
virtual ~LLSelectedTEEditMaterial() {};
- virtual LLMaterialPtr apply(LLViewerObject* object, S32 face, LLTextureEntry* tep, LLMaterialPtr& current_material)
+
+ LLMaterialPtr apply(LLViewerObject* object, S32 face, LLTextureEntry* tep, LLMaterialPtr& current_material) override
{
if (_edit)
{
@@ -314,7 +315,7 @@ private:
GetTEMaterialVal(DataType default_value) : _default(default_value) {}
virtual ~GetTEMaterialVal() {}
- DataType get(LLViewerObject* object, S32 face)
+ DataType get(LLViewerObject* object, S32 face) override
{
DataType ret = _default;
LLMaterialPtr material_ptr;
@@ -347,7 +348,8 @@ private:
GetTEVal(DataType default_value) : _default(default_value) {}
virtual ~GetTEVal() {}
- DataType get(LLViewerObject* object, S32 face) {
+ DataType get(LLViewerObject* object, S32 face) override
+ {
LLTextureEntry* tep = object ? object->getTE(face) : NULL;
return tep ? ((tep->*(TEGetFunc))()) : _default;
}
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index f1cf5e56191b7767666548b09adbffc244b553d6..843c90d6472c988048d93cce5ef9297dd47ea6d1 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -95,11 +95,11 @@ public:
//
// LLView functionality
- virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
- std::string& tooltip_msg);
+ std::string& tooltip_msg) override;
void setPanel (LLPanelGroupNotices* panel) {mGroupNoticesPanel = panel;};
void setGroup (LLUUID group) {mGroupID = group;};
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 2263848c92377b6cda5b40d460a9ffd43913f0cf..e555110bed932342aa47a0ca1c1b43cabe403cc1 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -429,9 +429,9 @@ void LLPanelGroupRoles::setGroupID(const LLUUID& id)
LLPanelGroupSubTab::LLPanelGroupSubTab()
: LLPanelGroupTab(),
mFooter(NULL),
+ mSearchEditor(NULL),
mActivated(false),
- mHasGroupBanPower(false),
- mSearchEditor(NULL)
+ mHasGroupBanPower(false)
{
}
@@ -1938,6 +1938,7 @@ static LLPanelInjector<LLPanelGroupRolesSubTab> t_panel_group_roles_subtab("pane
LLPanelGroupRolesSubTab::LLPanelGroupRolesSubTab()
: LLPanelGroupSubTab(),
+ mFirstOpen(TRUE),
mRolesList(NULL),
mAssignedMembersList(NULL),
mAllowedActionsList(NULL),
@@ -1947,7 +1948,6 @@ LLPanelGroupRolesSubTab::LLPanelGroupRolesSubTab()
mMemberVisibleCheck(NULL),
mDeleteRoleButton(NULL),
mCreateRoleButton(NULL),
- mFirstOpen(TRUE),
mHasRoleChange(FALSE)
{
}
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index b83847082389fe9af74c55643854e52a9490a70b..29f8613bc4a462eda397bad3f8f75e4b98688276 100644
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -63,14 +63,14 @@
LLPreview::LLPreview(const LLSD& key)
: LLFloater(key),
mDirty(TRUE),
- mItemUUID(key.has("itemid") ? key.get("itemid").asUUID() : key.asUUID()), // set later by setObjectID()
+ mSaveDialogShown(FALSE), // set later by setObjectID()
+ mItemUUID(key.has("itemid") ? key.get("itemid").asUUID() : key.asUUID()),
mObjectUUID(),
mCopyToInvBtn(nullptr ),
mForceClose(FALSE),
mUserResized(FALSE),
mCloseAfterSave(FALSE),
- mAssetStatus(PREVIEW_ASSET_UNLOADED),
- mSaveDialogShown(FALSE)
+ mAssetStatus(PREVIEW_ASSET_UNLOADED)
{
mAuxItem = new LLInventoryItem;
// don't necessarily steal focus on creation -- sometimes these guys pop up without user action
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp
index 828568d681c3278806447de1c6f0b1e4593b3e0c..e6225addeef32bbbbc0e6bbadace6eeba20e1e26 100644
--- a/indra/newview/llpreviewgesture.cpp
+++ b/indra/newview/llpreviewgesture.cpp
@@ -69,7 +69,7 @@ public:
LLInventoryGestureAvailable() {}
protected:
- virtual void done();
+ void done() override;
};
void LLInventoryGestureAvailable::done()
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 11d1dfbeadfd8d6aaae076289e2b7bf761ce4b3b..2b6b585803db26d88b0370a3e786226732c0fc41 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -131,16 +131,16 @@ public:
void ignoreNextUpdate() { mIgnoreNextUpdate = true; }
protected:
- /*virtual*/ bool loadFile();
+ /*virtual*/ bool loadFile() override;
change_callback_t mOnChangeCallback;
bool mIgnoreNextUpdate;
};
LLLiveLSLFile::LLLiveLSLFile(std::string file_path, change_callback_t change_cb)
-: mOnChangeCallback(change_cb)
+: LLLiveFile(file_path, 1.0)
+, mOnChangeCallback(change_cb)
, mIgnoreNextUpdate(false)
-, LLLiveFile(file_path, 1.0)
{
llassert(mOnChangeCallback);
}
@@ -367,6 +367,7 @@ LLScriptEdCore::LLScriptEdCore(
S32 bottom_pad)
:
LLPanel(),
+ mLive(live),
mSampleText(sample),
mEditor( NULL ),
mLoadCallback( load_callback ),
@@ -377,12 +378,11 @@ LLScriptEdCore::LLScriptEdCore(
mLastHelpToken(NULL),
mLiveHelpHistorySize(0),
mEnableSave(FALSE),
- mLiveFile(NULL),
- mLive(live),
- mContainer(container),
mHasScriptData(FALSE),
+ mLiveFile(NULL),
mScriptRemoved(FALSE),
- mSaveDialogShown(FALSE)
+ mSaveDialogShown(FALSE),
+ mContainer(container)
{
setFollows(FOLLOWS_ALL);
setBorderVisible(FALSE);
@@ -1837,13 +1837,13 @@ void* LLLiveLSLEditor::createScriptEdPanel(void* userdata)
LLLiveLSLEditor::LLLiveLSLEditor(const LLSD& key) :
LLScriptEdContainer(key),
+ mIsNew(false),
mAskedForRunningInfo(FALSE),
mHaveRunningInfo(FALSE),
mCloseAfterSave(FALSE),
mPendingUploads(0),
- mIsModifiable(FALSE),
- mIsNew(false),
- mIsSaving(FALSE)
+ mIsSaving(FALSE),
+ mIsModifiable(FALSE)
{
mFactoryMap["script ed panel"] = LLCallbackMap(LLLiveLSLEditor::createScriptEdPanel, this);
}
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index da64d33f0b371d2169aefd2cf84e9a5d8b16fd65..8e2fb26cb99e43dda157a69691bf0c83978080a7 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -68,18 +68,18 @@ const F32 PREVIEW_TEXTURE_MIN_ASPECT = 0.005f;
LLPreviewTexture::LLPreviewTexture(const LLSD& key)
: LLPreview(key),
+ mImage(NULL),
+ mImageOldBoostLevel(LLGLTexture::BOOST_NONE),
mLoadingFullImage( FALSE ),
mShowKeepDiscard(FALSE),
mCopyToInv(FALSE),
+ mPreviewToSave(FALSE),
mIsCopyable(FALSE),
mIsFullPerm(FALSE),
mUpdateDimensions(TRUE),
mLastHeight(0),
mLastWidth(0),
- mAspectRatio(0.f),
- mPreviewToSave(FALSE),
- mImage(NULL),
- mImageOldBoostLevel(LLGLTexture::BOOST_NONE)
+ mAspectRatio(0.f)
{
updateImageID();
if (key.has("save_as"))
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 61eb159ae24097468c0f8db14b1ef29ecdcff9b9..3cc8b5a610641c30e0e018393fe2b6edf76f1661 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -241,7 +241,7 @@ void LLSelectMgr::updateEffects()
//keep reference grid objects active
struct f : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* object)
+ bool apply(LLViewerObject* object) override
{
LLDrawable* drawable = object->mDrawable;
if (drawable)
@@ -265,7 +265,7 @@ void LLSelectMgr::overrideObjectUpdates()
//override any position updates from simulator on objects being edited
struct f : public LLSelectedNodeFunctor
{
- virtual bool apply(LLSelectNode* selectNode)
+ bool apply(LLSelectNode* selectNode) override
{
LLViewerObject* object = selectNode->getObject();
if (object && object->permMove() && !object->isPermanentEnforced())
@@ -641,7 +641,7 @@ bool LLSelectMgr::enableLinkObjects()
{
struct f : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* object)
+ bool apply(LLViewerObject* object) override
{
LLViewerObject *root_object = (object == NULL) ? NULL : object->getRootEdit();
return object->permModify() && !object->isPermanentEnforced() &&
@@ -1524,7 +1524,7 @@ void LLSelectMgr::cleanup()
struct LLSelectMgrSendFunctor : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* object)
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -1599,7 +1599,7 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
LLViewerInventoryItem* mItem;
LLUUID mImageID;
f(LLViewerInventoryItem* item, const LLUUID& id) : mItem(item), mImageID(id) {}
- bool apply(LLViewerObject* objectp, S32 te)
+ bool apply(LLViewerObject* objectp, S32 te) override
{
if(objectp && !objectp->permModify())
{
@@ -1649,7 +1649,8 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
{
LLViewerInventoryItem* mItem;
g(LLViewerInventoryItem* item) : mItem(item) {}
- virtual bool apply(LLViewerObject* object)
+
+ bool apply(LLViewerObject* object) override
{
if (!mItem)
{
@@ -1679,7 +1680,7 @@ void LLSelectMgr::selectionSetColor(const LLColor4 &color)
{
LLColor4 mColor;
f(const LLColor4& c) : mColor(c) {}
- bool apply(LLViewerObject* object, S32 te)
+ bool apply(LLViewerObject* object, S32 te) override
{
if (object->permModify())
{
@@ -1703,7 +1704,7 @@ void LLSelectMgr::selectionSetColorOnly(const LLColor4 &color)
{
LLColor4 mColor;
f(const LLColor4& c) : mColor(c) {}
- bool apply(LLViewerObject* object, S32 te)
+ bool apply(LLViewerObject* object, S32 te) override
{
if (object->permModify())
{
@@ -1730,7 +1731,7 @@ void LLSelectMgr::selectionSetAlphaOnly(const F32 alpha)
{
F32 mAlpha;
f(const F32& a) : mAlpha(a) {}
- bool apply(LLViewerObject* object, S32 te)
+ bool apply(LLViewerObject* object, S32 te) override
{
if (object->permModify())
{
@@ -1754,7 +1755,7 @@ void LLSelectMgr::selectionRevertColors()
{
LLObjectSelectionHandle mSelectedObjects;
f(LLObjectSelectionHandle sel) : mSelectedObjects(sel) {}
- bool apply(LLViewerObject* object, S32 te)
+ bool apply(LLViewerObject* object, S32 te) override
{
if (object->permModify())
{
@@ -1781,7 +1782,7 @@ void LLSelectMgr::selectionRevertShinyColors()
{
LLObjectSelectionHandle mSelectedObjects;
f(LLObjectSelectionHandle sel) : mSelectedObjects(sel) {}
- bool apply(LLViewerObject* object, S32 te)
+ bool apply(LLViewerObject* object, S32 te) override
{
if (object->permModify())
{
@@ -1815,7 +1816,7 @@ BOOL LLSelectMgr::selectionRevertTextures()
{
LLObjectSelectionHandle mSelectedObjects;
f(LLObjectSelectionHandle sel) : mSelectedObjects(sel) {}
- bool apply(LLViewerObject* object, S32 te)
+ bool apply(LLViewerObject* object, S32 te) override
{
if (object->permModify())
{
@@ -1852,7 +1853,7 @@ void LLSelectMgr::selectionSetBumpmap(U8 bumpmap)
{
U8 mBump;
f(const U8& b) : mBump(b) {}
- bool apply(LLViewerObject* object, S32 te)
+ bool apply(LLViewerObject* object, S32 te) override
{
if (object->permModify())
{
@@ -1874,7 +1875,7 @@ void LLSelectMgr::selectionSetTexGen(U8 texgen)
{
U8 mTexgen;
f(const U8& t) : mTexgen(t) {}
- bool apply(LLViewerObject* object, S32 te)
+ bool apply(LLViewerObject* object, S32 te) override
{
if (object->permModify())
{
@@ -1897,7 +1898,7 @@ void LLSelectMgr::selectionSetShiny(U8 shiny)
{
U8 mShiny;
f(const U8& t) : mShiny(t) {}
- bool apply(LLViewerObject* object, S32 te)
+ bool apply(LLViewerObject* object, S32 te) override
{
if (object->permModify())
{
@@ -1919,7 +1920,7 @@ void LLSelectMgr::selectionSetFullbright(U8 fullbright)
{
U8 mFullbright;
f(const U8& t) : mFullbright(t) {}
- bool apply(LLViewerObject* object, S32 te)
+ bool apply(LLViewerObject* object, S32 te) override
{
if (object->permModify())
{
@@ -1935,7 +1936,8 @@ void LLSelectMgr::selectionSetFullbright(U8 fullbright)
{
U8 mFullbright;
g(const U8& t) : mFullbright(t) {}
- virtual bool apply(LLViewerObject* object)
+
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -1968,7 +1970,7 @@ void LLSelectMgr::selectionSetMedia(U8 media_type, const LLSD &media_data)
U8 mMediaFlags;
const LLSD &mMediaData;
f(const U8& t, const LLSD& d) : mMediaFlags(t), mMediaData(d) {}
- bool apply(LLViewerObject* object, S32 te)
+ bool apply(LLViewerObject* object, S32 te) override
{
if (object->permModify())
{
@@ -2012,7 +2014,7 @@ void LLSelectMgr::selectionSetMedia(U8 media_type, const LLSD &media_data)
struct f2 : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* object)
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -2040,7 +2042,7 @@ void LLSelectMgr::selectionSetGlow(F32 glow)
{
F32 mGlow;
f1(F32 glow) : mGlow(glow) {};
- bool apply(LLViewerObject* object, S32 face)
+ bool apply(LLViewerObject* object, S32 face) override
{
if (object->permModify())
{
@@ -2054,7 +2056,7 @@ void LLSelectMgr::selectionSetGlow(F32 glow)
struct f2 : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* object)
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -2073,7 +2075,7 @@ void LLSelectMgr::selectionSetMaterialParams(LLSelectedTEMaterialFunctor* materi
LLMaterialPtr mMaterial;
f1(LLSelectedTEMaterialFunctor* material_func) : _material_func(material_func) {}
- bool apply(LLViewerObject* object, S32 face)
+ bool apply(LLViewerObject* object, S32 face) override
{
if (object && object->permModify() && _material_func)
{
@@ -2093,7 +2095,7 @@ void LLSelectMgr::selectionSetMaterialParams(LLSelectedTEMaterialFunctor* materi
struct f2 : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* object)
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -2109,7 +2111,7 @@ void LLSelectMgr::selectionRemoveMaterial()
{
struct f1 : public LLSelectedTEFunctor
{
- bool apply(LLViewerObject* object, S32 face)
+ bool apply(LLViewerObject* object, S32 face) override
{
if (object->permModify())
{
@@ -2124,7 +2126,7 @@ void LLSelectMgr::selectionRemoveMaterial()
struct f2 : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* object)
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -2165,7 +2167,7 @@ BOOL LLSelectMgr::selectionGetGlow(F32 *glow)
F32 lglow = 0.f;
struct f1 : public LLSelectedTEGetFunctor<F32>
{
- F32 get(LLViewerObject* object, S32 face)
+ F32 get(LLViewerObject* object, S32 face) override
{
return object->getTE(face)->getGlow();
}
@@ -2183,7 +2185,8 @@ void LLSelectMgr::selectionSetPhysicsType(U8 type)
{
U8 mType;
f(const U8& t) : mType(t) {}
- virtual bool apply(LLViewerObject* object)
+
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -2202,7 +2205,8 @@ void LLSelectMgr::selectionSetFriction(F32 friction)
{
F32 mFriction;
f(const F32& friction) : mFriction(friction) {}
- virtual bool apply(LLViewerObject* object)
+
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -2221,7 +2225,8 @@ void LLSelectMgr::selectionSetGravity(F32 gravity )
{
F32 mGravity;
f(const F32& gravity) : mGravity(gravity) {}
- virtual bool apply(LLViewerObject* object)
+
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -2240,7 +2245,8 @@ void LLSelectMgr::selectionSetDensity(F32 density )
{
F32 mDensity;
f(const F32& density ) : mDensity(density) {}
- virtual bool apply(LLViewerObject* object)
+
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -2259,7 +2265,8 @@ void LLSelectMgr::selectionSetRestitution(F32 restitution)
{
F32 mRestitution;
f(const F32& restitution ) : mRestitution(restitution) {}
- virtual bool apply(LLViewerObject* object)
+
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -2282,7 +2289,8 @@ void LLSelectMgr::selectionSetMaterial(U8 material)
{
U8 mMaterial;
f(const U8& t) : mMaterial(t) {}
- virtual bool apply(LLViewerObject* object)
+
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -2304,7 +2312,8 @@ BOOL LLSelectMgr::selectionAllPCode(LLPCode code)
{
LLPCode mCode;
f(const LLPCode& t) : mCode(t) {}
- virtual bool apply(LLViewerObject* object)
+
+ bool apply(LLViewerObject* object) override
{
if (object->getPCode() != mCode)
{
@@ -2375,7 +2384,8 @@ BOOL LLSelectMgr::selectionGetClickAction(U8 *out_action)
{
U8 mAction;
f(const U8& t) : mAction(t) {}
- virtual bool apply(LLViewerObject* object)
+
+ bool apply(LLViewerObject* object) override
{
if ( mAction != object->getClickAction())
{
@@ -2394,7 +2404,8 @@ void LLSelectMgr::selectionSetClickAction(U8 action)
{
U8 mAction;
f(const U8& t) : mAction(t) {}
- virtual bool apply(LLViewerObject* object)
+
+ bool apply(LLViewerObject* object) override
{
object->setClickAction(mAction);
return true;
@@ -2503,7 +2514,7 @@ void LLSelectMgr::selectionTexScaleAutofit(F32 repeats_per_meter)
{
F32 mRepeatsPerMeter;
f(const F32& t) : mRepeatsPerMeter(t) {}
- bool apply(LLViewerObject* object, S32 te)
+ bool apply(LLViewerObject* object, S32 te) override
{
if (object->permModify())
@@ -3242,7 +3253,7 @@ boost::signals2::connection LLSelectMgr::addSelectionUpdateCallback(const update
struct LLSelectGetFirstCreator : public LLSelectGetFirstTest
{
protected:
- virtual const LLUUID& getValueFromNode(LLSelectNode* node)
+ const LLUUID& getValueFromNode(LLSelectNode* node) override
{
return node->mPermissions->getCreator();
}
@@ -3280,7 +3291,7 @@ BOOL LLSelectMgr::selectGetCreator(LLUUID& result_id, std::string& name)
struct LLSelectGetFirstOwner : public LLSelectGetFirstTest
{
protected:
- virtual const LLUUID& getValueFromNode(LLSelectNode* node)
+ const LLUUID& getValueFromNode(LLSelectNode* node) override
{
// Don't use 'getOwnership' since we return a reference, not a copy.
// Will return LLUUID::null if unowned (which is not allowed and should never happen.)
@@ -3327,7 +3338,7 @@ BOOL LLSelectMgr::selectGetOwner(LLUUID& result_id, std::string& name)
struct LLSelectGetFirstLastOwner : public LLSelectGetFirstTest
{
protected:
- virtual const LLUUID& getValueFromNode(LLSelectNode* node)
+ const LLUUID& getValueFromNode(LLSelectNode* node) override
{
return node->mPermissions->getLastOwner();
}
@@ -3364,7 +3375,7 @@ BOOL LLSelectMgr::selectGetLastOwner(LLUUID& result_id, std::string& name)
struct LLSelectGetFirstGroup : public LLSelectGetFirstTest
{
protected:
- virtual const LLUUID& getValueFromNode(LLSelectNode* node)
+ const LLUUID& getValueFromNode(LLSelectNode* node) override
{
return node->mPermissions->getGroup();
}
@@ -3387,7 +3398,7 @@ BOOL LLSelectMgr::selectGetGroup(LLUUID& result_id)
struct LLSelectGetFirstGroupOwner : public LLSelectGetFirstTest
{
protected:
- virtual const LLUUID& getValueFromNode(LLSelectNode* node)
+ const LLUUID& getValueFromNode(LLSelectNode* node) override
{
if (node->mPermissions->isGroupOwned())
{
@@ -4513,7 +4524,7 @@ void LLSelectMgr::sendDelink()
{ //on delink, any modifyable object should
f() {}
- virtual bool apply(LLViewerObject* object)
+ bool apply(LLViewerObject* object) override
{
if (object->permModify())
{
@@ -4610,7 +4621,7 @@ void LLSelectMgr::selectionDump()
{
struct f : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* object)
+ bool apply(LLViewerObject* object) override
{
object->dump();
return true;
@@ -4623,7 +4634,7 @@ void LLSelectMgr::saveSelectedObjectColors()
{
struct f : public LLSelectedNodeFunctor
{
- virtual bool apply(LLSelectNode* node)
+ bool apply(LLSelectNode* node) override
{
node->saveColors();
return true;
@@ -4636,7 +4647,7 @@ void LLSelectMgr::saveSelectedShinyColors()
{
struct f : public LLSelectedNodeFunctor
{
- virtual bool apply(LLSelectNode* node)
+ bool apply(LLSelectNode* node) override
{
node->saveShinyColors();
return true;
@@ -4650,7 +4661,7 @@ void LLSelectMgr::saveSelectedObjectTextures()
// invalidate current selection so we update saved textures
struct f : public LLSelectedNodeFunctor
{
- virtual bool apply(LLSelectNode* node)
+ bool apply(LLSelectNode* node) override
{
node->mValid = FALSE;
return true;
@@ -4678,7 +4689,8 @@ void LLSelectMgr::saveSelectedObjectTransform(EActionType action_type)
EActionType mActionType;
LLSelectMgr* mManager;
f(EActionType a, LLSelectMgr* p) : mActionType(a), mManager(p) {}
- virtual bool apply(LLSelectNode* selectNode)
+
+ bool apply(LLSelectNode* selectNode) override
{
LLViewerObject* object = selectNode->getObject();
if (!object)
@@ -4738,7 +4750,8 @@ struct LLSelectMgrApplyFlags : public LLSelectedObjectFunctor
LLSelectMgrApplyFlags(U32 flags, BOOL state) : mFlags(flags), mState(state) {}
U32 mFlags;
BOOL mState;
- virtual bool apply(LLViewerObject* object)
+
+ bool apply(LLViewerObject* object) override
{
if ( object->permModify())
{
@@ -5015,7 +5028,7 @@ void LLSelectMgr::sendListToRegions(const std::string& message_name,
//clear update override data (allow next update through)
struct f : public LLSelectedNodeFunctor
{
- virtual bool apply(LLSelectNode* node)
+ bool apply(LLSelectNode* node) override
{
node->mLastPositionLocal.setVec(0,0,0);
node->mLastRotation = LLQuaternion();
@@ -5031,7 +5044,8 @@ void LLSelectMgr::sendListToRegions(const std::string& message_name,
{
std::queue<LLSelectNode*>& nodes_to_send;
push_all(std::queue<LLSelectNode*>& n) : nodes_to_send(n) {}
- virtual bool apply(LLSelectNode* node)
+
+ bool apply(LLSelectNode* node) override
{
if (node->getObject())
{
@@ -5045,7 +5059,8 @@ void LLSelectMgr::sendListToRegions(const std::string& message_name,
std::queue<LLSelectNode*>& nodes_to_send;
bool mRoots;
push_some(std::queue<LLSelectNode*>& n, bool roots) : nodes_to_send(n), mRoots(roots) {}
- virtual bool apply(LLSelectNode* node)
+
+ bool apply(LLSelectNode* node) override
{
if (node->getObject())
{
@@ -5294,7 +5309,8 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
{
LLUUID mID;
f(const LLUUID& id) : mID(id) {}
- virtual bool apply(LLSelectNode* node)
+
+ bool apply(LLSelectNode* node) override
{
return (node->getObject() && node->getObject()->mID == mID);
}
@@ -5438,7 +5454,8 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
{
LLUUID mID;
f(const LLUUID& id) : mID(id) {}
- virtual bool apply(LLSelectNode* node)
+
+ bool apply(LLSelectNode* node) override
{
return (node->getObject() && node->getObject()->mID == mID);
}
@@ -5516,7 +5533,7 @@ void LLSelectMgr::updateSilhouettes()
{
struct f : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* object)
+ bool apply(LLViewerObject* object) override
{
object->setChanged(LLXform::SILHOUETTE);
return true;
@@ -5924,21 +5941,21 @@ void LLSelectMgr::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_
// Utility classes
//
LLSelectNode::LLSelectNode(LLViewerObject* object, BOOL glow)
-: mObject(object),
- mIndividualSelection(FALSE),
+: mIndividualSelection(FALSE),
mTransient(FALSE),
mValid(FALSE),
mPermissions(new LLPermissions()),
- mInventorySerial(0),
- mSilhouetteExists(FALSE),
- mDuplicated(FALSE),
- mTESelectMask(0),
- mLastTESelected(0),
mName(LLStringUtil::null),
mDescription(LLStringUtil::null),
+ mInventorySerial(0),
+ mDuplicated(FALSE),
mTouchName(LLStringUtil::null),
mSitName(LLStringUtil::null),
- mCreationDate(0)
+ mCreationDate(0),
+ mSilhouetteExists(FALSE),
+ mObject(object),
+ mTESelectMask(0),
+ mLastTESelected(0)
{
saveColors();
saveShinyColors();
@@ -6908,7 +6925,7 @@ void LLSelectMgr::validateSelection()
{
struct f : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* object)
+ bool apply(LLViewerObject* object) override
{
if (!LLSelectMgr::getInstance()->canSelectObject(object))
{
@@ -7628,7 +7645,7 @@ LLSelectNode* LLObjectSelection::getFirstMoveableNode(BOOL get_root_first)
{
struct f : public LLSelectedNodeFunctor
{
- bool apply(LLSelectNode* node)
+ bool apply(LLSelectNode* node) override
{
LLViewerObject* obj = node->getObject();
return obj && obj->permMove() && !obj->isPermanentEnforced();
@@ -7645,7 +7662,7 @@ LLViewerObject* LLObjectSelection::getFirstCopyableObject(BOOL get_parent)
{
struct f : public LLSelectedNodeFunctor
{
- bool apply(LLSelectNode* node)
+ bool apply(LLSelectNode* node) override
{
LLViewerObject* obj = node->getObject();
return obj && obj->permCopy() && !obj->isAttachment();
@@ -7664,7 +7681,7 @@ LLViewerObject* LLObjectSelection::getFirstDeleteableObject()
struct f : public LLSelectedNodeFunctor
{
- bool apply(LLSelectNode* node)
+ bool apply(LLSelectNode* node) override
{
LLViewerObject* obj = node->getObject();
// you can delete an object if you are the owner
@@ -7693,7 +7710,7 @@ LLViewerObject* LLObjectSelection::getFirstEditableObject(BOOL get_parent)
{
struct f : public LLSelectedNodeFunctor
{
- bool apply(LLSelectNode* node)
+ bool apply(LLSelectNode* node) override
{
LLViewerObject* obj = node->getObject();
return obj && obj->permModify();
@@ -7709,7 +7726,7 @@ LLViewerObject* LLObjectSelection::getFirstMoveableObject(BOOL get_parent)
{
struct f : public LLSelectedNodeFunctor
{
- bool apply(LLSelectNode* node)
+ bool apply(LLSelectNode* node) override
{
LLViewerObject* obj = node->getObject();
return obj && obj->permMove() && !obj->isPermanentEnforced();
@@ -7725,7 +7742,7 @@ LLViewerObject* LLObjectSelection::getFirstUndoEnabledObject(BOOL get_parent)
{
struct f : public LLSelectedNodeFunctor
{
- bool apply(LLSelectNode* node)
+ bool apply(LLSelectNode* node) override
{
LLViewerObject* obj = node->getObject();
return obj && (obj->permModify() || (obj->permMove() && !obj->isPermanentEnforced()));
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index 9b51e6c0f68ee550d8bc98825da1c143f71b579d..176b87c7d4fdd7409715413c4944af697c9096b1 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -75,16 +75,19 @@ std::set<LLSnapshotLivePreview*> LLSnapshotLivePreview::sList;
LLSnapshotLivePreview::LLSnapshotLivePreview (const LLSnapshotLivePreview::Params& p)
: LLView(p),
- mColor(1.f, 0.f, 0.f, 0.5f),
- mCurImageIndex(0),
+ mViewContainer(NULL),
+ mColor(1.f, 0.f, 0.f, 0.5f),
+ mThumbnailImage(NULL),
+ mThumbnailWidth(0) ,
+ mThumbnailHeight(0) ,
+ mThumbnailSubsampled(FALSE),
+ mBigThumbnailImage(NULL),
+ mCurImageIndex(0),
mPreviewImage(NULL),
- mThumbnailImage(NULL) ,
- mBigThumbnailImage(NULL) ,
- mThumbnailWidth(0),
- mThumbnailHeight(0),
- mThumbnailSubsampled(FALSE),
mPreviewImageEncoded(NULL),
mFormattedImage(NULL),
+ mAllowRenderUI(TRUE),
+ mAllowFullScreenPreview(TRUE),
mShineCountdown(0),
mFlashAlpha(0.f),
mNeedsFlash(TRUE),
@@ -94,13 +97,10 @@ LLSnapshotLivePreview::LLSnapshotLivePreview (const LLSnapshotLivePreview::Param
mSnapshotFormat(LLSnapshotModel::ESnapshotFormat(gSavedSettings.getS32("SnapshotFormat"))),
mSnapshotUpToDate(FALSE),
mCameraPos(LLViewerCamera::getInstance()->getOrigin()),
- mCameraRot(LLViewerCamera::getInstance()->getQuaternion()),
- mSnapshotActive(FALSE),
- mSnapshotBufferType(LLSnapshotModel::SNAPSHOT_TYPE_COLOR),
- mFilterName(""),
- mAllowRenderUI(TRUE),
- mAllowFullScreenPreview(TRUE),
- mViewContainer(NULL)
+ mCameraRot(LLViewerCamera::getInstance()->getQuaternion()),
+ mSnapshotActive(FALSE),
+ mSnapshotBufferType(LLSnapshotModel::SNAPSHOT_TYPE_COLOR),
+ mFilterName("")
{
setSnapshotQuality(gSavedSettings.getS32("SnapshotQuality"));
mSnapshotDelayTimer.setTimerExpirySec(0.0f);
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index dad99416d7c697437c58f15c7a5b76dd87c8b39f..5c1c5d1e8be7a3f46f57c496e46010a724162c24 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -448,7 +448,7 @@ class LLSpatialSetState : public OctreeTraveler
public:
U32 mState;
LLSpatialSetState(U32 state) : mState(state) { }
- virtual void visit(const OctreeNode* branch) { ((LLSpatialGroup*) branch->getListener(0))->setState(mState); }
+ void visit(const OctreeNode* branch) override { ((LLSpatialGroup*) branch->getListener(0))->setState(mState); }
};
class LLSpatialSetStateDiff : public LLSpatialSetState
@@ -456,7 +456,7 @@ class LLSpatialSetStateDiff : public LLSpatialSetState
public:
LLSpatialSetStateDiff(U32 state) : LLSpatialSetState(state) { }
- virtual void traverse(const OctreeNode* n)
+ void traverse(const OctreeNode* n) override
{
LLSpatialGroup* group = (LLSpatialGroup*) n->getListener(0);
@@ -495,7 +495,7 @@ class LLSpatialClearState : public OctreeTraveler
public:
U32 mState;
LLSpatialClearState(U32 state) : mState(state) { }
- virtual void visit(const OctreeNode* branch) { ((LLSpatialGroup*) branch->getListener(0))->clearState(mState); }
+ void visit(const OctreeNode* branch) override { ((LLSpatialGroup*) branch->getListener(0))->clearState(mState); }
};
class LLSpatialClearStateDiff : public LLSpatialClearState
@@ -503,7 +503,7 @@ class LLSpatialClearStateDiff : public LLSpatialClearState
public:
LLSpatialClearStateDiff(U32 state) : LLSpatialClearState(state) { }
- virtual void traverse(const OctreeNode* n)
+ void traverse(const OctreeNode* n) override
{
LLSpatialGroup* group = (LLSpatialGroup*) n->getListener(0);
@@ -822,7 +822,7 @@ void LLSpatialGroup::destroyGL(bool keep_occlusion)
//==============================================
LLSpatialPartition::LLSpatialPartition(U32 data_mask, BOOL render_by_group, U32 buffer_usage, LLViewerRegion* regionp)
-: mRenderByGroup(render_by_group), mBridge(NULL)
+: mBridge(NULL), mRenderByGroup(render_by_group)
{
mRegionp = regionp;
mPartitionType = LLViewerRegion::PARTITION_NONE;
@@ -931,7 +931,8 @@ public:
const LLVector4a& mOffset;
LLSpatialShift(const LLVector4a& offset) : mOffset(offset) { }
- virtual void visit(const OctreeNode* branch)
+
+ void visit(const OctreeNode* branch) override
{
((LLSpatialGroup*) branch->getListener(0))->shift(mOffset);
}
@@ -948,7 +949,7 @@ class LLOctreeCull : public LLViewerOctreeCull
public:
LLOctreeCull(LLCamera* camera) : LLViewerOctreeCull(camera) {}
- virtual bool earlyFail(LLViewerOctreeGroup* base_group)
+ bool earlyFail(LLViewerOctreeGroup* base_group) override
{
LLSpatialGroup* group = (LLSpatialGroup*)base_group;
group->checkOcclusion();
@@ -963,8 +964,8 @@ public:
return false;
}
-
- virtual S32 frustumCheck(const LLViewerOctreeGroup* group)
+
+ S32 frustumCheck(const LLViewerOctreeGroup* group) override
{
S32 res = AABBInFrustumNoFarClipGroupBounds(group);
if (res != 0)
@@ -974,7 +975,7 @@ public:
return res;
}
- virtual S32 frustumCheckObjects(const LLViewerOctreeGroup* group)
+ S32 frustumCheckObjects(const LLViewerOctreeGroup* group) override
{
S32 res = AABBInFrustumNoFarClipObjectBounds(group);
if (res != 0)
@@ -984,7 +985,7 @@ public:
return res;
}
- virtual void processGroup(LLViewerOctreeGroup* base_group)
+ void processGroup(LLViewerOctreeGroup* base_group) override
{
LLSpatialGroup* group = (LLSpatialGroup*)base_group;
if (group->needsUpdate() ||
@@ -1002,12 +1003,12 @@ public:
LLOctreeCullNoFarClip(LLCamera* camera)
: LLOctreeCull(camera) { }
- virtual S32 frustumCheck(const LLViewerOctreeGroup* group)
+ S32 frustumCheck(const LLViewerOctreeGroup* group) override
{
return AABBInFrustumNoFarClipGroupBounds(group);
}
- virtual S32 frustumCheckObjects(const LLViewerOctreeGroup* group)
+ S32 frustumCheckObjects(const LLViewerOctreeGroup* group) override
{
S32 res = AABBInFrustumNoFarClipObjectBounds(group);
return res;
@@ -1020,12 +1021,12 @@ public:
LLOctreeCullShadow(LLCamera* camera)
: LLOctreeCull(camera) { }
- virtual S32 frustumCheck(const LLViewerOctreeGroup* group)
+ S32 frustumCheck(const LLViewerOctreeGroup* group) override
{
return AABBInFrustumGroupBounds(group);
}
- virtual S32 frustumCheckObjects(const LLViewerOctreeGroup* group)
+ S32 frustumCheckObjects(const LLViewerOctreeGroup* group) override
{
return AABBInFrustumObjectBounds(group);
}
@@ -1035,9 +1036,9 @@ class LLOctreeCullVisExtents: public LLOctreeCullShadow
{
public:
LLOctreeCullVisExtents(LLCamera* camera, LLVector4a& min, LLVector4a& max)
- : LLOctreeCullShadow(camera), mMin(min), mMax(max), mEmpty(TRUE) { }
+ : LLOctreeCullShadow(camera), mEmpty(TRUE), mMin(min), mMax(max) { }
- virtual bool earlyFail(LLViewerOctreeGroup* base_group)
+ bool earlyFail(LLViewerOctreeGroup* base_group) override
{
LLSpatialGroup* group = (LLSpatialGroup*)base_group;
@@ -1051,7 +1052,7 @@ public:
return false;
}
- virtual void traverse(const OctreeNode* n)
+ void traverse(const OctreeNode* n) override
{
LLSpatialGroup* group = (LLSpatialGroup*) n->getListener(0);
@@ -1078,7 +1079,7 @@ public:
}
}
- virtual void processGroup(LLViewerOctreeGroup* base_group)
+ void processGroup(LLViewerOctreeGroup* base_group) override
{
LLSpatialGroup* group = (LLSpatialGroup*)base_group;
@@ -1114,7 +1115,7 @@ public:
LLOctreeCullDetectVisible(LLCamera* camera)
: LLOctreeCullShadow(camera), mResult(FALSE) { }
- virtual bool earlyFail(LLViewerOctreeGroup* base_group)
+ bool earlyFail(LLViewerOctreeGroup* base_group) override
{
LLSpatialGroup* group = (LLSpatialGroup*)base_group;
@@ -1129,7 +1130,7 @@ public:
return false;
}
- virtual void processGroup(LLViewerOctreeGroup* base_group)
+ void processGroup(LLViewerOctreeGroup* base_group) override
{
if (base_group->isVisible())
{
@@ -1146,10 +1147,10 @@ public:
LLOctreeSelect(LLCamera* camera, std::vector<LLDrawable*>* results)
: LLOctreeCull(camera), mResults(results) { }
- virtual bool earlyFail(LLViewerOctreeGroup* group) { return false; }
- virtual void preprocess(LLViewerOctreeGroup* group) { }
+ bool earlyFail(LLViewerOctreeGroup* group) override { return false; }
+ void preprocess(LLViewerOctreeGroup* group) override { }
- virtual void processGroup(LLViewerOctreeGroup* base_group)
+ void processGroup(LLViewerOctreeGroup* base_group) override
{
LLSpatialGroup* group = (LLSpatialGroup*)base_group;
OctreeNode* branch = group->getOctreeNode();
@@ -1290,7 +1291,7 @@ class LLOctreeDirty : public OctreeTraveler
public:
LLOctreeDirty(bool no_rebuild) : mNoRebuild(no_rebuild){}
- virtual void visit(const OctreeNode* state)
+ void visit(const OctreeNode* state) override
{
LLSpatialGroup* group = (LLSpatialGroup*) state->getListener(0);
group->destroyGL();
@@ -2883,7 +2884,7 @@ public:
}
- void visit(const LLOctreeNode<LLVolumeTriangle>* branch)
+ void visit(const LLOctreeNode<LLVolumeTriangle>* branch) override
{
LLVolumeOctreeListener* vl = (LLVolumeOctreeListener*) branch->getListener(0);
@@ -3114,8 +3115,8 @@ class LLOctreeRenderNonOccluded : public OctreeTraveler
public:
LLCamera* mCamera;
LLOctreeRenderNonOccluded(LLCamera* camera): mCamera(camera) {}
-
- virtual void traverse(const OctreeNode* node)
+
+ void traverse(const OctreeNode* node) override
{
LLSpatialGroup* group = (LLSpatialGroup*) node->getListener(0);
@@ -3160,7 +3161,7 @@ public:
}
}
- virtual void visit(const OctreeNode* branch)
+ void visit(const OctreeNode* branch) override
{
LLSpatialGroup* group = (LLSpatialGroup*) branch->getListener(0);
const LLVector4a* bounds = group->getBounds();
@@ -3322,8 +3323,8 @@ class LLOctreeRenderXRay : public OctreeTraveler
public:
LLCamera* mCamera;
LLOctreeRenderXRay(LLCamera* camera): mCamera(camera) {}
-
- virtual void traverse(const OctreeNode* node)
+
+ void traverse(const OctreeNode* node) override
{
LLSpatialGroup* group = (LLSpatialGroup*) node->getListener(0);
@@ -3357,7 +3358,7 @@ public:
}
}
- virtual void visit(const OctreeNode* node) {}
+ void visit(const OctreeNode* node) override {}
};
@@ -3366,8 +3367,8 @@ class LLOctreeRenderPhysicsShapes : public OctreeTraveler
public:
LLCamera* mCamera;
LLOctreeRenderPhysicsShapes(LLCamera* camera): mCamera(camera) {}
-
- virtual void traverse(const OctreeNode* node)
+
+ void traverse(const OctreeNode* node) override
{
LLSpatialGroup* group = (LLSpatialGroup*) node->getListener(0);
@@ -3390,7 +3391,7 @@ public:
}
}
- virtual void visit(const OctreeNode* branch)
+ void visit(const OctreeNode* branch) override
{
}
@@ -3401,8 +3402,8 @@ class LLOctreePushBBoxVerts : public OctreeTraveler
public:
LLCamera* mCamera;
LLOctreePushBBoxVerts(LLCamera* camera): mCamera(camera) {}
-
- virtual void traverse(const OctreeNode* node)
+
+ void traverse(const OctreeNode* node) override
{
LLSpatialGroup* group = (LLSpatialGroup*) node->getListener(0);
@@ -3418,7 +3419,7 @@ public:
}
}
- virtual void visit(const OctreeNode* branch)
+ void visit(const OctreeNode* branch) override
{
LLSpatialGroup* group = (LLSpatialGroup*) branch->getListener(0);
@@ -3459,7 +3460,7 @@ public:
}
}
- virtual void traverse(const OctreeNode* node)
+ void traverse(const OctreeNode* node) override
{
LLSpatialGroup* group = (LLSpatialGroup*) node->getListener(0);
@@ -3484,9 +3485,9 @@ public:
mInheritedMask[i] = temp[i];
}
}
-
- virtual void visit(const OctreeNode* state)
+
+ void visit(const OctreeNode* state) override
{
LLSpatialGroup* group = (LLSpatialGroup*) state->getListener(0);
@@ -3675,8 +3676,8 @@ public:
mPickRigged(pick_rigged)
{
}
-
- virtual void visit(const OctreeNode* branch)
+
+ void visit(const OctreeNode* branch) override
{
for (OctreeNode::const_element_iter i = branch->getDataBegin(); i != branch->getDataEnd(); ++i)
{
@@ -3831,10 +3832,10 @@ LLDrawInfo::LLDrawInfo(U16 start, U16 end, U32 count, U32 offset,
mDrawMode(LLRender::TRIANGLES),
mMaterial(NULL),
mShaderMask(0),
- mSpecColor(1.0f, 1.0f, 1.0f, 0.5f),
mBlendFuncSrc(LLRender::BF_SOURCE_ALPHA),
mBlendFuncDst(LLRender::BF_ONE_MINUS_SOURCE_ALPHA),
mHasGlow(FALSE),
+ mSpecColor(1.0f, 1.0f, 1.0f, 0.5f),
mEnvIntensity(0.0f),
mAlphaMaskCutoff(0.5f),
mDiffuseAlphaMode(0)
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 692be204011dabccaefc4e0af3956625b8c6d163..5b6b406de3a6ded132fc7f168e08cb867801207d 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -272,10 +272,10 @@ bool LLSpeakersDelayActionsStorage::isTimerStarted(const LLUUID& speaker_id)
//
LLSpeakerMgr::LLSpeakerMgr(LLVoiceChannel* channelp) :
+ mSpeakerListUpdated(false),
mVoiceChannel(channelp),
mVoiceModerated(false),
- mModerateModeHandledFirstTime(false),
- mSpeakerListUpdated(false)
+ mModerateModeHandledFirstTime(false)
{
mGetListTime.reset();
static LLUICachedControl<F32> remove_delay ("SpeakerParticipantRemoveDelay", 10.0);
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index 84ea0414b95a5e2241e47b62adce5f13d9bbe20c..c1c65b9bbd2d21c05ac5b35677a614f24e5b024d 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -66,7 +66,7 @@ private:
public:
ReadResponder(LLTextureCache* cache, handle_t handle) : mCache(cache), mHandle(handle) {}
~ReadResponder() {}
- void completed(S32 bytes)
+ void completed(S32 bytes) override
{
mCache->lockWorkers();
LLTextureCacheWorker* reader = mCache->getReader(mHandle);
@@ -82,7 +82,7 @@ private:
public:
WriteResponder(LLTextureCache* cache, handle_t handle) : mCache(cache), mHandle(handle) {}
~WriteResponder() {}
- void completed(S32 bytes)
+ void completed(S32 bytes) override
{
mCache->lockWorkers();
LLTextureCacheWorker* writer = mCache->getWriter(mHandle);
@@ -99,9 +99,9 @@ public:
S32 imagesize, // for writes
LLTextureCache::Responder* responder)
: LLWorkerClass(cache, "LLTextureCacheWorker"),
- mID(id),
mCache(cache),
mPriority(priority),
+ mID(id),
mReadData(NULL),
mWriteData(data),
mDataSize(datasize),
@@ -126,7 +126,7 @@ public:
virtual bool doRead() = 0;
virtual bool doWrite() = 0;
- virtual bool doWork(S32 param); // Called from LLWorkerThread::processRequest()
+ bool doWork(S32 param) override; // Called from LLWorkerThread::processRequest()
handle_t read() { addWork(0, LLWorkerThread::PRIORITY_HIGH | mPriority); return mRequestHandle; }
handle_t write() { addWork(1, LLWorkerThread::PRIORITY_HIGH | mPriority); return mRequestHandle; }
@@ -138,9 +138,9 @@ public:
}
private:
- virtual void startWork(S32 param); // called from addWork() (MAIN THREAD)
- virtual void finishWork(S32 param, bool completed); // called from finishRequest() (WORK THREAD)
- virtual void endWork(S32 param, bool aborted); // called from doWork() (MAIN THREAD)
+ void startWork(S32 param) override; // called from addWork() (MAIN THREAD)
+ void finishWork(S32 param, bool completed) override; // called from finishRequest() (WORK THREAD)
+ void endWork(S32 param, bool aborted) override; // called from doWork() (MAIN THREAD)
protected:
LLTextureCache* mCache;
@@ -173,8 +173,8 @@ public:
{
}
- virtual bool doRead();
- virtual bool doWrite();
+ bool doRead() override;
+ bool doWrite() override;
private:
std::string mFileName;
@@ -297,8 +297,8 @@ public:
{
}
- virtual bool doRead();
- virtual bool doWrite();
+ bool doRead() override;
+ bool doWrite() override;
private:
enum e_state
@@ -821,12 +821,12 @@ LLTextureCache::LLTextureCache(bool threaded)
mListMutex(),
mFastCacheMutex(),
mHeaderAPRFile(NULL),
- mReadOnly(TRUE), //do not allow to change the texture cache until setReadOnly() is called.
- mTexturesSizeTotal(0),
- mDoPurge(false),
+ mFastCachePoolp(NULL), //do not allow to change the texture cache until setReadOnly() is called.
+ mReadOnly(TRUE),
mFastCachep(NULL),
- mFastCachePoolp(NULL),
- mFastCachePadBuffer(NULL)
+ mFastCachePadBuffer(NULL),
+ mTexturesSizeTotal(0),
+ mDoPurge(false)
{
}
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 56cd29a5d42701c575e23dbf10f8502e48d1b263..d30a00cfcf76e722d094ece5ea5c7d9819bd9ae4 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -305,7 +305,7 @@ void LLTextureCtrl::closeDependentFloater()
class LLTextureFetchDescendentsObserver : public LLInventoryFetchDescendentsObserver
{
public:
- virtual void done()
+ void done() override
{
// We need to find textures in all folders, so get the main
// background download going.
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index aa964e21a503fa88168fe081b826722a692ae536..19a347dbfc713941e8dc3db06cd7ed60fa8ced08 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -307,7 +307,7 @@ private:
}
// Threads: Ttc
- virtual void completed(bool success)
+ void completed(bool success) override
{
LLTextureFetchWorker* worker = mFetcher->getWorker(mID);
if (worker)
@@ -331,7 +331,7 @@ private:
}
// Threads: Ttc
- virtual void completed(bool success)
+ void completed(bool success) override
{
LLTextureFetchWorker* worker = mFetcher->getWorker(mID);
if (worker)
@@ -355,7 +355,7 @@ private:
}
// Threads: Tid
- virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux)
+ void completed(bool success, LLImageRaw* raw, LLImageRaw* aux) override
{
LLTextureFetchWorker* worker = mFetcher->getWorker(mID);
if (worker)
@@ -388,13 +388,13 @@ private:
public:
// Threads: Ttf
- /*virtual*/ bool doWork(S32 param); // Called from LLWorkerThread::processRequest()
+ /*virtual*/ bool doWork(S32 param) override; // Called from LLWorkerThread::processRequest()
// Threads: Ttf
- /*virtual*/ void finishWork(S32 param, bool completed); // called from finishRequest() (WORK THREAD)
+ /*virtual*/ void finishWork(S32 param, bool completed) override; // called from finishRequest() (WORK THREAD)
// Threads: Tmain
- /*virtual*/ bool deleteOK(); // called from update()
+ /*virtual*/ bool deleteOK() override; // called from update()
~LLTextureFetchWorker();
@@ -431,7 +431,7 @@ public:
// Inherited from LLCore::HttpHandler
// Threads: Ttf
- virtual void onCompleted(LLCore::HttpHandle handle, LLCore::HttpResponse * response);
+ void onCompleted(LLCore::HttpHandle handle, LLCore::HttpResponse * response) override;
protected:
LLTextureFetchWorker(LLTextureFetch* fetcher, FTType f_type,
@@ -441,10 +441,10 @@ protected:
private:
// Threads: Tmain
- /*virtual*/ void startWork(S32 param); // called from addWork() (MAIN THREAD)
+ /*virtual*/ void startWork(S32 param) override; // called from addWork() (MAIN THREAD)
// Threads: Tmain
- /*virtual*/ void endWork(S32 param, bool aborted); // called from doWork() (MAIN THREAD)
+ /*virtual*/ void endWork(S32 param, bool aborted) override; // called from doWork() (MAIN THREAD)
// Locks: Mw
void resetFormattedData();
@@ -777,7 +777,7 @@ public:
virtual ~TFReqSetRegion()
{}
- virtual bool doWork(LLTextureFetch * fetcher);
+ bool doWork(LLTextureFetch * fetcher) override;
public:
const U64 mRegionHandle;
@@ -826,7 +826,7 @@ public:
virtual ~TFReqSendMetrics();
- virtual bool doWork(LLTextureFetch * fetcher);
+ bool doWork(LLTextureFetch * fetcher) override;
public:
const std::string mCapsURL;
@@ -912,9 +912,9 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
mDesiredSize(TEXTURE_CACHE_ENTRY_SIZE),
mFileSize(0),
mCachedSize(0),
- mLoaded(FALSE),
mSentRequest(UNSENT),
mDecodeHandle(0),
+ mLoaded(FALSE),
mDecoded(FALSE),
mWritten(FALSE),
mNeedsAux(FALSE),
@@ -924,6 +924,7 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
mCanUseHTTP(true),
mRetryAttempt(0),
mActiveCount(0),
+ mFetchRetryPolicy(10.0,3600.0,2.0,10),
mWorkMutex(),
mFirstPacket(0),
mLastPacket(-1),
@@ -939,8 +940,7 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
mHttpHasResource(false),
mCacheReadCount(0U),
mCacheWriteCount(0U),
- mResourceWaitCount(0U),
- mFetchRetryPolicy(10.0,3600.0,2.0,10)
+ mResourceWaitCount(0U)
{
mCanUseNET = mUrl.empty() ;
@@ -2541,6 +2541,7 @@ LLTextureFetch::LLTextureFetch(LLTextureCache* cache, LLImageDecodeThread* image
mTextureCache(cache),
mImageDecodeThread(imagedecodethread),
mTextureBandwidth(0),
+ mTextureInfoMainThread(false),
mHTTPTextureBits(0),
mTotalHTTPRequests(0),
mQAMode(qa_mode),
@@ -2555,23 +2556,22 @@ LLTextureFetch::LLTextureFetch(LLTextureCache* cache, LLImageDecodeThread* image
mTotalCacheWriteCount(0U),
mTotalResourceWaitCount(0U),
mFetchDebugger(NULL),
- mFetchSource(LLTextureFetch::FROM_ALL),
- mOriginFetchSource(LLTextureFetch::FROM_ALL),
mFetcherLocked(FALSE),
- mTextureInfoMainThread(false)
+ mFetchSource(LLTextureFetch::FROM_ALL),
+ mOriginFetchSource(LLTextureFetch::FROM_ALL)
{
mMaxBandwidth = gSavedSettings.getF32("ThrottleBandwidthKBPS");
mTextureInfo.setLogging(true);
LLAppCoreHttp & app_core_http(LLAppViewer::instance()->getAppCoreHttp());
mHttpRequest = new LLCore::HttpRequest;
- mHttpOptions = LLCore::HttpOptions::ptr_t(new LLCore::HttpOptions);
- mHttpOptionsWithHeaders = LLCore::HttpOptions::ptr_t(new LLCore::HttpOptions);
+ mHttpOptions = boost::make_shared<LLCore::HttpOptions>();
+ mHttpOptionsWithHeaders = boost::make_shared<LLCore::HttpOptions>();
mHttpOptionsWithHeaders->setWantHeaders(true);
- mHttpHeaders = LLCore::HttpHeaders::ptr_t(new LLCore::HttpHeaders);
+ mHttpHeaders = boost::make_shared<LLCore::HttpHeaders>();
mHttpHeaders->append(HTTP_OUT_HEADER_ACCEPT, HTTP_CONTENT_IMAGE_X_J2C);
mHttpPolicyClass = app_core_http.getPolicy(LLAppCoreHttp::AP_TEXTURE);
- mHttpMetricsHeaders = LLCore::HttpHeaders::ptr_t(new LLCore::HttpHeaders);
+ mHttpMetricsHeaders = boost::make_shared<LLCore::HttpHeaders>();
mHttpMetricsHeaders->append(HTTP_OUT_HEADER_CONTENT_TYPE, HTTP_CONTENT_LLSD_XML);
mHttpMetricsPolicyClass = app_core_http.getPolicy(LLAppCoreHttp::AP_REPORTING);
mHttpHighWater = HTTP_NONPIPE_REQUESTS_HIGH_WATER;
@@ -3959,7 +3959,7 @@ class AssetReportHandler : public LLCore::HttpHandler
public:
// Threads: Ttf
- virtual void onCompleted(LLCore::HttpHandle handle, LLCore::HttpResponse * response)
+ void onCompleted(LLCore::HttpHandle handle, LLCore::HttpResponse * response) override
{
LLCore::HttpStatus status(response->getStatus());
@@ -4130,7 +4130,8 @@ public:
{
setImage(image);
}
- virtual void completed(bool success)
+
+ void completed(bool success) override
{
mDebugger->callbackCacheRead(mID, success, mFormattedImage, mImageSize, mImageLocal);
}
@@ -4146,7 +4147,8 @@ public:
: mDebugger(debugger), mID(id)
{
}
- virtual void completed(bool success)
+
+ void completed(bool success) override
{
mDebugger->callbackCacheWrite(mID, success);
}
@@ -4162,7 +4164,8 @@ public:
: mDebugger(debugger), mID(id)
{
}
- virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux)
+
+ void completed(bool success, LLImageRaw* raw, LLImageRaw* aux) override
{
mDebugger->callbackDecoded(mID, success, raw, aux);
}
@@ -4235,7 +4238,7 @@ void LLTextureFetchDebugger::init()
if (! mHttpHeaders)
{
- mHttpHeaders = LLCore::HttpHeaders::ptr_t(new LLCore::HttpHeaders);
+ mHttpHeaders = boost::make_shared<LLCore::HttpHeaders>();
mHttpHeaders->append(HTTP_OUT_HEADER_ACCEPT, HTTP_CONTENT_IMAGE_X_J2C);
}
}
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index 4057a529e7b8438e061bbcf20ca7c0e8f2710bf1..6c6577906a74cc4a84b8c7e5ebe4dd69085ca8fc 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -512,7 +512,7 @@ void LLViewerAssetStorage::assetRequestCoro(
LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("assetRequestCoro", httpPolicy));
LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
- LLCore::HttpOptions::ptr_t httpOpts = LLCore::HttpOptions::ptr_t(new LLCore::HttpOptions);
+ LLCore::HttpOptions::ptr_t httpOpts = boost::make_shared<LLCore::HttpOptions>();
LLSD result = httpAdapter->getRawAndSuspend(httpRequest, url, httpOpts);
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp
index 12b9c4b7a3e1c2b45ca365b06a354651bb5a17eb..d259d4f1dd84eb4ff76e146d6e244a89c0414ca7 100644
--- a/indra/newview/llviewerassetupload.cpp
+++ b/indra/newview/llviewerassetupload.cpp
@@ -86,6 +86,8 @@ LLResourceUploadInfo::LLResourceUploadInfo(std::string name,
std::string description, S32 compressionInfo,
LLFolderType::EType destinationType, LLInventoryType::EType inventoryType,
U32 nextOWnerPerms, U32 groupPerms, U32 everyonePerms, S32 expectedCost):
+ mTransactionId(),
+ mAssetType(LLAssetType::AT_NONE),
mName(name),
mDescription(description),
mCompressionInfo(compressionInfo),
@@ -95,8 +97,6 @@ LLResourceUploadInfo::LLResourceUploadInfo(std::string name,
mGroupPerms(groupPerms),
mEveryonePerms(everyonePerms),
mExpectedUploadCost(expectedCost),
- mTransactionId(),
- mAssetType(LLAssetType::AT_NONE),
mFolderId(LLUUID::null),
mItemId(LLUUID::null),
mAssetId(LLAssetID::null)
@@ -105,7 +105,7 @@ LLResourceUploadInfo::LLResourceUploadInfo(std::string name,
}
LLResourceUploadInfo::LLResourceUploadInfo(LLAssetID assetId, LLAssetType::EType assetType, std::string name) :
- mAssetId(assetId),
+ mTransactionId(),
mAssetType(assetType),
mName(name),
mDescription(),
@@ -116,9 +116,9 @@ LLResourceUploadInfo::LLResourceUploadInfo(LLAssetID assetId, LLAssetType::EType
mGroupPerms(0),
mEveryonePerms(0),
mExpectedUploadCost(0),
- mTransactionId(),
mFolderId(LLUUID::null),
- mItemId(LLUUID::null)
+ mItemId(LLUUID::null),
+ mAssetId(assetId)
{
}
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index caf00a19484ad84d821bdfc9c3a0b1985ccbe076..195ff1a41933a7e07d2f7cbb001f3da26b7a3580 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -232,7 +232,7 @@ public:
LLInventoryHandler() : LLCommandHandler("inventory", UNTRUSTED_THROTTLE) { }
bool handle(const LLSD& params, const LLSD& query_map,
- LLMediaCtrl* web)
+ LLMediaCtrl* web) override
{
if (params.size() < 1)
{
@@ -1646,7 +1646,7 @@ public:
mCB(cb)
{
}
- /* virtual */ void fire(const LLUUID& item_id) {}
+ /* virtual */ void fire(const LLUUID& item_id) override {}
~LLRemoveCategoryOnDestroy()
{
LLInventoryModel::EHasChildren children = gInventory.categoryHasChildren(mID);
@@ -2338,8 +2338,9 @@ class LLRegenerateLinkCollector : public LLInventoryCollectFunctor
public:
LLRegenerateLinkCollector(const LLViewerInventoryItem *target_item) : mTargetItem(target_item) {}
virtual ~LLRegenerateLinkCollector() {}
- virtual bool operator()(LLInventoryCategory* cat,
- LLInventoryItem* item)
+
+ bool operator()(LLInventoryCategory* cat,
+ LLInventoryItem* item) override
{
if (item)
{
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 8b3c3ddc3a14db85b7f312e9a9b5fb6aa2ed6890..53902301ae7cd4d3fb4241af596428af2853097a 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -57,24 +57,24 @@ protected:
mutable std::string mDisplayName;
public:
- virtual LLAssetType::EType getType() const;
- virtual const LLUUID& getAssetUUID() const;
+ LLAssetType::EType getType() const override;
+ const LLUUID& getAssetUUID() const override;
virtual const LLUUID& getProtectedAssetUUID() const; // returns LLUUID::null if current agent does not have permission to expose this asset's UUID to the user
- virtual const std::string& getName() const;
+ const std::string& getName() const override;
virtual S32 getSortField() const;
//virtual void setSortField(S32 sortField);
virtual void getSLURL(); //Caches SLURL for landmark. //*TODO: Find a better way to do it and remove this method from here.
- virtual const LLPermissions& getPermissions() const;
+ const LLPermissions& getPermissions() const override;
virtual const bool getIsFullPerm() const; // 'fullperm' in the popular sense: modify-ok & copy-ok & transfer-ok, no special god rules applied
- virtual const LLUUID& getCreatorUUID() const;
- virtual const std::string& getDescription() const;
- virtual const LLSaleInfo& getSaleInfo() const;
- virtual LLInventoryType::EType getInventoryType() const;
+ const LLUUID& getCreatorUUID() const override;
+ const std::string& getDescription() const override;
+ const LLSaleInfo& getSaleInfo() const override;
+ LLInventoryType::EType getInventoryType() const override;
virtual bool isWearableType() const;
virtual LLWearableType::EType getWearableType() const;
- virtual U32 getFlags() const;
- virtual time_t getCreationDate() const;
- virtual U32 getCRC32() const; // really more of a checksum.
+ U32 getFlags() const override;
+ time_t getCreationDate() const override;
+ U32 getCRC32() const override; // really more of a checksum.
static BOOL extractSortFieldAndDisplayName(const std::string& name, S32* sortField, std::string* displayName);
@@ -110,7 +110,7 @@ public:
LLViewerInventoryItem(const LLInventoryItem* other);
void copyViewerItem(const LLViewerInventoryItem* other);
- /*virtual*/ void copyItem(const LLInventoryItem* other);
+ /*virtual*/ void copyItem(const LLInventoryItem* other) override;
// construct a new clone of this item - it creates a new viewer
// inventory item using the copy constructor, and returns it.
@@ -118,15 +118,15 @@ public:
void cloneViewerItem(LLPointer<LLViewerInventoryItem>& newitem) const;
// virtual methods
- virtual void updateParentOnServer(BOOL restamp) const;
- virtual void updateServer(BOOL is_new) const;
+ void updateParentOnServer(BOOL restamp) const override;
+ void updateServer(BOOL is_new) const override;
void fetchFromServer(void) const;
- virtual void packMessage(LLMessageSystem* msg) const;
- virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
+ void packMessage(LLMessageSystem* msg) const override;
+ BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0) override;
virtual BOOL unpackMessage(const LLSD& item);
- virtual BOOL importFile(LLFILE* fp);
- virtual BOOL importLegacyStream(std::istream& input_stream);
+ BOOL importFile(LLFILE* fp) override;
+ BOOL importLegacyStream(std::istream& input_stream) override;
// file handling on the viewer. These are not meant for anything
// other than cacheing.
@@ -196,10 +196,10 @@ public:
LLViewerInventoryCategory(const LLViewerInventoryCategory* other);
void copyViewerCategory(const LLViewerInventoryCategory* other);
- virtual void updateParentOnServer(BOOL restamp_children) const;
- virtual void updateServer(BOOL is_new) const;
+ void updateParentOnServer(BOOL restamp_children) const override;
+ void updateServer(BOOL is_new) const override;
- virtual void packMessage(LLMessageSystem* msg) const;
+ void packMessage(LLMessageSystem* msg) const override;
const LLUUID& getOwnerID() const { return mOwnerID; }
@@ -226,7 +226,7 @@ public:
bool importFileLocal(LLFILE* fp);
void determineFolderType();
void changeType(LLFolderType::EType new_folder_type);
- virtual void unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
+ void unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0) override;
virtual BOOL unpackMessage(const LLSD& category);
// returns true if the category object will accept the incoming item
@@ -266,7 +266,7 @@ public:
void setTargetLandmarkId(const LLUUID& target_uuid) { mTargetLandmarkId = target_uuid; }
private:
- void fire(const LLUUID& inv_item);
+ void fire(const LLUUID& inv_item) override;
LLUUID mTargetLandmarkId;
};
@@ -292,8 +292,8 @@ public:
}
// virtual
- void fire(const LLUUID& item_id)
-{
+ void fire(const LLUUID& item_id) override
+ {
mFireFunc(item_id);
}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 0a38db16b1cc4216f83bd4ad231bc00fdefda8d1..32da8c51a862b09c2ded68a03cdceecbd032f4f5 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -321,7 +321,7 @@ class LLMenuParcelObserver : public LLParcelObserver
public:
LLMenuParcelObserver();
~LLMenuParcelObserver();
- virtual void changed();
+ void changed() override;
};
static LLMenuParcelObserver* gMenuParcelObserver = NULL;
@@ -539,7 +539,7 @@ void init_menus()
class LLAdvancedToggleConsole : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string console_type = userdata.asString();
if ("texture" == console_type)
@@ -568,7 +568,7 @@ class LLAdvancedToggleConsole : public view_listener_t
};
class LLAdvancedCheckConsole : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string console_type = userdata.asString();
bool new_value = false;
@@ -605,7 +605,7 @@ class LLAdvancedCheckConsole : public view_listener_t
class LLAdvancedDumpInfoToConsole : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gDebugView->mDebugConsolep->setVisible(TRUE);
std::string info_type = userdata.asString();
@@ -633,7 +633,7 @@ class LLAdvancedDumpInfoToConsole : public view_listener_t
class LLAdvancedToggleHUDInfo : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string info_type = userdata.asString();
@@ -659,7 +659,7 @@ class LLAdvancedToggleHUDInfo : public view_listener_t
class LLAdvancedCheckHUDInfo : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string info_type = userdata.asString();
bool new_value = false;
@@ -690,7 +690,7 @@ class LLAdvancedCheckHUDInfo : public view_listener_t
class LLAdvancedAgentFlyingInfo : public view_listener_t
{
- bool handleEvent(const LLSD&)
+ bool handleEvent(const LLSD&) override
{
return gAgent.getFlying();
}
@@ -703,7 +703,7 @@ class LLAdvancedAgentFlyingInfo : public view_listener_t
class LLAdvancedClearGroupCache : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLGroupMgr::debugClearAllGroups(NULL);
return true;
@@ -779,7 +779,7 @@ U32 render_type_from_string(std::string render_type)
class LLAdvancedToggleRenderType : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
U32 render_type = render_type_from_string( userdata.asString() );
if ( render_type != 0 )
@@ -793,7 +793,7 @@ class LLAdvancedToggleRenderType : public view_listener_t
class LLAdvancedCheckRenderType : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
U32 render_type = render_type_from_string( userdata.asString() );
bool new_value = false;
@@ -854,7 +854,7 @@ U32 feature_from_string(std::string feature)
class LLAdvancedToggleFeature : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
U32 feature = feature_from_string( userdata.asString() );
if ( feature != 0 )
@@ -867,8 +867,8 @@ class LLAdvancedToggleFeature : public view_listener_t
class LLAdvancedCheckFeature : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
-{
+ bool handleEvent(const LLSD& userdata) override
+ {
U32 feature = feature_from_string( userdata.asString() );
bool new_value = false;
@@ -883,7 +883,7 @@ class LLAdvancedCheckFeature : public view_listener_t
class LLAdvancedCheckDisplayTextureDensity : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string mode = userdata.asString();
if (!gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXEL_DENSITY))
@@ -908,7 +908,7 @@ class LLAdvancedCheckDisplayTextureDensity : public view_listener_t
class LLAdvancedSetDisplayTextureDensity : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string mode = userdata.asString();
if (mode == "none")
@@ -1079,7 +1079,7 @@ U32 info_display_from_string(std::string info_display)
class LLAdvancedToggleInfoDisplay : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
U32 info_display = info_display_from_string( userdata.asString() );
@@ -1097,7 +1097,7 @@ class LLAdvancedToggleInfoDisplay : public view_listener_t
class LLAdvancedCheckInfoDisplay : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
U32 info_display = info_display_from_string( userdata.asString() );
bool new_value = false;
@@ -1119,7 +1119,7 @@ class LLAdvancedCheckInfoDisplay : public view_listener_t
class LLAdvancedToggleRandomizeFramerate : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gRandomizeFramerate = !(gRandomizeFramerate);
return true;
@@ -1128,7 +1128,7 @@ class LLAdvancedToggleRandomizeFramerate : public view_listener_t
class LLAdvancedCheckRandomizeFramerate : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gRandomizeFramerate;
return new_value;
@@ -1142,7 +1142,7 @@ class LLAdvancedCheckRandomizeFramerate : public view_listener_t
class LLAdvancedTogglePeriodicSlowFrame : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gPeriodicSlowFrame = !(gPeriodicSlowFrame);
return true;
@@ -1151,7 +1151,7 @@ class LLAdvancedTogglePeriodicSlowFrame : public view_listener_t
class LLAdvancedCheckPeriodicSlowFrame : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gPeriodicSlowFrame;
return new_value;
@@ -1167,7 +1167,7 @@ class LLAdvancedCheckPeriodicSlowFrame : public view_listener_t
class LLAdvancedToggleFrameTest : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLPipeline::sRenderFrameTest = !(LLPipeline::sRenderFrameTest);
return true;
@@ -1176,7 +1176,7 @@ class LLAdvancedToggleFrameTest : public view_listener_t
class LLAdvancedCheckFrameTest : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLPipeline::sRenderFrameTest;
return new_value;
@@ -1191,7 +1191,7 @@ class LLAdvancedCheckFrameTest : public view_listener_t
class LLAdvancedSelectedTextureInfo : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_selected_texture_info(NULL);
return true;
@@ -1204,7 +1204,7 @@ class LLAdvancedSelectedTextureInfo : public view_listener_t
class LLAdvancedToggleWireframe : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gUseWireframe = !(gUseWireframe);
gWindowResized = TRUE;
@@ -1219,7 +1219,7 @@ class LLAdvancedToggleWireframe : public view_listener_t
class LLAdvancedCheckWireframe : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gUseWireframe;
return new_value;
@@ -1233,7 +1233,7 @@ class LLAdvancedCheckWireframe : public view_listener_t
class LLAdvancedDumpScriptedCamera : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_dump_followcam(NULL);
return true;
@@ -1249,8 +1249,8 @@ class LLAdvancedDumpScriptedCamera : public view_listener_t
class LLAdvancedDumpRegionObjectCache : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
-{
+ bool handleEvent(const LLSD& userdata) override
+ {
handle_dump_region_object_cache(NULL);
return true;
}
@@ -1258,7 +1258,7 @@ class LLAdvancedDumpRegionObjectCache : public view_listener_t
class LLAdvancedBuyCurrencyTest : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_buy_currency_test(NULL);
return true;
@@ -1273,7 +1273,7 @@ class LLAdvancedBuyCurrencyTest : public view_listener_t
class LLAdvancedDumpSelectMgr : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
dump_select_mgr(NULL);
return true;
@@ -1289,7 +1289,7 @@ class LLAdvancedDumpSelectMgr : public view_listener_t
class LLAdvancedDumpInventory : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
dump_inventory(NULL);
return true;
@@ -1305,7 +1305,7 @@ class LLAdvancedDumpInventory : public view_listener_t
class LLAdvancedPrintSelectedObjectInfo : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
print_object_info(NULL);
return true;
@@ -1321,7 +1321,7 @@ class LLAdvancedPrintSelectedObjectInfo : public view_listener_t
class LLAdvancedPrintAgentInfo : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
print_agent_nvpairs(NULL);
return true;
@@ -1335,7 +1335,7 @@ class LLAdvancedPrintAgentInfo : public view_listener_t
class LLAdvancedToggleDebugClicks : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gDebugClicks = !(gDebugClicks);
return true;
@@ -1344,7 +1344,7 @@ class LLAdvancedToggleDebugClicks : public view_listener_t
class LLAdvancedCheckDebugClicks : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gDebugClicks;
return new_value;
@@ -1360,7 +1360,7 @@ class LLAdvancedCheckDebugClicks : public view_listener_t
class LLAdvancedToggleDebugViews : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLView::sDebugRects = !(LLView::sDebugRects);
return true;
@@ -1369,7 +1369,7 @@ class LLAdvancedToggleDebugViews : public view_listener_t
class LLAdvancedCheckDebugViews : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLView::sDebugRects;
return new_value;
@@ -1385,7 +1385,7 @@ class LLAdvancedCheckDebugViews : public view_listener_t
class LLAdvancedToggleXUINameTooltips : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
toggle_show_xui_names(NULL);
return true;
@@ -1394,7 +1394,7 @@ class LLAdvancedToggleXUINameTooltips : public view_listener_t
class LLAdvancedCheckXUINameTooltips : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = check_show_xui_names(NULL);
return new_value;
@@ -1410,7 +1410,7 @@ class LLAdvancedCheckXUINameTooltips : public view_listener_t
class LLAdvancedToggleDebugMouseEvents : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLView::sDebugMouseHandling = !(LLView::sDebugMouseHandling);
return true;
@@ -1419,7 +1419,7 @@ class LLAdvancedToggleDebugMouseEvents : public view_listener_t
class LLAdvancedCheckDebugMouseEvents : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLView::sDebugMouseHandling;
return new_value;
@@ -1435,7 +1435,7 @@ class LLAdvancedCheckDebugMouseEvents : public view_listener_t
class LLAdvancedToggleDebugKeys : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLView::sDebugKeys = !(LLView::sDebugKeys);
return true;
@@ -1444,7 +1444,7 @@ class LLAdvancedToggleDebugKeys : public view_listener_t
class LLAdvancedCheckDebugKeys : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLView::sDebugKeys;
return new_value;
@@ -1460,7 +1460,7 @@ class LLAdvancedCheckDebugKeys : public view_listener_t
class LLAdvancedToggleDebugWindowProc : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gDebugWindowProc = !(gDebugWindowProc);
return true;
@@ -1469,7 +1469,7 @@ class LLAdvancedToggleDebugWindowProc : public view_listener_t
class LLAdvancedCheckDebugWindowProc : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gDebugWindowProc;
return new_value;
@@ -1480,7 +1480,7 @@ class LLAdvancedCheckDebugWindowProc : public view_listener_t
class LLAdvancedSendTestIms : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLIMModel::instance().testMessages();
return true;
@@ -1494,7 +1494,7 @@ class LLAdvancedSendTestIms : public view_listener_t
class LLAdvancedGrabBakedTexture : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string texture_type = userdata.asString();
if ("iris" == texture_type)
@@ -1528,8 +1528,8 @@ class LLAdvancedGrabBakedTexture : public view_listener_t
class LLAdvancedEnableGrabBakedTexture : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
-{
+ bool handleEvent(const LLSD& userdata) override
+ {
std::string texture_type = userdata.asString();
bool new_value = false;
@@ -1569,7 +1569,7 @@ class LLAdvancedEnableGrabBakedTexture : public view_listener_t
class LLAdvancedEnableAppearanceToXML : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return gSavedSettings.getBOOL("DebugAvatarAppearanceMessage");
}
@@ -1577,7 +1577,7 @@ class LLAdvancedEnableAppearanceToXML : public view_listener_t
class LLAdvancedAppearanceToXML : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string emptyname;
LLVOAvatar* avatar =
@@ -1600,7 +1600,7 @@ class LLAdvancedAppearanceToXML : public view_listener_t
class LLAdvancedToggleCharacterGeometry : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_god_request_avatar_geometry(NULL);
return true;
@@ -1614,7 +1614,7 @@ class LLAdvancedToggleCharacterGeometry : public view_listener_t
class LLAdvancedTestMale : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_test_male(NULL);
return true;
@@ -1624,7 +1624,7 @@ class LLAdvancedTestMale : public view_listener_t
class LLAdvancedTestFemale : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_test_female(NULL);
return true;
@@ -1633,7 +1633,7 @@ class LLAdvancedTestFemale : public view_listener_t
class LLAdvancedForceParamsToDefault : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLAgent::clearVisualParams(NULL);
return true;
@@ -1658,7 +1658,7 @@ static void set_all_animation_time_factors(F32 time_factor)
class LLAdvancedAnimTenFaster : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
//LL_INFOS() << "LLAdvancedAnimTenFaster" << LL_ENDL;
F32 time_factor = LLMotionController::getCurrentTimeFactor();
@@ -1670,7 +1670,7 @@ class LLAdvancedAnimTenFaster : public view_listener_t
class LLAdvancedAnimTenSlower : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
//LL_INFOS() << "LLAdvancedAnimTenSlower" << LL_ENDL;
F32 time_factor = LLMotionController::getCurrentTimeFactor();
@@ -1682,7 +1682,7 @@ class LLAdvancedAnimTenSlower : public view_listener_t
class LLAdvancedAnimResetAll : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
set_all_animation_time_factors(1.f);
return true;
@@ -1697,7 +1697,7 @@ class LLAdvancedAnimResetAll : public view_listener_t
class LLAdvancedReloadVertexShader : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
reload_vertex_shader(NULL);
return true;
@@ -1713,7 +1713,7 @@ class LLAdvancedReloadVertexShader : public view_listener_t
class LLAdvancedToggleAnimationInfo : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar::sShowAnimationDebug = !(LLVOAvatar::sShowAnimationDebug);
return true;
@@ -1722,7 +1722,7 @@ class LLAdvancedToggleAnimationInfo : public view_listener_t
class LLAdvancedCheckAnimationInfo : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLVOAvatar::sShowAnimationDebug;
return new_value;
@@ -1737,7 +1737,7 @@ class LLAdvancedCheckAnimationInfo : public view_listener_t
class LLAdvancedToggleShowLookAt : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool value = !gSavedSettings.getBOOL("AlchemyLookAtShow");
gSavedSettings.setBOOL("AlchemyLookAtShow", value);
@@ -1747,7 +1747,7 @@ class LLAdvancedToggleShowLookAt : public view_listener_t
class LLAdvancedCheckShowLookAt : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gSavedSettings.getBOOL("AlchemyLookAtShow");
return new_value;
@@ -1763,7 +1763,7 @@ class LLAdvancedCheckShowLookAt : public view_listener_t
class LLAdvancedToggleShowPointAt : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLHUDEffectPointAt::sDebugPointAt = !(LLHUDEffectPointAt::sDebugPointAt);
return true;
@@ -1772,7 +1772,7 @@ class LLAdvancedToggleShowPointAt : public view_listener_t
class LLAdvancedCheckShowPointAt : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLHUDEffectPointAt::sDebugPointAt;
return new_value;
@@ -1788,7 +1788,7 @@ class LLAdvancedCheckShowPointAt : public view_listener_t
class LLAdvancedToggleDebugJointUpdates : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar::sJointDebug = !(LLVOAvatar::sJointDebug);
return true;
@@ -1797,7 +1797,7 @@ class LLAdvancedToggleDebugJointUpdates : public view_listener_t
class LLAdvancedCheckDebugJointUpdates : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLVOAvatar::sJointDebug;
return new_value;
@@ -1813,7 +1813,7 @@ class LLAdvancedCheckDebugJointUpdates : public view_listener_t
class LLAdvancedToggleDisableLOD : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLViewerJoint::sDisableLOD = !(LLViewerJoint::sDisableLOD);
return true;
@@ -1822,7 +1822,7 @@ class LLAdvancedToggleDisableLOD : public view_listener_t
class LLAdvancedCheckDisableLOD : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLViewerJoint::sDisableLOD;
return new_value;
@@ -1838,7 +1838,7 @@ class LLAdvancedCheckDisableLOD : public view_listener_t
class LLAdvancedToggleDebugCharacterVis : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar::sDebugInvisible = !(LLVOAvatar::sDebugInvisible);
return true;
@@ -1847,7 +1847,7 @@ class LLAdvancedToggleDebugCharacterVis : public view_listener_t
class LLAdvancedCheckDebugCharacterVis : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLVOAvatar::sDebugInvisible;
return new_value;
@@ -1862,7 +1862,7 @@ class LLAdvancedCheckDebugCharacterVis : public view_listener_t
class LLAdvancedDumpAttachments : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_dump_attachments(NULL);
return true;
@@ -1878,7 +1878,7 @@ class LLAdvancedDumpAttachments : public view_listener_t
class LLAdvancedRebakeTextures : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_rebake_textures(NULL);
return true;
@@ -1894,7 +1894,7 @@ class LLAdvancedRebakeTextures : public view_listener_t
class LLAdvancedDebugAvatarTextures : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
#if LINDEN_RULES
if (gAgent.isGodlike())
@@ -1913,7 +1913,7 @@ class LLAdvancedDebugAvatarTextures : public view_listener_t
class LLAdvancedDumpAvatarLocalTextures : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
#ifndef LL_RELEASE_FOR_DOWNLOAD
handle_dump_avatar_local_textures(NULL);
@@ -1931,7 +1931,7 @@ class LLAdvancedDumpAvatarLocalTextures : public view_listener_t
class LLAdvancedEnableMessageLog : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_viewer_enable_message_log(NULL);
return true;
@@ -1940,7 +1940,7 @@ class LLAdvancedEnableMessageLog : public view_listener_t
class LLAdvancedDisableMessageLog : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_viewer_disable_message_log(NULL);
return true;
@@ -1954,7 +1954,7 @@ class LLAdvancedDisableMessageLog : public view_listener_t
class LLAdvancedDropPacket : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gMessageSystem->mPacketRing.dropPackets(1);
return true;
@@ -1969,7 +1969,7 @@ class LLAdvancedDropPacket : public view_listener_t
class LLAdvancedViewerEventRecorder : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string command = userdata.asString();
if ("start playback" == command)
@@ -2007,7 +2007,7 @@ class LLAdvancedViewerEventRecorder : public view_listener_t
class LLAdvancedAgentPilot : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string command = userdata.asString();
if ("start playback" == command)
@@ -2041,7 +2041,7 @@ class LLAdvancedAgentPilot : public view_listener_t
class LLAdvancedToggleAgentPilotLoop : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gAgentPilot.setLoop(!gAgentPilot.getLoop());
return true;
@@ -2050,7 +2050,7 @@ class LLAdvancedToggleAgentPilotLoop : public view_listener_t
class LLAdvancedCheckAgentPilotLoop : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gAgentPilot.getLoop();
return new_value;
@@ -2065,7 +2065,7 @@ class LLAdvancedCheckAgentPilotLoop : public view_listener_t
class LLAdvancedToggleShowObjectUpdates : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gShowObjectUpdates = !(gShowObjectUpdates);
return true;
@@ -2074,7 +2074,7 @@ class LLAdvancedToggleShowObjectUpdates : public view_listener_t
class LLAdvancedCheckShowObjectUpdates : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gShowObjectUpdates;
return new_value;
@@ -2091,7 +2091,7 @@ class LLAdvancedCheckShowObjectUpdates : public view_listener_t
class LLAdvancedCheckViewerUpdates : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLFloaterAboutUtil::checkUpdatesAndNotify();
return true;
@@ -2106,7 +2106,7 @@ class LLAdvancedCheckViewerUpdates : public view_listener_t
class LLAdvancedCompressImage : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_compress_image(NULL);
return true;
@@ -2121,7 +2121,7 @@ class LLAdvancedCompressImage : public view_listener_t
class LLAdvancedShowDebugSettings : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLFloaterReg::showInstance("settings_debug",userdata);
return true;
@@ -2136,7 +2136,7 @@ class LLAdvancedShowDebugSettings : public view_listener_t
class LLAdvancedEnableViewAdminOptions : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
// Don't enable in god mode since the admin menu is shown anyway.
// Only enable if the user has set the appropriate debug setting.
@@ -2147,7 +2147,7 @@ class LLAdvancedEnableViewAdminOptions : public view_listener_t
class LLAdvancedToggleViewAdminOptions : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_admin_override_toggle(NULL);
return true;
@@ -2156,7 +2156,7 @@ class LLAdvancedToggleViewAdminOptions : public view_listener_t
class LLAdvancedToggleVisualLeakDetector : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_visual_leak_detector_toggle(NULL);
return true;
@@ -2165,7 +2165,7 @@ class LLAdvancedToggleVisualLeakDetector : public view_listener_t
class LLAdvancedCheckViewAdminOptions : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = check_admin_override(NULL) || gAgent.isGodlike();
return new_value;
@@ -2177,7 +2177,7 @@ class LLAdvancedCheckViewAdminOptions : public view_listener_t
/////////////////////////////////////
class LLAdvancedEnableObjectObjectOcclusion: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gGLManager.mHasOcclusionQuery; // && LLFeatureManager::getInstance()->isFeatureAvailable(userdata.asString());
@@ -2190,7 +2190,7 @@ class LLAdvancedEnableObjectObjectOcclusion: public view_listener_t
/////////////////////////////////////
class LLAdvancedEnableRenderFBO: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gGLManager.mHasFramebufferObject;
return new_value;
@@ -2202,7 +2202,7 @@ class LLAdvancedEnableRenderFBO: public view_listener_t
/////////////////////////////////////
class LLAdvancedEnableRenderDeferred: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gGLManager.mHasFramebufferObject && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_WINDLIGHT) > 1 &&
LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) > 0;
@@ -2215,7 +2215,7 @@ class LLAdvancedEnableRenderDeferred: public view_listener_t
/////////////////////////////////////
class LLAdvancedEnableRenderDeferredOptions: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gGLManager.mHasFramebufferObject && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_WINDLIGHT) > 1 &&
LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) > 0 && gSavedSettings.getBOOL("RenderDeferred");
@@ -2232,7 +2232,7 @@ class LLAdvancedEnableRenderDeferredOptions: public view_listener_t
class LLAdvancedRequestAdminStatus : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_god_mode(NULL);
return true;
@@ -2241,7 +2241,7 @@ class LLAdvancedRequestAdminStatus : public view_listener_t
class LLAdvancedLeaveAdminStatus : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_leave_god_mode(NULL);
return true;
@@ -2255,7 +2255,7 @@ class LLAdvancedLeaveAdminStatus : public view_listener_t
class LLAdvancedForceErrorBreakpoint : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
force_error_breakpoint(NULL);
return true;
@@ -2264,7 +2264,7 @@ class LLAdvancedForceErrorBreakpoint : public view_listener_t
class LLAdvancedForceErrorLlerror : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
force_error_llerror(NULL);
return true;
@@ -2272,7 +2272,7 @@ class LLAdvancedForceErrorLlerror : public view_listener_t
};
class LLAdvancedForceErrorBadMemoryAccess : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
force_error_bad_memory_access(NULL);
return true;
@@ -2281,7 +2281,7 @@ class LLAdvancedForceErrorBadMemoryAccess : public view_listener_t
class LLAdvancedForceErrorInfiniteLoop : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
force_error_infinite_loop(NULL);
return true;
@@ -2290,7 +2290,7 @@ class LLAdvancedForceErrorInfiniteLoop : public view_listener_t
class LLAdvancedForceErrorSoftwareException : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
force_error_software_exception(NULL);
return true;
@@ -2299,7 +2299,7 @@ class LLAdvancedForceErrorSoftwareException : public view_listener_t
class LLAdvancedForceErrorDriverCrash : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
force_error_driver_crash(NULL);
return true;
@@ -2308,7 +2308,7 @@ class LLAdvancedForceErrorDriverCrash : public view_listener_t
class LLAdvancedForceErrorDisconnectViewer : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_disconnect_viewer(NULL);
return true;
@@ -2320,7 +2320,7 @@ class LLAdvancedForceErrorDisconnectViewer : public view_listener_t
class LLAdvancedHandleToggleHackedGodmode : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_toggle_hacked_godmode(NULL);
return true;
@@ -2329,7 +2329,7 @@ class LLAdvancedHandleToggleHackedGodmode : public view_listener_t
class LLAdvancedCheckToggleHackedGodmode : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
check_toggle_hacked_godmode(NULL);
return true;
@@ -2338,7 +2338,7 @@ class LLAdvancedCheckToggleHackedGodmode : public view_listener_t
class LLAdvancedEnableToggleHackedGodmode : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = enable_toggle_hacked_godmode(NULL);
return new_value;
@@ -2359,7 +2359,7 @@ class LLAdvancedEnableToggleHackedGodmode : public view_listener_t
class LLDevelopCheckLoggingLevel : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
U32 level = userdata.asInteger();
return (static_cast<LLError::ELevel>(level) == LLError::getDefaultLevel());
@@ -2368,7 +2368,7 @@ class LLDevelopCheckLoggingLevel : public view_listener_t
class LLDevelopSetLoggingLevel : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
U32 level = userdata.asInteger();
LLError::setDefaultLevel(static_cast<LLError::ELevel>(level));
@@ -2378,7 +2378,7 @@ class LLDevelopSetLoggingLevel : public view_listener_t
class LLDevelopTextureFetchDebugger : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return gSavedSettings.getBOOL("TextureFetchDebuggerEnabled");
}
@@ -2391,7 +2391,7 @@ class LLDevelopTextureFetchDebugger : public view_listener_t
// Admin > Object
class LLAdminForceTakeCopy : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
force_take_copy(NULL);
return true;
@@ -2400,7 +2400,7 @@ class LLAdminForceTakeCopy : public view_listener_t
class LLAdminHandleObjectOwnerSelf : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_object_owner_self(NULL);
return true;
@@ -2408,7 +2408,7 @@ class LLAdminHandleObjectOwnerSelf : public view_listener_t
};
class LLAdminHandleObjectOwnerPermissive : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_object_owner_permissive(NULL);
return true;
@@ -2417,7 +2417,7 @@ class LLAdminHandleObjectOwnerPermissive : public view_listener_t
class LLAdminHandleForceDelete : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_force_delete(NULL);
return true;
@@ -2426,7 +2426,7 @@ class LLAdminHandleForceDelete : public view_listener_t
class LLAdminHandleObjectLock : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_object_lock(NULL);
return true;
@@ -2435,7 +2435,7 @@ class LLAdminHandleObjectLock : public view_listener_t
class LLAdminHandleObjectAssetIDs: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_object_asset_ids(NULL);
return true;
@@ -2445,7 +2445,7 @@ class LLAdminHandleObjectAssetIDs: public view_listener_t
//Admin >Parcel
class LLAdminHandleForceParcelOwnerToMe: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_force_parcel_owner_to_me(NULL);
return true;
@@ -2453,7 +2453,7 @@ class LLAdminHandleForceParcelOwnerToMe: public view_listener_t
};
class LLAdminHandleForceParcelToContent: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_force_parcel_to_content(NULL);
return true;
@@ -2461,7 +2461,7 @@ class LLAdminHandleForceParcelToContent: public view_listener_t
};
class LLAdminHandleClaimPublicLand: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_claim_public_land(NULL);
return true;
@@ -2471,7 +2471,7 @@ class LLAdminHandleClaimPublicLand: public view_listener_t
// Admin > Region
class LLAdminHandleRegionDumpTempAssetData: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_region_dump_temp_asset_data(NULL);
return true;
@@ -2481,7 +2481,7 @@ class LLAdminHandleRegionDumpTempAssetData: public view_listener_t
class LLAdminOnSaveState: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLPanelRegionTools::onSaveState(NULL);
return true;
@@ -2534,7 +2534,7 @@ void cleanup_menus()
class LLObjectReportAbuse : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (objectp)
@@ -2548,7 +2548,7 @@ class LLObjectReportAbuse : public view_listener_t
// Enabled it you clicked an object
class LLObjectEnableReportAbuse : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLSelectMgr::getInstance()->getSelection()->getObjectCount() != 0;
return new_value;
@@ -2661,7 +2661,7 @@ bool enable_object_open()
class LLViewJoystickFlycam : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_toggle_flycam();
return true;
@@ -2670,7 +2670,7 @@ class LLViewJoystickFlycam : public view_listener_t
class LLViewCheckJoystickFlycam : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLViewerJoystick::getInstance()->getOverrideCamera();
return new_value;
@@ -2684,7 +2684,7 @@ void handle_toggle_flycam()
class LLObjectBuild : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if (gAgentCamera.getFocusOnAvatar() && !LLToolMgr::getInstance()->inEdit() && gSavedSettings.getBOOL("EditCameraMovement") )
{
@@ -2775,7 +2775,7 @@ void handle_object_inspect()
//---------------------------------------------------------------------------
class LLLandBuild : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLViewerParcelMgr::getInstance()->deselectLand();
@@ -2807,7 +2807,7 @@ class LLLandBuild : public view_listener_t
class LLLandBuyPass : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLPanelLandGeneral::onClickBuyPass((void *)FALSE);
return true;
@@ -2816,7 +2816,7 @@ class LLLandBuyPass : public view_listener_t
class LLLandEnableBuyPass : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLPanelLandGeneral::enableBuyPass(NULL);
return new_value;
@@ -2906,7 +2906,7 @@ bool enable_object_select_in_pathfinding_characters()
class LLSelfRemoveAllAttachments : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLAppearanceMgr::instance().removeAllAttachmentsFromAvatar();
return true;
@@ -2915,7 +2915,7 @@ class LLSelfRemoveAllAttachments : public view_listener_t
class LLSelfEnableRemoveAllAttachments : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = false;
if (isAgentAvatarValid())
@@ -3005,7 +3005,7 @@ bool enable_object_unmute()
// 0 = normal, 1 = always, 2 = never
class LLAvatarCheckImpostorMode : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (!object) return false;
@@ -3031,7 +3031,7 @@ class LLAvatarCheckImpostorMode : public view_listener_t
// 0 = normal, 1 = always, 2 = never
class LLAvatarSetImpostorMode : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (!object) return false;
@@ -3063,7 +3063,7 @@ class LLAvatarSetImpostorMode : public view_listener_t
class LLObjectMute : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (!object) return true;
@@ -3150,7 +3150,7 @@ bool handle_go_to()
class LLGoToObject : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return handle_go_to();
}
@@ -3158,7 +3158,7 @@ class LLGoToObject : public view_listener_t
class LLAvatarReportAbuse : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(avatar)
@@ -3195,7 +3195,7 @@ void handle_avatar_freeze(const LLSD& avatar_id)
class LLAvatarVisibleDebug : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return gAgent.isGodlike();
}
@@ -3203,7 +3203,7 @@ class LLAvatarVisibleDebug : public view_listener_t
class LLAvatarDebug : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if( avatar )
@@ -3508,7 +3508,7 @@ void handle_dump_focus()
class LLSelfStandUp : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gAgent.standUp();
return true;
@@ -3522,7 +3522,7 @@ bool enable_standup_self()
class LLSelfSitDown : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if (!gAgentAvatarp->isSitting())
{
@@ -3543,8 +3543,8 @@ bool enable_sitdown_self()
class LLCheckPanelPeopleTab : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
- {
+ bool handleEvent(const LLSD& userdata) override
+ {
std::string panel_name = userdata.asString();
LLPanel *panel = LLFloaterSidePanelContainer::getPanel("people", panel_name);
@@ -3558,7 +3558,7 @@ class LLCheckPanelPeopleTab : public view_listener_t
// Toggle one of "People" panel tabs in side tray.
class LLTogglePanelPeopleTab : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string panel_name = userdata.asString();
@@ -3770,7 +3770,7 @@ bool LLHaveCallingcard::operator()(LLInventoryCategory* cat,
// Enable a menu item when you don't have someone's card.
class LLAvatarEnableAddFriend : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
bool new_value = avatar && !LLAvatarActions::isFriend(avatar->getID());
@@ -3805,7 +3805,7 @@ void request_friendship(const LLUUID& dest_id)
class LLEditEnableCustomizeAvatar : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gAgentWearables.areWearablesLoaded();
return new_value;
@@ -3814,7 +3814,7 @@ class LLEditEnableCustomizeAvatar : public view_listener_t
class LLEnableEditShape : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return gAgentWearables.isWearableModifiable(LLWearableType::WT_SHAPE, 0);
}
@@ -3822,7 +3822,7 @@ class LLEnableEditShape : public view_listener_t
class LLEnableEditPhysics : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
//return gAgentWearables.isWearableModifiable(LLWearableType::WT_SHAPE, 0);
return TRUE;
@@ -3891,7 +3891,7 @@ void near_sit_down_point(BOOL success, void *)
class LLLandSit : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gAgent.standUp();
LLViewerParcelMgr::getInstance()->deselectLand();
@@ -3944,7 +3944,7 @@ void handle_reset_view()
class LLViewResetView : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
handle_reset_view();
return true;
@@ -3965,7 +3965,7 @@ void reset_view_final( BOOL proceed )
class LLViewLookAtLastChatter : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gAgentCamera.lookAtLastChat();
return true;
@@ -3974,7 +3974,7 @@ class LLViewLookAtLastChatter : public view_listener_t
class LLViewMouselook : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if (!gAgentCamera.cameraMouselook())
{
@@ -3990,7 +3990,7 @@ class LLViewMouselook : public view_listener_t
class LLViewDefaultUISize : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gSavedSettings.setF32("UIScaleFactor", 1.0f);
gSavedSettings.setBOOL("UIAutoScale", FALSE);
@@ -4001,7 +4001,7 @@ class LLViewDefaultUISize : public view_listener_t
class LLViewToggleUI : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if(gAgentCamera.getCameraMode() != CAMERA_MODE_MOUSELOOK)
{
@@ -4438,7 +4438,7 @@ public:
LLObjectReturn() : mFirstRegion(NULL) {}
private:
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if (LLSelectMgr::getInstance()->getSelection()->isEmpty()) return true;
@@ -4481,7 +4481,7 @@ private:
// over land you own.
class LLObjectEnableReturn : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if (LLSelectMgr::getInstance()->getSelection()->isEmpty())
{
@@ -4759,7 +4759,7 @@ bool enable_how_to_visible(const LLSD& param)
class LLToolsEnableBuyOrTake : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool is_buy = is_selection_buy_not_take();
bool new_value = is_buy ? enable_buy_object() : enable_take();
@@ -4920,7 +4920,7 @@ BOOL sitting_on_selection()
class LLToolsSaveToObjectInventory : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
if(node && (node->mValid) && (!node->mFromTaskID.isNull()))
@@ -4934,7 +4934,7 @@ class LLToolsSaveToObjectInventory : public view_listener_t
class LLToolsEnablePathfinding : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return (LLPathfindingManager::getInstance() != NULL) && LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion();
}
@@ -4942,7 +4942,7 @@ class LLToolsEnablePathfinding : public view_listener_t
class LLToolsEnablePathfindingView : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return (LLPathfindingManager::getInstance() != NULL) && LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLPathfindingManager::getInstance()->isPathfindingViewEnabled();
}
@@ -4950,7 +4950,7 @@ class LLToolsEnablePathfindingView : public view_listener_t
class LLToolsDoPathfindingRebakeRegion : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool hasPathfinding = (LLPathfindingManager::getInstance() != NULL);
@@ -4965,7 +4965,7 @@ class LLToolsDoPathfindingRebakeRegion : public view_listener_t
class LLToolsEnablePathfindingRebakeRegion : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool returnValue = false;
@@ -4982,7 +4982,7 @@ class LLToolsEnablePathfindingRebakeRegion : public view_listener_t
// Round the position of all root objects to the grid
class LLToolsSnapObjectXY : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
F64 snap_size = (F64)gSavedSettings.getF32("GridResolution");
@@ -5029,7 +5029,7 @@ class LLToolsSnapObjectXY : public view_listener_t
// Determine if the option to cycle between linked prims is shown
class LLToolsEnableSelectNextPart : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = (!LLSelectMgr::getInstance()->getSelection()->isEmpty()
&& (gSavedSettings.getBOOL("EditLinkedParts")
@@ -5043,7 +5043,7 @@ class LLToolsEnableSelectNextPart : public view_listener_t
// resis. Need link position added to sim messages to address this.
class LLToolsSelectNextPartFace : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool cycle_faces = LLToolFace::getInstance() == LLToolMgr::getInstance()->getCurrentTool();
bool cycle_linked = gSavedSettings.getBOOL("EditLinkedParts");
@@ -5197,7 +5197,7 @@ class LLToolsSelectNextPartFace : public view_listener_t
class LLToolsStopAllAnimations : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gAgent.stopCurrentAnimations();
return true;
@@ -5206,7 +5206,7 @@ class LLToolsStopAllAnimations : public view_listener_t
class LLToolsReleaseKeys : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gAgent.forceReleaseControls();
@@ -5216,7 +5216,7 @@ class LLToolsReleaseKeys : public view_listener_t
class LLToolsEnableReleaseKeys : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return gAgent.anyControlGrabbed();
}
@@ -5225,7 +5225,7 @@ class LLToolsEnableReleaseKeys : public view_listener_t
class LLEditEnableCut : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canCut();
return new_value;
@@ -5234,7 +5234,7 @@ class LLEditEnableCut : public view_listener_t
class LLEditCut : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if( LLEditMenuHandler::gEditMenuHandler )
{
@@ -5246,7 +5246,7 @@ class LLEditCut : public view_listener_t
class LLEditEnableCopy : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canCopy();
return new_value;
@@ -5255,7 +5255,7 @@ class LLEditEnableCopy : public view_listener_t
class LLEditCopy : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if( LLEditMenuHandler::gEditMenuHandler )
{
@@ -5267,7 +5267,7 @@ class LLEditCopy : public view_listener_t
class LLEditEnablePaste : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canPaste();
return new_value;
@@ -5276,7 +5276,7 @@ class LLEditEnablePaste : public view_listener_t
class LLEditPaste : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if( LLEditMenuHandler::gEditMenuHandler )
{
@@ -5288,7 +5288,7 @@ class LLEditPaste : public view_listener_t
class LLEditEnableDelete : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canDoDelete();
return new_value;
@@ -5297,7 +5297,7 @@ class LLEditEnableDelete : public view_listener_t
class LLEditDelete : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
// If a text field can do a deletion, it gets precedence over deleting
// an object in the world.
@@ -5476,7 +5476,7 @@ void handle_force_delete(void*)
class LLViewEnableJoystickFlycam : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = (gSavedSettings.getBOOL("JoystickEnabled") && gSavedSettings.getBOOL("JoystickFlycamEnabled"));
return new_value;
@@ -5485,7 +5485,7 @@ class LLViewEnableJoystickFlycam : public view_listener_t
class LLViewEnableLastChatter : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
// *TODO: add check that last chatter is in range
bool new_value = (gAgentCamera.cameraThirdPerson() && gAgent.getLastChatter().notNull());
@@ -5495,7 +5495,7 @@ class LLViewEnableLastChatter : public view_listener_t
class LLEditEnableDeselect : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canDeselect();
return new_value;
@@ -5504,7 +5504,7 @@ class LLEditEnableDeselect : public view_listener_t
class LLEditDeselect : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if( LLEditMenuHandler::gEditMenuHandler )
{
@@ -5516,7 +5516,7 @@ class LLEditDeselect : public view_listener_t
class LLEditEnableSelectAll : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canSelectAll();
return new_value;
@@ -5526,7 +5526,7 @@ class LLEditEnableSelectAll : public view_listener_t
class LLEditSelectAll : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if( LLEditMenuHandler::gEditMenuHandler )
{
@@ -5539,7 +5539,7 @@ class LLEditSelectAll : public view_listener_t
class LLEditEnableUndo : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canUndo();
return new_value;
@@ -5548,7 +5548,7 @@ class LLEditEnableUndo : public view_listener_t
class LLEditUndo : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if( LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canUndo() )
{
@@ -5560,7 +5560,7 @@ class LLEditUndo : public view_listener_t
class LLEditEnableRedo : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canRedo();
return new_value;
@@ -5569,7 +5569,7 @@ class LLEditEnableRedo : public view_listener_t
class LLEditRedo : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if( LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canRedo() )
{
@@ -5684,7 +5684,7 @@ void toggle_debug_menus(void*)
class LLCommunicateNearbyChat : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLFloaterIMContainer* im_box = LLFloaterIMContainer::getInstance();
bool nearby_visible = LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")->isInVisibleChain();
@@ -5702,7 +5702,7 @@ class LLCommunicateNearbyChat : public view_listener_t
class LLWorldSetHomeLocation : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
// we just send the message and let the server check for failure cases
// server will echo back a "Home position set." alert if it succeeds
@@ -5714,7 +5714,7 @@ class LLWorldSetHomeLocation : public view_listener_t
class LLWorldTeleportHome : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gAgent.teleportHome();
return true;
@@ -5723,7 +5723,7 @@ class LLWorldTeleportHome : public view_listener_t
class LLWorldAlwaysRun : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
// as well as altering the default walk-vs-run state,
// we also change the *current* walk-vs-run state.
@@ -5750,7 +5750,7 @@ class LLWorldAlwaysRun : public view_listener_t
class LLWorldCheckAlwaysRun : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gAgent.getAlwaysRun();
return new_value;
@@ -5759,7 +5759,7 @@ class LLWorldCheckAlwaysRun : public view_listener_t
class LLWorldSetAway : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if (gAgent.getAFK())
{
@@ -5775,7 +5775,7 @@ class LLWorldSetAway : public view_listener_t
class LLWorldSetDoNotDisturb : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if (gAgent.isDoNotDisturb())
{
@@ -5792,7 +5792,7 @@ class LLWorldSetDoNotDisturb : public view_listener_t
class LLWorldCreateLandmark : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLFloaterSidePanelContainer::showPanel("places", LLSD().with("type", "create_landmark"));
@@ -5802,7 +5802,7 @@ class LLWorldCreateLandmark : public view_listener_t
class LLWorldPlaceProfile : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLFloaterSidePanelContainer::showPanel("places", LLSD().with("type", "agent"));
@@ -5876,7 +5876,7 @@ void handle_zoom_to_object(LLUUID object_id)
class LLAvatarInviteToGroup : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(avatar)
@@ -5889,7 +5889,7 @@ class LLAvatarInviteToGroup : public view_listener_t
class LLAvatarAddFriend : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(avatar && !LLAvatarActions::isFriend(avatar->getID()))
@@ -5903,7 +5903,7 @@ class LLAvatarAddFriend : public view_listener_t
class LLAvatarToggleMyProfile : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLFloater* instance = LLAvatarActions::getProfileFloater(gAgent.getID());
if (LLFloater::isMinimized(instance))
@@ -5929,7 +5929,7 @@ class LLAvatarToggleMyProfile : public view_listener_t
class LLAvatarResetSkeleton: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(avatar)
@@ -5942,7 +5942,7 @@ class LLAvatarResetSkeleton: public view_listener_t
class LLAvatarResetSkeletonAndAnimations : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
if (avatar)
@@ -5955,7 +5955,7 @@ class LLAvatarResetSkeletonAndAnimations : public view_listener_t
class LLAvatarAddContact : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(avatar)
@@ -6130,7 +6130,7 @@ void handle_buy_currency()
class LLFloaterVisible : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string floater_name = userdata.asString();
bool new_value = false;
@@ -6143,7 +6143,7 @@ class LLFloaterVisible : public view_listener_t
class LLShowHelp : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string help_topic = userdata.asString();
LLViewerHelp* vhelp = LLViewerHelp::getInstance();
@@ -6154,7 +6154,7 @@ class LLShowHelp : public view_listener_t
class LLToggleHelp : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLFloater* help_browser = (LLFloaterReg::findInstance("help_browser"));
if (help_browser && help_browser->isInVisibleChain())
@@ -6173,7 +6173,7 @@ class LLToggleHelp : public view_listener_t
class LLToggleSpeak : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVoiceClient::getInstance()->toggleUserPTTState();
return true;
@@ -6181,7 +6181,7 @@ class LLToggleSpeak : public view_listener_t
};
class LLShowSidetrayPanel : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string floater_name = userdata.asString();
@@ -6203,7 +6203,7 @@ class LLShowSidetrayPanel : public view_listener_t
class LLSidetrayPanelVisible : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string floater_name = userdata.asString();
// Toggle the panel
@@ -6232,7 +6232,7 @@ bool callback_show_url(const LLSD& notification, const LLSD& response)
class LLPromptShowURL : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string param = userdata.asString();
std::string::size_type offset = param.find(',');
@@ -6272,7 +6272,7 @@ bool callback_show_file(const LLSD& notification, const LLSD& response)
class LLPromptShowFile : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string param = userdata.asString();
std::string::size_type offset = param.find(',');
@@ -6295,7 +6295,7 @@ class LLPromptShowFile : public view_listener_t
class LLShowAgentProfile : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLUUID agent_id;
if (userdata.asString() == "agent")
@@ -6326,7 +6326,7 @@ class LLShowAgentProfile : public view_listener_t
class LLToggleAgentProfile : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLUUID agent_id;
if (userdata.asString() == "agent")
@@ -6364,7 +6364,7 @@ class LLToggleAgentProfile : public view_listener_t
class LLLandEdit : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if (gAgentCamera.getFocusOnAvatar() && gSavedSettings.getBOOL("EditCameraMovement") )
{
@@ -6394,7 +6394,7 @@ class LLLandEdit : public view_listener_t
class LLMuteParticle : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLUUID id = LLToolPie::getInstance()->getPick().mParticleOwnerID;
@@ -6421,7 +6421,7 @@ class LLMuteParticle : public view_listener_t
class LLWorldEnableBuyLand : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLViewerParcelMgr::getInstance()->canAgentBuyParcel(
LLViewerParcelMgr::getInstance()->selectionEmpty()
@@ -6455,7 +6455,7 @@ public:
static void setObjectSelection(LLObjectSelectionHandle selection) { sObjectSelection = selection; }
private:
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
setObjectSelection(LLSelectMgr::getInstance()->getSelection());
LLViewerObject* selectedObject = sObjectSelection->getFirstRootObject();
@@ -6607,7 +6607,7 @@ void callback_attachment_drop(const LLSD& notification, const LLSD& response)
class LLAttachmentDrop : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLSD payload;
LLViewerObject *object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
@@ -6630,7 +6630,7 @@ class LLAttachmentDrop : public view_listener_t
// called from avatar pie menu
class LLAttachmentDetachFromPoint : public view_listener_t
{
- bool handleEvent(const LLSD& user_data)
+ bool handleEvent(const LLSD& user_data) override
{
uuid_vec_t ids_to_remove;
const LLViewerJointAttachment *attachment = get_if_there(gAgentAvatarp->mAttachmentPoints, user_data.asInteger(), (LLViewerJointAttachment*)NULL);
@@ -6685,7 +6685,7 @@ static bool onEnableAttachmentLabel(LLUICtrl* ctrl, const LLSD& data)
class LLAttachmentDetach : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
// Called when the user clicked on an object attached to them
// and selected "Detach".
@@ -6740,7 +6740,7 @@ public:
virtual ~LLWornItemFetchedObserver() {}
protected:
- virtual void done()
+ void done() override
{
gMenuAttachmentSelf->buildDrawLabels();
gInventory.removeObserver(this);
@@ -6751,7 +6751,7 @@ protected:
// You can only drop items on parcels where you can build.
class LLAttachmentEnableDrop : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
BOOL can_build = gAgent.isGodlike() || (LLViewerParcelMgr::getInstance()->allowAgentBuild());
@@ -6835,7 +6835,7 @@ BOOL enable_detach(const LLSD&)
class LLAttachmentEnableDetach : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = enable_detach();
return new_value;
@@ -6899,7 +6899,7 @@ BOOL object_is_wearable()
class LLAttachmentPointFilled : public view_listener_t
{
- bool handleEvent(const LLSD& user_data)
+ bool handleEvent(const LLSD& user_data) override
{
bool enable = false;
LLVOAvatar::attachment_map_t::iterator found_it = gAgentAvatarp->mAttachmentPoints.find(user_data.asInteger());
@@ -6913,7 +6913,7 @@ class LLAttachmentPointFilled : public view_listener_t
class LLAvatarSendIM : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(avatar)
@@ -6926,7 +6926,7 @@ class LLAvatarSendIM : public view_listener_t
class LLAvatarCall : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(avatar)
@@ -6944,8 +6944,9 @@ namespace
BOOL scripted;
BOOL modifiable;
LLFloaterScriptQueue* mQueue;
- QueueObjects(LLFloaterScriptQueue* q) : mQueue(q), scripted(FALSE), modifiable(FALSE) {}
- virtual bool apply(LLSelectNode* node)
+ QueueObjects(LLFloaterScriptQueue* q) : scripted(FALSE), modifiable(FALSE), mQueue(q) {}
+
+ bool apply(LLSelectNode* node) override
{
LLViewerObject* obj = node->getObject();
if (!obj)
@@ -7002,7 +7003,7 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& msg)
class LLToolsSelectedScriptAction : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string action = userdata.asString();
bool mono = false;
@@ -7197,7 +7198,7 @@ void handle_dump_attachments(void*)
// these are used in the gl menus to set control values, generically.
class LLToggleControl : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string control_name = userdata.asString();
BOOL checked = gSavedSettings.getBOOL( control_name );
@@ -7208,7 +7209,7 @@ class LLToggleControl : public view_listener_t
class LLCheckControl : public view_listener_t
{
- bool handleEvent( const LLSD& userdata)
+ bool handleEvent( const LLSD& userdata) override
{
std::string callback_data = userdata.asString();
bool new_value = gSavedSettings.getBOOL(callback_data);
@@ -7220,7 +7221,7 @@ class LLCheckControl : public view_listener_t
class LLAdvancedCheckRenderShadowOption: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string control_name = userdata.asString();
S32 current_shadow_level = gSavedSettings.getS32(control_name);
@@ -7237,7 +7238,7 @@ class LLAdvancedCheckRenderShadowOption: public view_listener_t
class LLAdvancedClickRenderShadowOption: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string control_name = userdata.asString();
S32 current_shadow_level = gSavedSettings.getS32(control_name);
@@ -7255,7 +7256,7 @@ class LLAdvancedClickRenderShadowOption: public view_listener_t
class LLAdvancedClickRenderProfile: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gShaderProfileFrame = TRUE;
return true;
@@ -7266,7 +7267,7 @@ F32 gpu_benchmark();
class LLAdvancedClickRenderBenchmark: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gpu_benchmark();
return true;
@@ -7285,7 +7286,7 @@ void menu_toggle_attached_particles(void* user_data)
class LLAdvancedHandleAttachedLightParticles: public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string control_name = userdata.asString();
@@ -7308,7 +7309,7 @@ class LLAdvancedHandleAttachedLightParticles: public view_listener_t
class LLSomethingSelected : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = !(LLSelectMgr::getInstance()->getSelection()->isEmpty());
return new_value;
@@ -7317,7 +7318,7 @@ class LLSomethingSelected : public view_listener_t
class LLSomethingSelectedNoHUD : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
bool new_value = !(selection->isEmpty()) && !(selection->getSelectType() == SELECT_TYPE_HUD);
@@ -7332,7 +7333,7 @@ static bool is_editable_selected()
class LLEditableSelected : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return is_editable_selected();
}
@@ -7340,7 +7341,7 @@ class LLEditableSelected : public view_listener_t
class LLEditableSelectedMono : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = false;
LLViewerRegion* region = gAgent.getRegion();
@@ -7369,7 +7370,7 @@ bool enable_object_take_copy()
{
struct f : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* obj)
+ bool apply(LLViewerObject* obj) override
{
return (!obj->permCopy() || obj->isAttachment());
}
@@ -7391,8 +7392,8 @@ class LLHasAsset : public LLInventoryCollectFunctor
public:
LLHasAsset(const LLUUID& id) : mAssetID(id), mHasAsset(FALSE) {}
virtual ~LLHasAsset() {}
- virtual bool operator()(LLInventoryCategory* cat,
- LLInventoryItem* item);
+ bool operator()(LLInventoryCategory* cat,
+ LLInventoryItem* item) override;
BOOL hasAsset() const { return mHasAsset; }
protected:
@@ -7428,7 +7429,7 @@ BOOL enable_save_into_task_inventory(void*)
class LLToolsEnableSaveToObjectInventory : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = enable_save_into_task_inventory(NULL);
return new_value;
@@ -7437,7 +7438,7 @@ class LLToolsEnableSaveToObjectInventory : public view_listener_t
class LLToggleHowTo : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLFloaterWebContent::Params p;
std::string url = gSavedSettings.getString("HowToHelpURL");
@@ -7454,7 +7455,7 @@ class LLToggleHowTo : public view_listener_t
class LLViewEnableMouselook : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
// You can't go directly from customize avatar to mouselook.
// TODO: write code with appropriate dialogs to handle this transition.
@@ -7465,7 +7466,7 @@ class LLViewEnableMouselook : public view_listener_t
class LLToolsEnableToolNotPie : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = ( LLToolMgr::getInstance()->getBaseTool() != LLToolPie::getInstance() );
return new_value;
@@ -7474,7 +7475,7 @@ class LLToolsEnableToolNotPie : public view_listener_t
class LLWorldEnableCreateLandmark : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return !LLLandmarkActions::landmarkAlreadyExists();
}
@@ -7482,7 +7483,7 @@ class LLWorldEnableCreateLandmark : public view_listener_t
class LLWorldEnableSetHomeLocation : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gAgent.isGodlike() ||
(gAgent.getRegion() && gAgent.getRegion()->getAllowSetHome());
@@ -7492,7 +7493,7 @@ class LLWorldEnableSetHomeLocation : public view_listener_t
class LLWorldEnableTeleportHome : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLViewerRegion* regionp = gAgent.getRegion();
bool agent_on_prelude = (regionp && regionp->isPrelude());
@@ -7534,7 +7535,7 @@ BOOL check_show_xui_names(void *)
class LLToolsSelectOnlyMyObjects : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
BOOL cur_val = gSavedSettings.getBOOL("SelectOwnedOnly");
@@ -7546,7 +7547,7 @@ class LLToolsSelectOnlyMyObjects : public view_listener_t
class LLToolsSelectOnlyMovableObjects : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
BOOL cur_val = gSavedSettings.getBOOL("SelectMovableOnly");
@@ -7558,7 +7559,7 @@ class LLToolsSelectOnlyMovableObjects : public view_listener_t
class LLToolsSelectBySurrounding : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLSelectMgr::sRectSelectInclusive = !LLSelectMgr::sRectSelectInclusive;
@@ -7569,7 +7570,7 @@ class LLToolsSelectBySurrounding : public view_listener_t
class LLToolsShowHiddenSelection : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
// TomY TODO Merge these
LLSelectMgr::sRenderHiddenSelections = !LLSelectMgr::sRenderHiddenSelections;
@@ -7581,7 +7582,7 @@ class LLToolsShowHiddenSelection : public view_listener_t
class LLToolsShowSelectionLightRadius : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
// TomY TODO merge these
LLSelectMgr::sRenderLightRadius = !LLSelectMgr::sRenderLightRadius;
@@ -7593,7 +7594,7 @@ class LLToolsShowSelectionLightRadius : public view_listener_t
class LLToolsEditLinkedParts : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
BOOL select_individuals = !gSavedSettings.getBOOL("EditLinkedParts");
gSavedSettings.setBOOL( "EditLinkedParts", select_individuals );
@@ -7776,12 +7777,12 @@ void force_error_driver_crash(void *)
class LLToolsUseSelectionForGrid : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLSelectMgr::getInstance()->clearGridObjects();
struct f : public LLSelectedObjectFunctor
{
- virtual bool apply(LLViewerObject* objectp)
+ bool apply(LLViewerObject* objectp) override
{
LLSelectMgr::getInstance()->addGridObject(objectp);
return true;
@@ -7925,7 +7926,7 @@ BOOL get_visibility(void* user_data)
// TomY TODO: Get rid of these?
class LLViewShowHoverTips : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
gSavedSettings.setBOOL("ShowHoverTips", !gSavedSettings.getBOOL("ShowHoverTips"));
return true;
@@ -7934,7 +7935,7 @@ class LLViewShowHoverTips : public view_listener_t
class LLViewCheckShowHoverTips : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = gSavedSettings.getBOOL("ShowHoverTips");
return new_value;
@@ -7944,7 +7945,7 @@ class LLViewCheckShowHoverTips : public view_listener_t
// TomY TODO: Get rid of these?
class LLViewHighlightTransparent : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLDrawPoolAlpha::sShowDebugAlpha = !LLDrawPoolAlpha::sShowDebugAlpha;
return true;
@@ -7953,7 +7954,7 @@ class LLViewHighlightTransparent : public view_listener_t
class LLViewCheckHighlightTransparent : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLDrawPoolAlpha::sShowDebugAlpha;
return new_value;
@@ -7962,7 +7963,7 @@ class LLViewCheckHighlightTransparent : public view_listener_t
class LLViewBeaconWidth : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string width = userdata.asString();
if(width == "1")
@@ -7989,7 +7990,7 @@ class LLViewBeaconWidth : public view_listener_t
class LLViewToggleBeacon : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string beacon = userdata.asString();
if (beacon == "scriptsbeacon")
@@ -8063,7 +8064,7 @@ class LLViewToggleBeacon : public view_listener_t
class LLViewCheckBeaconEnabled : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string beacon = userdata.asString();
bool new_value = false;
@@ -8113,7 +8114,7 @@ class LLViewCheckBeaconEnabled : public view_listener_t
class LLViewToggleRenderType : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string type = userdata.asString();
if (type == "hideparticles")
@@ -8126,7 +8127,7 @@ class LLViewToggleRenderType : public view_listener_t
class LLViewCheckRenderType : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string type = userdata.asString();
bool new_value = false;
@@ -8140,7 +8141,7 @@ class LLViewCheckRenderType : public view_listener_t
class LLViewStatusAway : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return (gAgent.isInitialized() && gAgent.getAFK());
}
@@ -8148,7 +8149,7 @@ class LLViewStatusAway : public view_listener_t
class LLViewStatusDoNotDisturb : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return (gAgent.isInitialized() && gAgent.isDoNotDisturb());
}
@@ -8156,7 +8157,7 @@ class LLViewStatusDoNotDisturb : public view_listener_t
class LLViewShowHUDAttachments : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLPipeline::sShowHUDAttachments = !LLPipeline::sShowHUDAttachments;
return true;
@@ -8165,7 +8166,7 @@ class LLViewShowHUDAttachments : public view_listener_t
class LLViewCheckHUDAttachments : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool new_value = LLPipeline::sShowHUDAttachments;
return new_value;
@@ -8174,7 +8175,7 @@ class LLViewCheckHUDAttachments : public view_listener_t
class LLEditEnableTakeOff : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string clothing = userdata.asString();
LLWearableType::EType type = LLWearableType::typeNameToType(clothing);
@@ -8186,7 +8187,7 @@ class LLEditEnableTakeOff : public view_listener_t
class LLEditTakeOff : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string clothing = userdata.asString();
if (clothing == "all")
@@ -8211,7 +8212,7 @@ class LLEditTakeOff : public view_listener_t
class LLToolsSelectTool : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string tool_name = userdata.asString();
if (tool_name == "focus")
@@ -8250,7 +8251,7 @@ class LLToolsSelectTool : public view_listener_t
/// WINDLIGHT callbacks
class LLWorldEnvSettings : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string tod = userdata.asString();
@@ -8294,7 +8295,7 @@ class LLWorldEnvSettings : public view_listener_t
class LLWorldEnableEnvSettings : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool result = false;
std::string tod = userdata.asString();
@@ -8337,7 +8338,7 @@ class LLWorldEnableEnvSettings : public view_listener_t
class LLWorldEnvPreset : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string item = userdata.asString();
@@ -8388,7 +8389,7 @@ class LLWorldEnvPreset : public view_listener_t
class LLWorldEnableEnvPreset : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string item = userdata.asString();
@@ -8423,7 +8424,7 @@ class LLWorldEnableEnvPreset : public view_listener_t
/// Post-Process callbacks
class LLWorldPostProcess : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLFloaterReg::showInstance("env_post_process");
return true;
@@ -8440,7 +8441,7 @@ class LLUploadCostCalculator : public view_listener_t
{
std::string mCostStr;
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string menu_name = userdata.asString();
calculateCost();
@@ -8470,7 +8471,7 @@ void handle_premium_voice_morphing_subscribe()
class LLToggleUIHints : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool ui_hints_enabled = gSavedSettings.getBOOL("EnableUIHints");
// toggle
@@ -8570,7 +8571,7 @@ void initialize_menus()
public:
// The "mult" parameter says whether "val" is a multiplier or used to set the value.
LLZoomer(F32 val, bool mult=true) : mVal(val), mMult(mult) {}
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
F32 new_fov_rad = mMult ? LLViewerCamera::getInstance()->getDefaultFOV() * mVal : mVal;
LLViewerCamera::getInstance()->setDefaultFOV(new_fov_rad);
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 387c8b277733e4742ef4565879b0b7080bc4ee32..500ded3766be1e97088230b2f98c58b2b52b0e04 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -83,7 +83,7 @@
class LLFileEnableUpload : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return gStatusBar && LLGlobalEconomy::getInstance() && (gStatusBar->getBalance() >= LLGlobalEconomy::getInstance()->getPriceUpload());
}
@@ -91,7 +91,7 @@ class LLFileEnableUpload : public view_listener_t
class LLFileEnableUploadModel : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLFloaterModelPreview* fmp = (LLFloaterModelPreview*) LLFloaterReg::findInstance("upload_model");
if (fmp && fmp->isModelLoading())
@@ -105,7 +105,7 @@ class LLFileEnableUploadModel : public view_listener_t
class LLMeshUploadVisible : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
return gMeshRepo.meshUploadEnabled();
}
@@ -328,7 +328,7 @@ const std::string upload_pick(void* data)
class LLFileUploadImage : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string filename = upload_pick((void *)LLFilePicker::FFLOAD_IMAGE);
if (!filename.empty())
@@ -341,7 +341,7 @@ class LLFileUploadImage : public view_listener_t
class LLFileUploadModel : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLFloaterModelPreview* fmp = (LLFloaterModelPreview*) LLFloaterReg::getInstance("upload_model");
if (fmp && !fmp->isModelLoading())
@@ -355,7 +355,7 @@ class LLFileUploadModel : public view_listener_t
class LLFileUploadSound : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
std::string filename = upload_pick((void*)LLFilePicker::FFLOAD_WAV);
if (!filename.empty())
@@ -368,7 +368,7 @@ class LLFileUploadSound : public view_listener_t
class LLFileUploadAnim : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
const std::string filename = upload_pick((void*)LLFilePicker::FFLOAD_ANIM);
if (!filename.empty())
@@ -388,7 +388,7 @@ class LLFileUploadAnim : public view_listener_t
class LLFileUploadBulk : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
if( gAgentCamera.cameraMouselook() )
{
@@ -456,7 +456,7 @@ void upload_error(const std::string& error_message, const std::string& label, co
class LLFileEnableCloseWindow : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool frontmost_fl_exists = (NULL != gFloaterView->getFrontmostClosableFloater());
bool frontmost_snapshot_fl_exists = (NULL != gSnapshotFloaterView->getFrontmostClosableFloater());
@@ -467,7 +467,7 @@ class LLFileEnableCloseWindow : public view_listener_t
class LLFileCloseWindow : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool frontmost_fl_exists = (NULL != gFloaterView->getFrontmostClosableFloater());
LLFloater* snapshot_floater = gSnapshotFloaterView->getFrontmostClosableFloater();
@@ -491,7 +491,7 @@ class LLFileCloseWindow : public view_listener_t
class LLFileEnableCloseAllWindows : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLFloaterSnapshot* floater_snapshot = LLFloaterSnapshot::findInstance();
LLFloaterOutfitSnapshot* floater_outfit_snapshot = LLFloaterOutfitSnapshot::findInstance();
@@ -504,7 +504,7 @@ class LLFileEnableCloseAllWindows : public view_listener_t
class LLFileCloseAllWindows : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
bool app_quitting = false;
gFloaterView->closeAllChildren(app_quitting);
@@ -521,7 +521,7 @@ class LLFileCloseAllWindows : public view_listener_t
class LLFileTakeSnapshotToDisk : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLPointer<LLImageRaw> raw = new LLImageRaw;
@@ -570,7 +570,7 @@ class LLFileTakeSnapshotToDisk : public view_listener_t
class LLFileQuit : public view_listener_t
{
- bool handleEvent(const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata) override
{
LLAppViewer::instance()->userQuit();
return true;
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index e3ce91ddb00e266be408ab5ea42d78bb34c0bd30..1c7f409d19bf35690479fb9127c3b3a35e17e761 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -217,9 +217,8 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
}
LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp, BOOL is_global)
-: LLTrace::MemTrackable<LLViewerObject>("LLViewerObject"),
- LLPrimitive(),
- mChildList(),
+: LLPrimitive(),
+ LLTrace::MemTrackable<LLViewerObject>("LLViewerObject"),
mID(id),
mLocalID(0),
mTotalCRC(0),
@@ -242,6 +241,7 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
mText(),
mHudText(""),
mHudTextColor(LLColor4::white),
+ mChildList(),
mLastInterpUpdateSecs(0.f),
mLastMessageUpdateSecs(0.f),
mLatestRecvPacketID(0),
@@ -6385,10 +6385,10 @@ LLVOAvatar* LLViewerObject::getAvatar() const
class ObjectPhysicsProperties : public LLHTTPNode
{
public:
- virtual void post(
+ void post(
ResponsePtr responder,
const LLSD& context,
- const LLSD& input) const
+ const LLSD& input) const override
{
LLSD object_data = input["body"]["ObjectData"];
S32 num_entries = object_data.size();
@@ -6403,7 +6403,8 @@ public:
{
U32 mID;
f(const U32& id) : mID(id) {}
- virtual bool apply(LLSelectNode* node)
+
+ bool apply(LLSelectNode* node) override
{
return (node->getObject() && node->getObject()->mLocalID == mID );
}
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp
index 00ddee5f38ad87f0d5914483025de3326d5cafac..f401417c8a9e2dc13de7aa641e4fff2e906e47cf 100644
--- a/indra/newview/llvieweroctree.cpp
+++ b/indra/newview/llvieweroctree.cpp
@@ -326,8 +326,8 @@ LLViewerOctreeEntryData::~LLViewerOctreeEntryData()
}
LLViewerOctreeEntryData::LLViewerOctreeEntryData(LLViewerOctreeEntry::eEntryDataType_t data_type)
- : mDataType(data_type),
- mEntry(NULL)
+ : mEntry(NULL),
+ mDataType(data_type)
{
}
@@ -463,9 +463,9 @@ LLViewerOctreeGroup::~LLViewerOctreeGroup()
LLViewerOctreeGroup::LLViewerOctreeGroup(OctreeNode* node)
: LLTrace::MemTrackable<LLViewerOctreeGroup, 16>("LLViewerOctreeGroup"),
+ mState(CLEAN),
mOctreeNode(node),
- mAnyVisible(0),
- mState(CLEAN)
+ mAnyVisible(0)
{
LLVector4a tmp;
tmp.splat(0.f);
@@ -834,7 +834,8 @@ class LLSpatialSetOcclusionState : public OctreeTraveler
public:
U32 mState;
LLSpatialSetOcclusionState(U32 state) : mState(state) { }
- virtual void visit(const OctreeNode* branch)
+
+ void visit(const OctreeNode* branch) override
{
LLOcclusionCullingGroup* group = (LLOcclusionCullingGroup*)branch->getListener(0);
if(group)
@@ -849,7 +850,7 @@ class LLSpatialSetOcclusionStateDiff : public LLSpatialSetOcclusionState
public:
LLSpatialSetOcclusionStateDiff(U32 state) : LLSpatialSetOcclusionState(state) { }
- virtual void traverse(const OctreeNode* n)
+ void traverse(const OctreeNode* n) override
{
LLOcclusionCullingGroup* group = (LLOcclusionCullingGroup*) n->getListener(0);
@@ -983,7 +984,8 @@ public:
U32 mState;
LLSpatialClearOcclusionState(U32 state) : mState(state) { }
- virtual void visit(const OctreeNode* branch)
+
+ void visit(const OctreeNode* branch) override
{
LLOcclusionCullingGroup* group = (LLOcclusionCullingGroup*)branch->getListener(0);
if(group)
@@ -998,7 +1000,7 @@ class LLSpatialClearOcclusionStateDiff : public LLSpatialClearOcclusionState
public:
LLSpatialClearOcclusionStateDiff(U32 state) : LLSpatialClearOcclusionState(state) { }
- virtual void traverse(const OctreeNode* n)
+ void traverse(const OctreeNode* n) override
{
LLOcclusionCullingGroup* group = (LLOcclusionCullingGroup*) n->getListener(0);
@@ -1326,10 +1328,10 @@ void LLOcclusionCullingGroup::doOcclusion(LLCamera* camera, const LLVector4a* sh
//class LLViewerOctreePartition definitions
//-----------------------------------------------------------------------------------
LLViewerOctreePartition::LLViewerOctreePartition() :
- mRegionp(NULL),
- mOcclusionEnabled(TRUE),
- mDrawableType(0),
- mPartitionType(0),
+ mPartitionType(0),
+ mDrawableType(0),
+ mRegionp(NULL),
+ mOcclusionEnabled(TRUE),
mLODSeed(0),
mLODPeriod(1)
{
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index a4cd0b1f73235f60f7dcac9d7bd845cedeb3af08..b74aba777eec33c7f40b677bddbe99687e36aacf 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -121,12 +121,12 @@ LLViewerParcelMgr::LLViewerParcelMgr()
mHoverWestSouth(),
mHoverEastNorth(),
mTeleportInProgressPosition(),
+ mCollisionRegionHandle(0),
+ mCollisionUpdateSignal(nullptr),
mRenderCollision(FALSE),
mRenderSelection(TRUE),
mCollisionBanned(0),
mCollisionTimer(),
- mCollisionRegionHandle(0),
- mCollisionUpdateSignal(nullptr),
mMediaParcelId(0),
mMediaRegionId(0)
{
diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp
index 40de520f3e0cf8bd160f5182461ee11883aad89f..67f4b86ff9756651b6f5bdb66774622093aaa594 100644
--- a/indra/newview/llviewertexlayer.cpp
+++ b/indra/newview/llviewertexlayer.cpp
@@ -58,9 +58,9 @@ LLBakedUploadData::LLBakedUploadData(const LLVOAvatarSelf* avatar,
LLViewerTexLayerSet* layerset,
const LLUUID& id,
bool highest_res) :
+ mID(id),
mAvatar(avatar),
mTexLayerSet(layerset),
- mID(id),
mStartTime(LLFrameTimer::getTotalTime()), // Record starting time
mIsHighestRes(highest_res)
{
@@ -79,9 +79,9 @@ LLViewerTexLayerSetBuffer::LLViewerTexLayerSetBuffer(LLTexLayerSet* const owner,
// ORDER_LAST => must render these after the hints are created.
LLTexLayerSetBuffer(owner),
LLViewerDynamicTexture( width, height, 4, LLViewerDynamicTexture::ORDER_LAST, TRUE ),
- mUploadPending(FALSE), // Not used for any logic here, just to sync sending of updates
- mNeedsUpload(FALSE),
+ mNeedsUpload(FALSE), // Not used for any logic here, just to sync sending of updates
mNumLowresUploads(0),
+ mUploadPending(FALSE),
mUploadFailCount(0),
mNeedsUpdate(TRUE),
mNumLowresUpdates(0)
@@ -372,9 +372,9 @@ public:
ALTexLayerUploader(LLUUID assetId, std::string texture, LLBakedUploadData* baked_upload_data);
~ALTexLayerUploader();
- virtual LLSD prepareUpload();
- virtual LLSD generatePostBody();
- virtual LLUUID finishUpload(LLSD &result);
+ LLSD prepareUpload() override;
+ LLSD generatePostBody() override;
+ LLUUID finishUpload(LLSD &result) override;
private:
LLBakedUploadData* mBakedUploadData;
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index d855e9e5e26233070eaf4f5a0213eeda2549f1e0..f6403b3f3306f7c13212394b341ab86eb0cf113f 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -73,7 +73,7 @@ class LLEmbeddedLandmarkCopied: public LLInventoryCallback
public:
LLEmbeddedLandmarkCopied(){}
- void fire(const LLUUID& inv_item)
+ void fire(const LLUUID& inv_item) override
{
showInfo(inv_item);
}
@@ -133,7 +133,7 @@ public:
void setEditor(LLViewerTextEditor* e) {mTextEditor = e;}
// override
- void fire(const LLUUID& inv_item)
+ void fire(const LLUUID& inv_item) override
{
if(!mTextEditor)
{
@@ -178,8 +178,8 @@ public:
mToolTip = inv_item->getName() + '\n' + inv_item->getDescription();
}
- /*virtual*/ bool getDimensionsF32(S32 first_char, S32 num_chars, F32& width, S32& height) const
- {
+ /*virtual*/ bool getDimensionsF32(S32 first_char, S32 num_chars, F32& width, S32& height) const override
+ {
if (num_chars == 0)
{
width = 0;
@@ -193,8 +193,8 @@ public:
return false;
}
- /*virtual*/ S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const
- {
+ /*virtual*/ S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const override
+ {
// always draw at beginning of line
if (line_offset == 0)
{
@@ -214,8 +214,8 @@ public:
}
}
}
- /*virtual*/ F32 draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRectf& draw_rect)
- {
+ /*virtual*/ F32 draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRectf& draw_rect) override
+ {
LLRectf image_rect = draw_rect;
image_rect.mRight = image_rect.mLeft + mImage->getWidth();
image_rect.mTop = image_rect.mBottom + mImage->getHeight();
@@ -236,15 +236,16 @@ public:
return right_x;
}
- /*virtual*/ bool canEdit() const { return false; }
+ /*virtual*/ bool canEdit() const override { return false; }
- /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask)
- {
+ /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) override
+ {
LLUI::getWindow()->setCursor(UI_CURSOR_HAND);
return TRUE;
}
- virtual BOOL handleToolTip(S32 x, S32 y, MASK mask )
+
+ BOOL handleToolTip(S32 x, S32 y, MASK mask ) override
{
if (!mToolTip.empty())
{
@@ -254,7 +255,7 @@ public:
return FALSE;
}
- /*virtual*/ LLStyleConstSP getStyle() const { return mStyle; }
+ /*virtual*/ LLStyleConstSP getStyle() const override { return mStyle; }
private:
LLUIImagePtr mImage;
@@ -603,7 +604,7 @@ public:
mItem = item;
}
- virtual BOOL execute( LLTextBase* editor, S32* delta )
+ BOOL execute( LLTextBase* editor, S32* delta ) override
{
LLViewerTextEditor* viewer_editor = (LLViewerTextEditor*)editor;
// Take this opportunity to remove any unused embedded items from this editor
@@ -617,21 +618,22 @@ public:
}
return FALSE;
}
-
- virtual S32 undo( LLTextBase* editor )
+
+ S32 undo( LLTextBase* editor ) override
{
remove(editor, getPosition(), 1);
return getPosition();
}
-
- virtual S32 redo( LLTextBase* editor )
+
+ S32 redo( LLTextBase* editor ) override
{
LLWString ws;
ws += mExtCharValue;
insert(editor, getPosition(), ws );
return getPosition() + 1;
}
- virtual BOOL hasExtCharValue( llwchar value ) const
+
+ BOOL hasExtCharValue( llwchar value ) const override
{
return (value == mExtCharValue);
}
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 5853ee99233e7522fc5553f92547da5b7b681a1c..066d845f06f58766e81e2a9b1ce305d3269f1ba4 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -137,9 +137,9 @@ LLLoadedCallbackEntry::LLLoadedCallbackEntry(loaded_callback_func cb,
mLastUsedDiscard(MAX_DISCARD_LEVEL+1),
mDesiredDiscard(discard_level),
mNeedsImageRaw(need_imageraw),
+ mPaused(pause),
mUserData(userdata),
- mSourceCallbackList(src_callback_list),
- mPaused(pause)
+ mSourceCallbackList(src_callback_list)
{
if(mSourceCallbackList)
{
@@ -341,18 +341,18 @@ LLViewerFetchedTexture* LLViewerTextureManager::getFetchedTextureFromHost(const
// Create a bridge to the viewer texture manager.
class LLViewerTextureManagerBridge : public LLTextureManagerBridge
{
- /*virtual*/ LLPointer<LLGLTexture> getLocalTexture(BOOL usemipmaps = TRUE, BOOL generate_gl_tex = TRUE)
- {
+ /*virtual*/ LLPointer<LLGLTexture> getLocalTexture(BOOL usemipmaps = TRUE, BOOL generate_gl_tex = TRUE) override
+ {
return LLViewerTextureManager::getLocalTexture(usemipmaps, generate_gl_tex);
}
- /*virtual*/ LLPointer<LLGLTexture> getLocalTexture(const U32 width, const U32 height, const U8 components, BOOL usemipmaps, BOOL generate_gl_tex = TRUE)
- {
+ /*virtual*/ LLPointer<LLGLTexture> getLocalTexture(const U32 width, const U32 height, const U8 components, BOOL usemipmaps, BOOL generate_gl_tex = TRUE) override
+ {
return LLViewerTextureManager::getLocalTexture(width, height, components, usemipmaps, generate_gl_tex);
}
- /*virtual*/ LLGLTexture* getFetchedTexture(const LLUUID &image_id)
- {
+ /*virtual*/ LLGLTexture* getFetchedTexture(const LLUUID &image_id) override
+ {
return LLViewerTextureManager::getFetchedTexture(image_id);
}
};
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 33c3e55021c47e4f2972f8bb768cb609d962d306..19887f638b9f0beb875a1fb2c915548401e8521c 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -94,10 +94,10 @@ LLTextureKey::LLTextureKey(LLUUID id, ETexListType tex_type)
LLViewerTextureList::LLViewerTextureList()
: mForceResetTextureStats(FALSE),
+ mInitialized(FALSE),
mUpdateStats(FALSE),
mMaxResidentTexMemInMegaBytes(0),
- mMaxTotalTextureMemInMegaBytes(0),
- mInitialized(FALSE)
+ mMaxTotalTextureMemInMegaBytes(0)
{
}
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 441bf06d0cf79ad950f31872418b3f4dc3fab898..772db9fa51d057d35bba7e0eed1ca74d3ac86f4b 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -110,9 +110,9 @@ LLSD summarize_by_buckets(std::vector<LLSD> in_records, std::vector<std::string>
struct LocalTextureData
{
LocalTextureData() :
+ mImage(NULL),
mIsBakedReady(false),
mDiscard(MAX_DISCARD_LEVEL+1),
- mImage(NULL),
mWearableID(IMG_DEFAULT_AVATAR),
mTexEntry(NULL)
{}
@@ -152,9 +152,9 @@ LLVOAvatarSelf::LLVOAvatarSelf(const LLUUID& id,
const LLPCode pcode,
LLViewerRegion* regionp) :
LLVOAvatar(id, pcode, regionp),
- mScreenp(NULL),
mLastRegionHandle(0),
mRegionCrossingCount(0),
+ mScreenp(NULL),
// Value outside legal range, so will always be a mismatch the
// first time through.
mLastHoverOffsetSent(LLVector3(0.0f, 0.0f, -999.0f)),
@@ -2339,7 +2339,7 @@ void LLVOAvatarSelf::appearanceChangeMetricsCoro(std::string url)
LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("appearanceChangeMetrics", httpPolicy));
LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
- LLCore::HttpOptions::ptr_t httpOpts = LLCore::HttpOptions::ptr_t(new LLCore::HttpOptions);
+ LLCore::HttpOptions::ptr_t httpOpts = boost::make_shared<LLCore::HttpOptions>();
S32 currentSequence = mMetricSequence;
if (S32_MAX == ++mMetricSequence)
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 6e14952dee4d4dd674303b2d2829ccfd1a1e562a..9c33cdf316254862ec0fb1f93929afa4783da145 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -116,12 +116,12 @@ public:
{
mObject->removeMDCImpl();
}
-
- virtual U8 getMediaDataCount() const
- { return mObject->getNumTEs(); }
- virtual LLSD getMediaDataLLSD(U8 index) const
- {
+ U8 getMediaDataCount() const override
+ { return mObject->getNumTEs(); }
+
+ LLSD getMediaDataLLSD(U8 index) const override
+ {
LLSD result;
LLTextureEntry *te = mObject->getTE(index);
if (NULL != te)
@@ -140,8 +140,9 @@ public:
}
return result;
}
- virtual bool isCurrentMediaUrl(U8 index, const std::string &url) const
- {
+
+ bool isCurrentMediaUrl(U8 index, const std::string &url) const override
+ {
LLTextureEntry *te = mObject->getTE(index);
if (te)
{
@@ -153,20 +154,20 @@ public:
return url.empty();
}
- virtual LLUUID getID() const
- { return mObject->getID(); }
+ LLUUID getID() const override
+ { return mObject->getID(); }
- virtual void mediaNavigateBounceBack(U8 index)
- { mObject->mediaNavigateBounceBack(index); }
-
- virtual bool hasMedia() const
- { return mObject->hasMedia(); }
-
- virtual void updateObjectMediaData(LLSD const &data, const std::string &version_string)
- { mObject->updateObjectMediaData(data, version_string); }
-
- virtual F64 getMediaInterest() const
- {
+ void mediaNavigateBounceBack(U8 index) override
+ { mObject->mediaNavigateBounceBack(index); }
+
+ bool hasMedia() const override
+ { return mObject->hasMedia(); }
+
+ void updateObjectMediaData(LLSD const &data, const std::string &version_string) override
+ { mObject->updateObjectMediaData(data, version_string); }
+
+ F64 getMediaInterest() const override
+ {
F64 interest = mObject->getTotalMediaInterest();
if (interest < (F64)0.0)
{
@@ -181,23 +182,23 @@ public:
}
return interest;
}
-
- virtual bool isInterestingEnough() const
- {
+
+ bool isInterestingEnough() const override
+ {
return LLViewerMedia::isInterestingEnough(mObject, getMediaInterest());
}
- virtual std::string getCapabilityUrl(const std::string &name) const
- { return mObject->getRegion()->getCapability(name); }
-
- virtual bool isDead() const
- { return mObject->isDead(); }
-
- virtual U32 getMediaVersion() const
- { return LLTextureEntry::getVersionFromMediaVersionString(mObject->getMediaURL()); }
-
- virtual bool isNew() const
- { return mNew; }
+ std::string getCapabilityUrl(const std::string &name) const override
+ { return mObject->getRegion()->getCapability(name); }
+
+ bool isDead() const override
+ { return mObject->isDead(); }
+
+ U32 getMediaVersion() const override
+ { return LLTextureEntry::getVersionFromMediaVersionString(mObject->getMediaURL()); }
+
+ bool isNew() const override
+ { return mNew; }
private:
LLPointer<LLVOVolume> mObject;