Merge commit 'e7eced3' into lua-timers for whitespace fixes.

1 files changed, 31 insertions, 31 deletions

diff --git a/indra/newview/llfloaterpathfindingcharacters.h b/indra/newview/llfloaterpathfindingcharacters.h
index 4021f4f119..4f9c7aadc0 100644
--- a/indra/newview/llfloaterpathfindingcharacters.h
+++ b/indra/newview/llfloaterpathfindingcharacters.h
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file   llfloaterpathfindingcharacters.h
 * @brief  "Pathfinding characters" floater, allowing for identification of pathfinding characters and their cpu usage.
 * @author Stinson@lindenlab.com
@@ -42,58 +42,58 @@ class LLVector3;
 class LLFloaterPathfindingCharacters : public LLFloaterPathfindingObjects
 {
 public:
-	virtual void                                    onClose(bool pIsAppQuitting);
+    virtual void                                    onClose(bool pIsAppQuitting);
 
-	BOOL                                            isShowPhysicsCapsule() const;
-	void                                            setShowPhysicsCapsule(BOOL pIsShowPhysicsCapsule);
+    BOOL                                            isShowPhysicsCapsule() const;
+    void                                            setShowPhysicsCapsule(BOOL pIsShowPhysicsCapsule);
 
-	BOOL                                            isPhysicsCapsuleEnabled(LLUUID& id, LLVector3& pos, LLQuaternion& rot) const;
+    BOOL                                            isPhysicsCapsuleEnabled(LLUUID& id, LLVector3& pos, LLQuaternion& rot) const;
 
-	static void                                     openCharactersWithSelectedObjects();
-	static LLHandle<LLFloaterPathfindingCharacters> getInstanceHandle();
+    static void                                     openCharactersWithSelectedObjects();
+    static LLHandle<LLFloaterPathfindingCharacters> getInstanceHandle();
 
 protected:
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 
-	LLFloaterPathfindingCharacters(const LLSD& pSeed);
-	virtual ~LLFloaterPathfindingCharacters();
+    LLFloaterPathfindingCharacters(const LLSD& pSeed);
+    virtual ~LLFloaterPathfindingCharacters();
 
-	virtual BOOL                       postBuild();
+    virtual BOOL                       postBuild();
 
-	virtual void                       requestGetObjects();
+    virtual void                       requestGetObjects();
 
-	virtual void                       buildObjectsScrollList(const LLPathfindingObjectListPtr pObjectListPtr);
+    virtual void                       buildObjectsScrollList(const LLPathfindingObjectListPtr pObjectListPtr);
 
-	virtual void                       updateControlsOnScrollListChange();
+    virtual void                       updateControlsOnScrollListChange();
 
-	virtual S32                        getNameColumnIndex() const;
-	virtual S32                        getOwnerNameColumnIndex() const;
-	virtual std::string                getOwnerName(const LLPathfindingObject *pObject) const;
-	virtual const LLColor4             &getBeaconColor() const;
+    virtual S32                        getNameColumnIndex() const;
+    virtual S32                        getOwnerNameColumnIndex() const;
+    virtual std::string                getOwnerName(const LLPathfindingObject *pObject) const;
+    virtual const LLColor4             &getBeaconColor() const;
 
-	virtual LLPathfindingObjectListPtr getEmptyObjectList() const;
+    virtual LLPathfindingObjectListPtr getEmptyObjectList() const;
 
 private:
-	void onShowPhysicsCapsuleClicked();
+    void onShowPhysicsCapsuleClicked();
 
-	LLSD buildCharacterScrollListItemData(const LLPathfindingCharacter *pCharacterPtr) const;
+    LLSD buildCharacterScrollListItemData(const LLPathfindingCharacter *pCharacterPtr) const;
 
-	void updateStateOnDisplayControls();
-	void showSelectedCharacterCapsules();
+    void updateStateOnDisplayControls();
+    void showSelectedCharacterCapsules();
 
-	void showCapsule() const;
-	void hideCapsule() const;
+    void showCapsule() const;
+    void hideCapsule() const;
 
-	bool getCapsuleRenderData(LLVector3& pPosition, LLQuaternion& rot) const;
+    bool getCapsuleRenderData(LLVector3& pPosition, LLQuaternion& rot) const;
 
-	LLCheckBoxCtrl                                   *mShowPhysicsCapsuleCheckBox;
+    LLCheckBoxCtrl                                   *mShowPhysicsCapsuleCheckBox;
 
-	LLUUID                                           mSelectedCharacterId;
+    LLUUID                                           mSelectedCharacterId;
 
-	LLColor4                                         mBeaconColor;
+    LLColor4                                         mBeaconColor;
 
-	LLRootHandle<LLFloaterPathfindingCharacters>     mSelfHandle;
-	static LLHandle<LLFloaterPathfindingCharacters>  sInstanceHandle;
+    LLRootHandle<LLFloaterPathfindingCharacters>     mSelfHandle;
+    static LLHandle<LLFloaterPathfindingCharacters>  sInstanceHandle;
 };
 
 #endif // LL_LLFLOATERPATHFINDINGCHARACTERS_H