Merge pull request #1476 from secondlife/marchcat/x-b-merge

Maint X -> Maint B merge

1 files changed, 58 insertions, 58 deletions

diff --git a/indra/newview/llconversationloglist.h b/indra/newview/llconversationloglist.h
index 62ec57e09e..6435527b0d 100644
--- a/indra/newview/llconversationloglist.h
+++ b/indra/newview/llconversationloglist.h
@@ -41,69 +41,69 @@ class LLConversationLogListItem;
 
 class LLConversationLogList: public LLFlatListViewEx, public LLConversationLogObserver
 {
-	LOG_CLASS(LLConversationLogList);
+    LOG_CLASS(LLConversationLogList);
 public:
 
-	typedef enum e_sort_oder{
-		E_SORT_BY_NAME = 0,
-		E_SORT_BY_DATE = 1,
-	} ESortOrder;
+    typedef enum e_sort_oder{
+        E_SORT_BY_NAME = 0,
+        E_SORT_BY_DATE = 1,
+    } ESortOrder;
 
-	struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params>
-	{
-		Params(){};
-	};
+    struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params>
+    {
+        Params(){};
+    };
 
-	LLConversationLogList(const Params& p);
-	virtual ~LLConversationLogList();
+    LLConversationLogList(const Params& p);
+    virtual ~LLConversationLogList();
 
-	virtual void draw();
+    virtual void draw();
 
-	virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+    virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
 
-	LLToggleableMenu*	getContextMenu() const { return mContextMenu.get(); }
+    LLToggleableMenu*   getContextMenu() const { return mContextMenu.get(); }
 
-	void addNewItem(const LLConversation* conversation);
-	void setNameFilter(const std::string& filter);
-	void sortByName();
-	void sortByDate();
-	void toggleSortFriendsOnTop();
-	bool getSortFriendsOnTop() const { return mIsFriendsOnTop; }
+    void addNewItem(const LLConversation* conversation);
+    void setNameFilter(const std::string& filter);
+    void sortByName();
+    void sortByDate();
+    void toggleSortFriendsOnTop();
+    bool getSortFriendsOnTop() const { return mIsFriendsOnTop; }
 
-	/**
-	 * Changes from LLConversationLogObserver
-	 */
-	virtual void changed();
-	virtual void changed(const LLUUID& session_id, U32 mask);
+    /**
+     * Changes from LLConversationLogObserver
+     */
+    virtual void changed();
+    virtual void changed(const LLUUID& session_id, U32 mask);
 
 private:
 
-	void setDirty(bool dirty = true) { mIsDirty = dirty; }
-	void refresh();
+    void setDirty(bool dirty = true) { mIsDirty = dirty; }
+    void refresh();
 
-	/**
-	 * Clears list and re-adds items from LLConverstationLog
-	 * If filter is not empty re-adds items which match the filter
-	 */
-	void rebuildList();
+    /**
+     * Clears list and re-adds items from LLConverstationLog
+     * If filter is not empty re-adds items which match the filter
+     */
+    void rebuildList();
 
-	bool findInsensitive(std::string haystack, const std::string& needle_upper);
+    bool findInsensitive(std::string haystack, const std::string& needle_upper);
 
-	void onCustomAction (const LLSD& userdata);
-	bool isActionEnabled(const LLSD& userdata);
-	bool isActionChecked(const LLSD& userdata);
+    void onCustomAction (const LLSD& userdata);
+    bool isActionEnabled(const LLSD& userdata);
+    bool isActionChecked(const LLSD& userdata);
 
-	LLIMModel::LLIMSession::SType getSelectedSessionType();
-	const LLConversationLogListItem* getSelectedConversationPanel();
-	const LLConversation* getSelectedConversation();
-	LLConversationLogListItem* getConversationLogListItem(const LLUUID& session_id);
+    LLIMModel::LLIMSession::SType getSelectedSessionType();
+    const LLConversationLogListItem* getSelectedConversationPanel();
+    const LLConversation* getSelectedConversation();
+    LLConversationLogListItem* getConversationLogListItem(const LLUUID& session_id);
 
-	ESortOrder getSortOrder();
+    ESortOrder getSortOrder();
 
-	LLHandle<LLToggleableMenu>	mContextMenu;
-	bool mIsDirty;
-	bool mIsFriendsOnTop;
-	std::string mNameFilter;
+    LLHandle<LLToggleableMenu>  mContextMenu;
+    bool mIsDirty;
+    bool mIsFriendsOnTop;
+    std::string mNameFilter;
 };
 
 /**
@@ -111,43 +111,43 @@ private:
  */
 class LLConversationLogListItemComparator : public LLFlatListView::ItemComparator
 {
-	LOG_CLASS(LLConversationLogListItemComparator);
+    LOG_CLASS(LLConversationLogListItemComparator);
 
 public:
-	LLConversationLogListItemComparator() {};
-	virtual ~LLConversationLogListItemComparator() {};
+    LLConversationLogListItemComparator() {};
+    virtual ~LLConversationLogListItemComparator() {};
 
-	virtual bool compare(const LLPanel* item1, const LLPanel* item2) const;
+    virtual bool compare(const LLPanel* item1, const LLPanel* item2) const;
 
 protected:
 
-	virtual bool doCompare(const LLConversationLogListItem* conversation1, const LLConversationLogListItem* conversation2) const = 0;
+    virtual bool doCompare(const LLConversationLogListItem* conversation1, const LLConversationLogListItem* conversation2) const = 0;
 };
 
 class LLConversationLogListNameComparator : public LLConversationLogListItemComparator
 {
-	LOG_CLASS(LLConversationLogListNameComparator);
+    LOG_CLASS(LLConversationLogListNameComparator);
 
 public:
-	LLConversationLogListNameComparator() {};
-	virtual ~LLConversationLogListNameComparator() {};
+    LLConversationLogListNameComparator() {};
+    virtual ~LLConversationLogListNameComparator() {};
 
 protected:
 
-	virtual bool doCompare(const LLConversationLogListItem* conversation1, const LLConversationLogListItem* conversation2) const;
+    virtual bool doCompare(const LLConversationLogListItem* conversation1, const LLConversationLogListItem* conversation2) const;
 };
 
 class LLConversationLogListDateComparator : public LLConversationLogListItemComparator
 {
-	LOG_CLASS(LLConversationLogListDateComparator);
+    LOG_CLASS(LLConversationLogListDateComparator);
 
 public:
-	LLConversationLogListDateComparator() {};
-	virtual ~LLConversationLogListDateComparator() {};
+    LLConversationLogListDateComparator() {};
+    virtual ~LLConversationLogListDateComparator() {};
 
 protected:
 
-	virtual bool doCompare(const LLConversationLogListItem* conversation1, const LLConversationLogListItem* conversation2) const;
+    virtual bool doCompare(const LLConversationLogListItem* conversation1, const LLConversationLogListItem* conversation2) const;
 };
 
 #endif /* LLCONVERSATIONLOGLIST_H_ */