svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

1 files changed, 50 insertions, 50 deletions

diff --git a/indra/newview/llfloaterinspect.h b/indra/newview/llfloaterinspect.h
index 6a3f494978..d221879d0e 100644
--- a/indra/newview/llfloaterinspect.h
+++ b/indra/newview/llfloaterinspect.h
@@ -1,50 +1,50 @@
-/** 

-* @file llfloaterfriends.h

-* @author Cube

-* @date 2006-12-16

-* @brief Declaration of class for displaying object attributes

-*

-* Copyright (c) 2005-$CurrentYear$, Linden Research, Inc.

-* $License$

-*/

-

-#ifndef LL_LLFLOATERINSPECT_H

-#define LL_LLFLOATERINSPECT_H

-

-#include "llfloater.h"

-

-//class LLTool;

-class LLObjectSelection;

-class LLScrollListCtrl;

-class LLUICtrl;

-

-class LLFloaterInspect : public LLFloater

-{

-public:

-	virtual ~LLFloaterInspect(void);

-	static void show(void* ignored = NULL);

-	virtual BOOL postBuild();

-	static void dirty();

-	static LLUUID getSelectedUUID();

-	virtual void draw();

-	virtual void refresh();

-	static BOOL isVisible();

-	virtual void onFocusReceived();

-	static void onClickCreatorProfile(void* ctrl);

-	static void onClickOwnerProfile(void* ctrl);

-	static void onSelectObject(LLUICtrl* ctrl, void* user_data);

-	LLScrollListCtrl* mObjectList;

-protected:

-	// protected members

-	LLFloaterInspect();

-	void setDirty() { mDirty = TRUE; }

-	bool mDirty;

-

-private:

-	// static data

-	static LLFloaterInspect* sInstance;

-

-	LLHandle<LLObjectSelection> mObjectSelection;

-};

-

-#endif //LL_LLFLOATERINSPECT_H
\ No newline at end of file
+/** 
+* @file llfloaterfriends.h
+* @author Cube
+* @date 2006-12-16
+* @brief Declaration of class for displaying object attributes
+*
+* Copyright (c) 2005-$CurrentYear$, Linden Research, Inc.
+* $License$
+*/
+
+#ifndef LL_LLFLOATERINSPECT_H
+#define LL_LLFLOATERINSPECT_H
+
+#include "llfloater.h"
+
+//class LLTool;
+class LLObjectSelection;
+class LLScrollListCtrl;
+class LLUICtrl;
+
+class LLFloaterInspect : public LLFloater
+{
+public:
+	virtual ~LLFloaterInspect(void);
+	static void show(void* ignored = NULL);
+	virtual BOOL postBuild();
+	static void dirty();
+	static LLUUID getSelectedUUID();
+	virtual void draw();
+	virtual void refresh();
+	static BOOL isVisible();
+	virtual void onFocusReceived();
+	static void onClickCreatorProfile(void* ctrl);
+	static void onClickOwnerProfile(void* ctrl);
+	static void onSelectObject(LLUICtrl* ctrl, void* user_data);
+	LLScrollListCtrl* mObjectList;
+protected:
+	// protected members
+	LLFloaterInspect();
+	void setDirty() { mDirty = TRUE; }
+	bool mDirty;
+
+private:
+	// static data
+	static LLFloaterInspect* sInstance;
+
+	LLHandle<LLObjectSelection> mObjectSelection;
+};
+
+#endif //LL_LLFLOATERINSPECT_H