livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace "None" with "NoMatch" as "None" is a "#define None 0" deep inside some X headers. Which won't end well if used inside the enum.

master
Nicky 2018-05-27 19:33:34 +02:00
parent 577288d236
commit 08e6deee68
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/rlvhandler.cpp
View File

@ -666,7 +666,7 @@ void RlvHandler::setActiveGroupRole(const LLUUID& idGroup, const std::string& st
// We have everything - activate the requested role (if we can find it)
if (pGroupData)
{
enum class EMatch { None, Partial, Exact } eMatch = EMatch::None; LLUUID idRole;
enum class EMatch { NoMatch, Partial, Exact } eMatch = EMatch::NoMatch; LLUUID idRole;
for (const auto& roleData : pGroupData->mRoles)
{
// NOTE: exact matches take precedence over partial matches; in case of partial matches the last match wins
@ -680,7 +680,7 @@ void RlvHandler::setActiveGroupRole(const LLUUID& idGroup, const std::string& st
}
}
if (eMatch != EMatch::None)
if (eMatch != EMatch::NoMatch)
{
RLV_INFOS << "Activating role '" << strRole << "' for group '" << pGroupData->mName << "'" << RLV_ENDL;
LLGroupMgr::getInstance()->sendGroupTitleUpdate(idGroup, idRole);