From 819bdd72eabf2393ba40ee386ac977887c2a8474 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 7 Jan 2025 14:52:49 +0100 Subject: [PATCH] Fix logical comparison warnings --- indra/newview/llviewermenu.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 52e3bf02f5..9d7bc8cba0 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2255,8 +2255,8 @@ class LLAdvancedToggleShowLookAt : public view_listener_t // //bool value = !gSavedPerAccountSettings.getBOOL("DebugLookAt"); //gSavedPerAccountSettings.setBOOL("DebugLookAt",value); - S32 value = !gSavedPerAccountSettings.getS32("DebugLookAt"); - gSavedPerAccountSettings.setS32("DebugLookAt",value); + S32 value = gSavedPerAccountSettings.getS32("DebugLookAt") == 0 ? 1 : 0; + gSavedPerAccountSettings.setS32("DebugLookAt", value); // return true; } @@ -2265,21 +2265,21 @@ class LLAdvancedToggleShowLookAt : public view_listener_t // class LLAdvancedToggleShowColor : public view_listener_t { - bool handleEvent(const LLSD& userdata) - { - S32 value = !gSavedSettings.getS32("DebugShowColor"); - gSavedSettings.setS32("DebugShowColor",value); - return true; - } + bool handleEvent(const LLSD& userdata) + { + S32 value = gSavedSettings.getS32("DebugShowColor") == 0 ? 1 : 0; + gSavedSettings.setS32("DebugShowColor", value); + return true; + } }; class LLAdvancedCheckShowColor : public view_listener_t { - bool handleEvent(const LLSD& userdata) - { - S32 new_value = gSavedSettings.getS32("DebugShowColor"); - return (bool)new_value; - } + bool handleEvent(const LLSD& userdata) + { + bool new_value = gSavedSettings.getS32("DebugShowColor") != 0; + return new_value; + } }; // @@ -2290,7 +2290,7 @@ class LLAdvancedCheckShowLookAt : public view_listener_t //bool new_value = LLHUDEffectLookAt::sDebugLookAt; // //bool new_value = gSavedPerAccountSettings.getBOOL("DebugLookAt"); - S32 new_value = gSavedPerAccountSettings.getS32("DebugLookAt"); + bool new_value = gSavedPerAccountSettings.getS32("DebugLookAt") > 0; return (bool)new_value; } };