Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 8d1bc1c76a..7b76cc8c68 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -51,7 +51,7 @@ class LLSessionTimeoutTimer : public LLEventTimer
 public:
     LLSessionTimeoutTimer(const LLUUID& session_id, F32 period) : LLEventTimer(period), mSessionId(session_id) {}
     virtual ~LLSessionTimeoutTimer() {};
-    /* virtual */ BOOL tick();
+    /* virtual */ bool tick();
 
 private:
     LLUUID mSessionId;
@@ -297,7 +297,7 @@ public:
     static void sendLeaveSession(const LLUUID& session_id, const LLUUID& other_participant_id);
     static bool sendStartSession(const LLUUID& temp_session_id, const LLUUID& other_participant_id,
                           const uuid_vec_t& ids, EInstantMessage dialog);
-    static void sendTypingState(LLUUID session_id, LLUUID other_participant_id, BOOL typing);
+    static void sendTypingState(LLUUID session_id, LLUUID other_participant_id, bool typing);
     static void sendMessage(const std::string& utf8_text, const LLUUID& im_session_id,
                                 const LLUUID& other_participant_id, EInstantMessage dialog);
 
@@ -330,7 +330,7 @@ class LLIMSessionObserver
 {
 public:
     virtual ~LLIMSessionObserver() {}
-    virtual void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg) = 0;
+    virtual void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, bool has_offline_msg) = 0;
     virtual void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) = 0;
     virtual void sessionVoiceOrIMStarted(const LLUUID& session_id) = 0;
     virtual void sessionRemoved(const LLUUID& session_id) = 0;
@@ -439,7 +439,7 @@ public:
     // good connection.
     void disconnectAllSessions();
 
-    BOOL hasSession(const LLUUID& session_id);
+    bool hasSession(const LLUUID& session_id);
 
     static LLUUID computeSessionID(EInstantMessage dialog, const LLUUID& other_participant_id);
 
@@ -499,7 +499,7 @@ private:
     void noteOfflineUsers(const LLUUID& session_id, const std::vector<LLUUID>& ids);
     void noteMutedUsers(const LLUUID& session_id, const std::vector<LLUUID>& ids);
 
-    void processIMTypingCore(const LLUUID& from_id, const EInstantMessage im_type, BOOL typing);
+    void processIMTypingCore(const LLUUID& from_id, const EInstantMessage im_type, bool typing);
 
     static void onInviteNameLookup(LLSD payload, const LLUUID& id, const LLAvatarName& name);
 
@@ -554,7 +554,7 @@ public:
     LLCallDialog(const LLSD& payload);
     virtual ~LLCallDialog();
 
-    virtual BOOL postBuild();
+    virtual bool postBuild();
 
     void dockToToolbarButton(const std::string& toolbarButtonName);
 
@@ -599,7 +599,7 @@ public:
         }
     }
 
-    /*virtual*/ BOOL postBuild();
+    /*virtual*/ bool postBuild();
     /*virtual*/ void onOpen(const LLSD& key);
 
     static void onAccept(void* user_data);
@@ -625,7 +625,7 @@ class LLOutgoingCallDialog : public LLCallDialog
 public:
     LLOutgoingCallDialog(const LLSD& payload);
 
-    /*virtual*/ BOOL postBuild();
+    /*virtual*/ bool postBuild();
     void show(const LLSD& key);
 
     static void onCancel(void* user_data);