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

Fix compile

Browse Source
This commit is contained in:
Liru Færs
2019-11-24 02:54:23 -05:00
parent f0db784b46
commit 79e1830ba9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llcommon/llsd.h
View File

@@ -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
//@}

2
indra/newview/llparticipantlist.cpp
View File

@@ -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()

2
indra/newview/llviewermenu.cpp
View File

@@ -9327,7 +9327,7 @@ class ListStartCall : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> 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;
}
};