diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-08-28 20:47:43 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-08-28 20:47:43 -0400 |
| commit | cde1174345224d33d6b45b1e3243fa39043223e5 (patch) | |
| tree | 6c8db6e0499622d8c7206a11c997eb173ebd478f /indra/newview/llviewermessage.h | |
| parent | 6f454ad8366ed33bbe199c3fc3ed69e6d3448cec (diff) | |
| parent | 35efadf78315f9b351415930dca4fae251ef4dd0 (diff) | |
Merge branch 'main' into release/luau-scripting.
Diffstat (limited to 'indra/newview/llviewermessage.h')
| -rw-r--r-- | indra/newview/llviewermessage.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h index 2403e3de97..52f383faa9 100644 --- a/indra/newview/llviewermessage.h +++ b/indra/newview/llviewermessage.h @@ -62,8 +62,8 @@ enum InventoryOfferResponse IOR_SHOW }; -BOOL can_afford_transaction(S32 cost); -void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_group = FALSE, +bool can_afford_transaction(S32 cost); +void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, bool is_group = false, S32 trx_type = TRANS_GIFT, const std::string& desc = LLStringUtil::null); void send_join_group_response(LLUUID group_id, LLUUID transaction_id, @@ -81,7 +81,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data); void process_chat_from_simulator(LLMessageSystem *mesgsys, void **user_data); //void process_agent_to_new_region(LLMessageSystem *mesgsys, void **user_data); -void send_agent_update(BOOL force_send, BOOL send_reliable = FALSE); +void send_agent_update(bool force_send, bool send_reliable = false); void process_object_update(LLMessageSystem *mesgsys, void **user_data); void process_compressed_object_update(LLMessageSystem *mesgsys, void **user_data); void process_cached_object_update(LLMessageSystem *mesgsys, void **user_data); @@ -117,7 +117,7 @@ void process_adjust_balance(LLMessageSystem* msg_system, void**); bool attempt_standard_notification(LLMessageSystem* msg); void process_alert_message(LLMessageSystem* msg, void**); void process_agent_alert_message(LLMessageSystem* msgsystem, void** user_data); -void process_alert_core(const std::string& message, BOOL modal); +void process_alert_core(const std::string& message, bool modal); // "Mean" or player-vs-player abuse typedef std::list<LLMeanCollisionData*> mean_collision_list_t; @@ -236,8 +236,8 @@ public: static std::string mResponderType; EInstantMessage mIM; LLUUID mFromID; - BOOL mFromGroup; - BOOL mFromObject; + bool mFromGroup; + bool mFromObject; LLUUID mTransactionID; LLUUID mFolderID; LLUUID mObjectID; |