mirror of
https://github.com/FirestormViewer/phoenix-firestorm.git
synced 2026-08-14 00:48:30 +00:00
Default the OmnifilterEnabled LLCachedControls to prevent a crash where it can't be found due to a bad install or settings issue
This commit is contained in:
@@ -723,7 +723,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
|
||||
*/
|
||||
|
||||
// <FS:Zi> Omnifilter support
|
||||
static LLCachedControl<bool> use_omnifilter(gSavedSettings, "OmnifilterEnabled");
|
||||
static LLCachedControl<bool> use_omnifilter(gSavedSettings, "OmnifilterEnabled", false);
|
||||
if (use_omnifilter)
|
||||
{
|
||||
OmnifilterEngine::Haystack haystack;
|
||||
|
||||
@@ -3482,7 +3482,7 @@ void LLIMMgr::addMessage(
|
||||
// <FS:Zi> Omnifilter support
|
||||
std::string msg = original_msg;
|
||||
|
||||
static LLCachedControl<bool> use_omnifilter(gSavedSettings, "OmnifilterEnabled");
|
||||
static LLCachedControl<bool> use_omnifilter(gSavedSettings, "OmnifilterEnabled", false);
|
||||
if (use_omnifilter)
|
||||
{
|
||||
// this is the type for new group IM sessions started - apparently this is the only place
|
||||
|
||||
@@ -475,7 +475,7 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
|
||||
LLUUID object_id = notification_id_to_object_id(notification_id);
|
||||
|
||||
// <FS:Zi> Omnifilter support
|
||||
static LLCachedControl<bool> use_omnifilter(gSavedSettings, "OmnifilterEnabled");
|
||||
static LLCachedControl<bool> use_omnifilter(gSavedSettings, "OmnifilterEnabled", false);
|
||||
if (use_omnifilter)
|
||||
{
|
||||
LLNotificationPtr notification = LLNotifications::instance().find(notification_id);
|
||||
|
||||
@@ -3252,7 +3252,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
|
||||
}
|
||||
|
||||
// <FS:Zi> Omnifilter support
|
||||
static LLCachedControl<bool> use_omnifilter(gSavedSettings, "OmnifilterEnabled");
|
||||
static LLCachedControl<bool> use_omnifilter(gSavedSettings, "OmnifilterEnabled", false);
|
||||
if (use_omnifilter)
|
||||
{
|
||||
OmnifilterEngine::Haystack haystack;
|
||||
|
||||
@@ -69,7 +69,7 @@ const OmnifilterEngine::Needle* OmnifilterEngine::logMatch(const std::string& ne
|
||||
|
||||
bool OmnifilterEngine::matchStrings(std::string_view needle_string, std::string_view haystack_string, eMatchType match_type, bool case_insensitive)
|
||||
{
|
||||
static LLCachedControl<bool> use_omnifilter(gSavedSettings, "OmnifilterEnabled");
|
||||
static LLCachedControl<bool> use_omnifilter(gSavedSettings, "OmnifilterEnabled", false);
|
||||
if (!use_omnifilter)
|
||||
{
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user