Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 13 insertions, 13 deletions

diff --git a/indra/newview/llpathfindingobjectlist.h b/indra/newview/llpathfindingobjectlist.h
index e2e0dce4da..654423183e 100644
--- a/indra/newview/llpathfindingobjectlist.h
+++ b/indra/newview/llpathfindingobjectlist.h
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file   llpathfindingobjectlist.h
 * @brief  Header file for llpathfindingobjectlist
 * @author Stinson@lindenlab.com
@@ -42,27 +42,27 @@ typedef std::map<std::string, LLPathfindingObjectPtr> LLPathfindingObjectMap;
 class LLPathfindingObjectList
 {
 public:
-	LLPathfindingObjectList();
-	virtual ~LLPathfindingObjectList();
+    LLPathfindingObjectList();
+    virtual ~LLPathfindingObjectList();
 
-	bool isEmpty() const;
+    bool isEmpty() const;
 
-	void clear();
+    void clear();
 
-	void update(LLPathfindingObjectPtr pUpdateObjectPtr);
-	void update(LLPathfindingObjectListPtr pUpdateObjectListPtr);
+    void update(LLPathfindingObjectPtr pUpdateObjectPtr);
+    void update(LLPathfindingObjectListPtr pUpdateObjectListPtr);
 
-	LLPathfindingObjectPtr find(const std::string &pObjectId) const;
+    LLPathfindingObjectPtr find(const std::string &pObjectId) const;
 
-	typedef LLPathfindingObjectMap::const_iterator const_iterator;
-	const_iterator begin() const;
-	const_iterator end() const;
+    typedef LLPathfindingObjectMap::const_iterator const_iterator;
+    const_iterator begin() const;
+    const_iterator end() const;
 
 protected:
-	LLPathfindingObjectMap &getObjectMap();
+    LLPathfindingObjectMap &getObjectMap();
 
 private:
-	LLPathfindingObjectMap mObjectMap;
+    LLPathfindingObjectMap mObjectMap;
 };
 
 #endif // LL_LLPATHFINDINGOBJECTLIST_H