From 9e854b697a06abed2a0917fb6120445f176764f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20N=C3=A6sbye=20Christensen?= Date: Fri, 16 Feb 2024 19:29:51 +0100 Subject: misc: BOOL to bool --- indra/newview/llviewergesture.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'indra/newview/llviewergesture.cpp') diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp index f30279d1e9..ef63ef41e5 100644 --- a/indra/newview/llviewergesture.cpp +++ b/indra/newview/llviewergesture.cpp @@ -70,37 +70,37 @@ LLViewerGesture::LLViewerGesture(const LLViewerGesture &rhs) { } -BOOL LLViewerGesture::trigger(KEY key, MASK mask) +bool LLViewerGesture::trigger(KEY key, MASK mask) { if (mKey == key && mMask == mask) { - doTrigger( TRUE ); - return TRUE; + doTrigger( true ); + return true; } else { - return FALSE; + return false; } } -BOOL LLViewerGesture::trigger(const std::string &trigger_string) +bool LLViewerGesture::trigger(const std::string &trigger_string) { // Assumes trigger_string is lowercase if (mTriggerLower == trigger_string) { - doTrigger( FALSE ); - return TRUE; + doTrigger( false ); + return true; } else { - return FALSE; + return false; } } // private -void LLViewerGesture::doTrigger( BOOL send_chat ) +void LLViewerGesture::doTrigger( bool send_chat ) { if (mSoundItemID != LLUUID::null) { @@ -132,7 +132,7 @@ void LLViewerGesture::doTrigger( BOOL send_chat ) // Don't play nodding animation, since that might not blend // with the gesture animation. (LLFloaterReg::getTypedInstance("nearby_chat"))-> - sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE); + sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, false); } } @@ -140,7 +140,7 @@ void LLViewerGesture::doTrigger( BOOL send_chat ) LLViewerGestureList::LLViewerGestureList() : LLGestureList() { - mIsLoaded = FALSE; + mIsLoaded = false; } @@ -154,7 +154,7 @@ LLGesture *LLViewerGestureList::create_gesture(U8 **buffer, S32 max_size) // See if the prefix matches any gesture. If so, return TRUE // and place the full text of the gesture trigger into // output_str -BOOL LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* out_str) +bool LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* out_str) { S32 in_len = in_str.length(); @@ -177,10 +177,10 @@ BOOL LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* ou if (in_str_lc == trigger_trunc) { *out_str = trigger; - return TRUE; + return true; } } - return FALSE; + return false; } -- cgit v1.2.3 From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/llviewergesture.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewergesture.cpp') diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp index ef63ef41e5..9000d3a428 100644 --- a/indra/newview/llviewergesture.cpp +++ b/indra/newview/llviewergesture.cpp @@ -151,7 +151,7 @@ LLGesture *LLViewerGestureList::create_gesture(U8 **buffer, S32 max_size) } -// See if the prefix matches any gesture. If so, return TRUE +// See if the prefix matches any gesture. If so, return true // and place the full text of the gesture trigger into // output_str bool LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* out_str) @@ -197,7 +197,7 @@ void LLViewerGestureList::xferCallback(void *data, S32 size, void** /*user_data* LL_ERRS() << "Read off of end of array, error in serialization" << LL_ENDL; } - gGestureList.mIsLoaded = TRUE; + gGestureList.mIsLoaded = true; } else { -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llviewergesture.cpp | 412 +++++++++++++++++++------------------- 1 file changed, 206 insertions(+), 206 deletions(-) (limited to 'indra/newview/llviewergesture.cpp') diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp index 44fcf9fcaa..4ddddf03f5 100644 --- a/indra/newview/llviewergesture.cpp +++ b/indra/newview/llviewergesture.cpp @@ -1,206 +1,206 @@ -/** - * @file llviewergesture.cpp - * @brief LLViewerGesture class implementation - * - * $LicenseInfo:firstyear=2002&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "llviewergesture.h" - -#include "llaudioengine.h" -#include "lldir.h" -#include "llviewerinventory.h" -#include "sound_ids.h" // for testing - -#include "llfloaterreg.h" -#include "llkeyboard.h" // for key shortcuts for testing -#include "llinventorymodel.h" -#include "llvoavatar.h" -#include "llxfermanager.h" -#include "llviewermessage.h" // send_guid_sound_trigger -#include "llviewernetwork.h" -#include "llagent.h" -#include "llfloaterimnearbychat.h" - -// Globals -LLViewerGestureList gGestureList; - -const F32 LLViewerGesture::SOUND_VOLUME = 1.f; - -LLViewerGesture::LLViewerGesture() -: LLGesture() -{ } - -LLViewerGesture::LLViewerGesture(KEY key, MASK mask, const std::string &trigger, - const LLUUID &sound_item_id, - const std::string &animation, - const std::string &output_string) -: LLGesture(key, mask, trigger, sound_item_id, animation, output_string) -{ -} - -LLViewerGesture::LLViewerGesture(U8 **buffer, S32 max_size) -: LLGesture(buffer, max_size) -{ -} - -LLViewerGesture::LLViewerGesture(const LLViewerGesture &rhs) -: LLGesture((LLGesture)rhs) -{ -} - -bool LLViewerGesture::trigger(KEY key, MASK mask) -{ - if (mKey == key && mMask == mask) - { - doTrigger( true ); - return true; - } - else - { - return false; - } -} - - -bool LLViewerGesture::trigger(const std::string &trigger_string) -{ - // Assumes trigger_string is lowercase - if (mTriggerLower == trigger_string) - { - doTrigger( false ); - return true; - } - else - { - return false; - } -} - - -// private -void LLViewerGesture::doTrigger( bool send_chat ) -{ - if (mSoundItemID != LLUUID::null) - { - LLViewerInventoryItem *item; - item = gInventory.getItem(mSoundItemID); - if (item) - { - send_sound_trigger(item->getAssetUUID(), SOUND_VOLUME); - } - } - - if (!mAnimation.empty()) - { - // AFK animations trigger the special "away" state, which - // includes agent control settings. JC - if (mAnimation == "enter_away_from_keyboard_state" || mAnimation == "away") - { - gAgent.setAFK(); - } - else - { - LLUUID anim_id = gAnimLibrary.stringToAnimState(mAnimation); - gAgent.sendAnimationRequest(anim_id, ANIM_REQUEST_START); - } - } - - if (send_chat && !mOutputString.empty()) - { - // Don't play nodding animation, since that might not blend - // with the gesture animation. - (LLFloaterReg::getTypedInstance("nearby_chat"))-> - sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, false); - } -} - - -LLViewerGestureList::LLViewerGestureList() -: LLGestureList() -{ - mIsLoaded = false; -} - - -// helper for deserialize that creates the right LLGesture subclass -LLGesture *LLViewerGestureList::create_gesture(U8 **buffer, S32 max_size) -{ - return new LLViewerGesture(buffer, max_size); -} - - -// See if the prefix matches any gesture. If so, return true -// and place the full text of the gesture trigger into -// output_str -bool LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* out_str) -{ - S32 in_len = in_str.length(); - - std::string in_str_lc = in_str; - LLStringUtil::toLower(in_str_lc); - - for (S32 i = 0; i < count(); i++) - { - LLGesture* gesture = get(i); - const std::string &trigger = gesture->getTrigger(); - - if (in_len > (S32)trigger.length()) - { - // too short, bail out - continue; - } - - std::string trigger_trunc = utf8str_truncate(trigger, in_len); - LLStringUtil::toLower(trigger_trunc); - if (in_str_lc == trigger_trunc) - { - *out_str = trigger; - return true; - } - } - return false; -} - - -// static -void LLViewerGestureList::xferCallback(void *data, S32 size, void** /*user_data*/, S32 status) -{ - if (LL_ERR_NOERR == status) - { - U8 *buffer = (U8 *)data; - U8 *end = gGestureList.deserialize(buffer, size); - - if (end - buffer > size) - { - LL_ERRS() << "Read off of end of array, error in serialization" << LL_ENDL; - } - - gGestureList.mIsLoaded = true; - } - else - { - LL_WARNS() << "Unable to load gesture list!" << LL_ENDL; - } -} +/** + * @file llviewergesture.cpp + * @brief LLViewerGesture class implementation + * + * $LicenseInfo:firstyear=2002&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "llviewergesture.h" + +#include "llaudioengine.h" +#include "lldir.h" +#include "llviewerinventory.h" +#include "sound_ids.h" // for testing + +#include "llfloaterreg.h" +#include "llkeyboard.h" // for key shortcuts for testing +#include "llinventorymodel.h" +#include "llvoavatar.h" +#include "llxfermanager.h" +#include "llviewermessage.h" // send_guid_sound_trigger +#include "llviewernetwork.h" +#include "llagent.h" +#include "llfloaterimnearbychat.h" + +// Globals +LLViewerGestureList gGestureList; + +const F32 LLViewerGesture::SOUND_VOLUME = 1.f; + +LLViewerGesture::LLViewerGesture() +: LLGesture() +{ } + +LLViewerGesture::LLViewerGesture(KEY key, MASK mask, const std::string &trigger, + const LLUUID &sound_item_id, + const std::string &animation, + const std::string &output_string) +: LLGesture(key, mask, trigger, sound_item_id, animation, output_string) +{ +} + +LLViewerGesture::LLViewerGesture(U8 **buffer, S32 max_size) +: LLGesture(buffer, max_size) +{ +} + +LLViewerGesture::LLViewerGesture(const LLViewerGesture &rhs) +: LLGesture((LLGesture)rhs) +{ +} + +bool LLViewerGesture::trigger(KEY key, MASK mask) +{ + if (mKey == key && mMask == mask) + { + doTrigger( true ); + return true; + } + else + { + return false; + } +} + + +bool LLViewerGesture::trigger(const std::string &trigger_string) +{ + // Assumes trigger_string is lowercase + if (mTriggerLower == trigger_string) + { + doTrigger( false ); + return true; + } + else + { + return false; + } +} + + +// private +void LLViewerGesture::doTrigger( bool send_chat ) +{ + if (mSoundItemID != LLUUID::null) + { + LLViewerInventoryItem *item; + item = gInventory.getItem(mSoundItemID); + if (item) + { + send_sound_trigger(item->getAssetUUID(), SOUND_VOLUME); + } + } + + if (!mAnimation.empty()) + { + // AFK animations trigger the special "away" state, which + // includes agent control settings. JC + if (mAnimation == "enter_away_from_keyboard_state" || mAnimation == "away") + { + gAgent.setAFK(); + } + else + { + LLUUID anim_id = gAnimLibrary.stringToAnimState(mAnimation); + gAgent.sendAnimationRequest(anim_id, ANIM_REQUEST_START); + } + } + + if (send_chat && !mOutputString.empty()) + { + // Don't play nodding animation, since that might not blend + // with the gesture animation. + (LLFloaterReg::getTypedInstance("nearby_chat"))-> + sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, false); + } +} + + +LLViewerGestureList::LLViewerGestureList() +: LLGestureList() +{ + mIsLoaded = false; +} + + +// helper for deserialize that creates the right LLGesture subclass +LLGesture *LLViewerGestureList::create_gesture(U8 **buffer, S32 max_size) +{ + return new LLViewerGesture(buffer, max_size); +} + + +// See if the prefix matches any gesture. If so, return true +// and place the full text of the gesture trigger into +// output_str +bool LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* out_str) +{ + S32 in_len = in_str.length(); + + std::string in_str_lc = in_str; + LLStringUtil::toLower(in_str_lc); + + for (S32 i = 0; i < count(); i++) + { + LLGesture* gesture = get(i); + const std::string &trigger = gesture->getTrigger(); + + if (in_len > (S32)trigger.length()) + { + // too short, bail out + continue; + } + + std::string trigger_trunc = utf8str_truncate(trigger, in_len); + LLStringUtil::toLower(trigger_trunc); + if (in_str_lc == trigger_trunc) + { + *out_str = trigger; + return true; + } + } + return false; +} + + +// static +void LLViewerGestureList::xferCallback(void *data, S32 size, void** /*user_data*/, S32 status) +{ + if (LL_ERR_NOERR == status) + { + U8 *buffer = (U8 *)data; + U8 *end = gGestureList.deserialize(buffer, size); + + if (end - buffer > size) + { + LL_ERRS() << "Read off of end of array, error in serialization" << LL_ENDL; + } + + gGestureList.mIsLoaded = true; + } + else + { + LL_WARNS() << "Unable to load gesture list!" << LL_ENDL; + } +} -- cgit v1.2.3 From b42f9d836b4c0f7fbd4bdae1734021e2a09fdbe8 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 1 Jun 2024 15:49:26 +0200 Subject: Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings --- indra/newview/llviewergesture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewergesture.cpp') diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp index 4ddddf03f5..eacf68dda5 100644 --- a/indra/newview/llviewergesture.cpp +++ b/indra/newview/llviewergesture.cpp @@ -156,7 +156,7 @@ LLGesture *LLViewerGestureList::create_gesture(U8 **buffer, S32 max_size) // output_str bool LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* out_str) { - S32 in_len = in_str.length(); + S32 in_len = static_cast(in_str.length()); std::string in_str_lc = in_str; LLStringUtil::toLower(in_str_lc); -- cgit v1.2.3