From 79e1830ba95e32097be693bec0ac6898918cd82e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Sun, 24 Nov 2019 02:54:23 -0500 Subject: [PATCH] Fix compile --- indra/llcommon/llsd.h | 6 +++--- indra/newview/llparticipantlist.cpp | 2 +- indra/newview/llviewermenu.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h index e9fcb8b47..1af6749b7 100644 --- a/indra/llcommon/llsd.h +++ b/indra/llcommon/llsd.h @@ -385,9 +385,9 @@ public: using an arbitrary pointer or scalar type to std::string. */ //@{ - LLSD(const void*); ///< construct from aribrary pointers - void assign(const void*); ///< assign from arbitrary pointers - LLSD& operator=(const void*); ///< assign from arbitrary pointers + LLSD(const void*) = delete; ///< construct from aribrary pointers + void assign(const void*) = delete; ///< assign from arbitrary pointers + LLSD& operator=(const void*) = delete; ///< assign from arbitrary pointers bool has(Integer) const; ///< has() only works for Maps //@} diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index d4693dee8..872b90514 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -78,7 +78,7 @@ void LLParticipantList::setupContextMenu() static LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_local_avs.xml", gMenuHolder); mAvatarList->setContextMenu(menu); } - else mAvatarList->setContextMenu(0); + else mAvatarList->setContextMenu(LFIDBearer::AVATAR); } BOOL LLParticipantList::postBuild() diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 288af7934..cb11edd25 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -9327,7 +9327,7 @@ class ListStartCall : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - (LFIDBearer::getActiveType == LFIDBearer::GROUP ? LLGroupActions::startCall : LLAvatarActions::startCall)(LFIDBearer::getActiveSelectedID()); + (LFIDBearer::getActiveType() == LFIDBearer::GROUP ? LLGroupActions::startCall : LLAvatarActions::startCall)(LFIDBearer::getActiveSelectedID()); return true; } };