Merge branch 'release/luau-scripting' into lua-resultset

1 files changed, 12 insertions, 13 deletions

diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h
index 71fe2bd204..d1cfd3442c 100644
--- a/indra/newview/llfloaterimcontainer.h
+++ b/indra/newview/llfloaterimcontainer.h
@@ -56,25 +56,25 @@ public:
     LLFloaterIMContainer(const LLSD& seed, const Params& params = getDefaultParams());
     virtual ~LLFloaterIMContainer();
 
-    /*virtual*/ BOOL postBuild();
+    /*virtual*/ bool postBuild();
     /*virtual*/ void onOpen(const LLSD& key);
     /*virtual*/ void draw();
-    /*virtual*/ void setMinimized(BOOL b);
-    /*virtual*/ void setVisible(BOOL visible);
-    /*virtual*/ void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD());
+    /*virtual*/ void setMinimized(bool b);
+    /*virtual*/ void setVisible(bool visible);
+    /*virtual*/ void setVisibleAndFrontmost(bool take_focus=true, const LLSD& key = LLSD());
     /*virtual*/ void updateResizeLimits();
     /*virtual*/ void handleReshape(const LLRect& rect, bool by_user);
 
     void onCloseFloater(LLUUID& id);
 
     /*virtual*/ void addFloater(LLFloater* floaterp,
-                                BOOL select_added_floater,
+                                bool select_added_floater,
                                 LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
     void returnFloaterToHost();
     void showConversation(const LLUUID& session_id);
     void selectConversation(const LLUUID& session_id);
     void selectNextConversationByID(const LLUUID& session_id);
-    BOOL selectConversationPair(const LLUUID& session_id, bool select_widget, bool focus_floater = true);
+    bool selectConversationPair(const LLUUID& session_id, bool select_widget, bool focus_floater = true);
     void clearAllFlashStates();
     bool selectAdjacentConversation(bool focus_selected);
     bool selectNextorPreviousConversation(bool select_next, bool focus_selected = true);
@@ -83,7 +83,6 @@ public:
     /*virtual*/ void tabClose();
     void showStub(bool visible);
 
-    static LLFloater* getCurrentVoiceFloater();
     static LLFloaterIMContainer* findInstance();
     static LLFloaterIMContainer* getInstance();
 
@@ -97,7 +96,7 @@ public:
     static void idle(void* user_data);
 
     // LLIMSessionObserver observe triggers
-    /*virtual*/ void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg);
+    /*virtual*/ void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, bool has_offline_msg);
     /*virtual*/ void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id);
     /*virtual*/ void sessionVoiceOrIMStarted(const LLUUID& session_id);
     /*virtual*/ void sessionRemoved(const LLUUID& session_id);
@@ -116,11 +115,11 @@ public:
     void doToParticipants(const std::string& item, uuid_vec_t& selectedIDS);
 
     void assignResizeLimits();
-    virtual BOOL handleKeyHere(KEY key, MASK mask );
+    virtual bool handleKeyHere(KEY key, MASK mask );
     /*virtual*/ void closeFloater(bool app_quitting = false);
-    void closeAllConversations();
+    void closeAllConversations(bool app_quitting);
     void closeSelectedConversations(const uuid_vec_t& ids);
-    /*virtual*/ BOOL isFrontmost();
+    /*virtual*/ bool isFrontmost();
 
 
 private:
@@ -147,7 +146,7 @@ private:
     void onAddButtonClicked();
     void onAvatarPicked(const uuid_vec_t& ids);
 
-    BOOL isActionChecked(const LLSD& userdata);
+    bool isActionChecked(const LLSD& userdata);
     void onCustomAction (const LLSD& userdata);
     void setSortOrderSessions(const LLConversationFilter::ESortOrderType order);
     void setSortOrderParticipants(const LLConversationFilter::ESortOrderType order);
@@ -213,7 +212,7 @@ public:
     void highlightConversationItemWidget(const LLUUID& session_id, bool is_highlighted);
     bool isScrolledOutOfSight(LLConversationViewSession* conversation_item_widget);
     boost::signals2::connection mMicroChangedSignal;
-    S32 getConversationListItemSize() { return mConversationsWidgets.size(); }
+    S32 getConversationListItemSize() { return static_cast<S32>(mConversationsWidgets.size()); }
     typedef std::list<LLFloater*> floater_list_t;
     void getDetachedConversationFloaters(floater_list_t& floaters);