diff options
| author | Kitty Barnett <develop@catznip.com> | 2024-10-02 00:34:09 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2024-10-02 00:34:09 +0200 |
| commit | 689f723a5f314ffa0f54c0e50a51cbe464b36ccf (patch) | |
| tree | eeabdfc2066ad275aa256ed0f051cb33e64f1eed | |
| parent | ed2d4f02d93459bf114ebeab8727d507b7bfc0ef (diff) | |
Remove unneeded RLV_VERIFY + undefine accidental RLV_DEBUG define (should fix Linux build)
| -rw-r--r-- | indra/newview/rlvdefines.h | 1 | ||||
| -rw-r--r-- | indra/newview/rlvhelper.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h index e3472ed4a8..e39328fdd6 100644 --- a/indra/newview/rlvdefines.h +++ b/indra/newview/rlvdefines.h @@ -38,7 +38,6 @@ #define RLV_ENDL LL_ENDL #define RLV_VERIFY(f) (f) -#define RLV_DEBUG #if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG // Make sure we halt execution on errors #define RLV_ERRS LL_ERRS("RLV") diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp index 988fc9ca8b..7cb1473c8c 100644 --- a/indra/newview/rlvhelper.cpp +++ b/indra/newview/rlvhelper.cpp @@ -57,7 +57,7 @@ BehaviourDictionary::BehaviourDictionary() // Populate mString2InfoMap (the tuple <behaviour, type> should be unique) for (const BehaviourInfo* bhvr_info_p : mBhvrInfoList) { - RLV_VERIFY(mString2InfoMap.insert(std::make_pair(std::make_pair(bhvr_info_p->getBehaviour(), static_cast<EParamType>(bhvr_info_p->getParamTypeMask())), bhvr_info_p)).second); + mString2InfoMap.insert(std::make_pair(std::make_pair(bhvr_info_p->getBehaviour(), static_cast<EParamType>(bhvr_info_p->getParamTypeMask())), bhvr_info_p)); } // Populate m_Bhvr2InfoMap (there can be multiple entries per ERlvBehaviour) |