Fixed header includes uniqueness

indra/newview/fsareasearch.h

@@ -25,6 +25,9 @@
  * $/LicenseInfo$
  */
 
+#ifndef FS_AREASEARCH_H
+#define FS_AREASEARCH_H
+
 #include "llfloater.h"
 #include "llsingleton.h"
 #include "lluuid.h"
@@ -389,3 +392,5 @@ public:
 private:
 	FSAreaSearch* mFSAreaSearch;
 };
+
+#endif // FS_AREASEARCH_H

indra/newview/fsdata.h

@@ -29,6 +29,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef FS_DATA_H
+#define FS_DATA_H
+
 #include <map>
 #include <llsd.h>
 #include <llinstantmessage.h>
@@ -100,3 +103,5 @@ private:
 	FSDataAgent mSupportAgent;
 	std::map<LLUUID, FSDataAgent> mSupportAgentList;
 };
+
+#endif // FS_DATA_H

indra/newview/fsfloaterposestand.h

@@ -10,8 +10,8 @@
  * ----------------------------------------------------------------------------
  */
 
-#ifndef FS_FSFLOATERPOSESTAND_H
-#define FS_FSFLOATERPOSESTAND_H
+#ifndef FS_FLOATERPOSESTAND_H
+#define FS_FLOATERPOSESTAND_H
 
 #include "llfloater.h"
 #include "llcombobox.h"

indra/newview/fskeywords.h

@@ -1,3 +1,5 @@
+#ifndef FS_KEYWORDS_H
+#define FS_KEYWORDS_H
 
 #include "llsingleton.h"
 #include "llstring.h"
@@ -20,3 +22,5 @@ private:
 	
 	
 };
+
+#endif // FS_KEYWORDS_H

indra/newview/fslslpreproc.h

@@ -29,6 +29,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef FS_LSLPREPROC_H
+#define FS_LSLPREPROC_H
+
 #include "llviewerprecompiledheaders.h"
 #include "llpreviewscript.h"
 
@@ -83,3 +86,5 @@ public:
 	BOOL mHDDInclude;
 	std::string mMainScriptName;
 };
+
+#endif // FS_LSLPREPROC_H

indra/newview/fspanelprefs.h

@@ -1,9 +1,13 @@
 /*${License blank}*/
-#ifndef panel_prefs_firestorm
-#define panel_prefs_firestorm
+
+#ifndef FS_PANELPREFS_H
+#define FS_PANELPREFS_H
+
 #include "llfloaterpreference.h"
 #include "lllineeditor.h"
+
 class LLLineEditor;
+
 class PanelPreferenceFirestorm : public LLPanelPreference
 {
 public:
@@ -30,4 +34,5 @@ protected:
 	LLComboBox* m_ColorClienttags;
 	LLComboBox* m_ClientTagsVisibility;
 };
-#endif
+
+#endif // FS_PANELPREFS_H

indra/newview/fspose.h

@@ -10,10 +10,8 @@
  * ----------------------------------------------------------------------------
  */
 
-#ifndef FS_FSPOSE_H
-#define FS_FSPOSE_H
-
-#endif // FS_FSPOSE_H
+#ifndef FS_POSE_H
+#define FS_POSE_H
 
 #include "llsingleton.h"
 
@@ -29,4 +27,6 @@ protected:
 	~FSPose();
 private:
 	LLUUID	mCurrentPose;
-};
+};
+
+#endif // FS_POSE_H

indra/newview/fswsassetblacklist.h

@@ -25,6 +25,9 @@
  * $/LicenseInfo$
  */
 
+#ifndef FS_WSASSETBLACKLIST_H
+#define FS_WSASSETBLACKLIST_H
+
 #include "llviewerprecompiledheaders.h"
 #include "llsingleton.h"
 #include "llfloater.h"
@@ -51,3 +54,5 @@ private:
 	static std::string blacklist_file_name;
 	static BlacklistMAP BlacklistIDs;
 };
+
+#endif // FS_WSASSETBLACKLIST_H

indra/newview/kcwlinterface.h

@@ -22,6 +22,9 @@
  * http://www.firestormviewer.org
  */
 
+#ifndef KC_WLINTERFACE_H
+#define KC_WLINTERFACE_H
+
 #include "llviewerprecompiledheaders.h"
 #include "llsingleton.h"
 #include "lleventtimer.h"
@@ -79,3 +82,5 @@ protected:
 	bool mHaveRegionSettings;
 	bool mDisabled; // control bool to clear all states after being disabled
 };
+
+#endif // KC_WLINTERFACE_H

indra/newview/lggbeamcolormapfloater.h

@@ -11,6 +11,8 @@
  * http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
+#ifndef LGG_BEAMCOLORMAPFLOATER_H
+#define LGG_BEAMCOLORMAPFLOATER_H
 
 #include "llviewerprecompiledheaders.h"
 
@@ -70,3 +72,5 @@ protected:
 	LLSliderCtrl* mColorSlider;
 
 };
+
+#endif // LGG_BEAMCOLORMAPFLOATER_H

indra/newview/lggbeammapfloater.h

@@ -11,6 +11,9 @@
  * http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
+#ifndef LGG_BEAMMAPFLOATER_H
+#define LGG_BEAMMAPFLOATER_H
+
 #include "llviewerprecompiledheaders.h"
 
 #include "llagentdata.h"
@@ -75,3 +78,5 @@ private:
 
 	F32 mContextConeOpacity;
 };
+
+#endif // LGG_BEAMMAPFLOATER_H

indra/newview/lggbeammaps.h

@@ -11,6 +11,9 @@
  * http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
+#ifndef LGG_BEAMMAPS_H
+#define LGG_BEAMMAPS_H
+
 #include "llhudeffecttrail.h"
 #include "llviewerprecompiledheaders.h"
 #include "lggbeamscolors.h"
@@ -51,3 +54,5 @@ class lggBeamMaps
 
 
 extern lggBeamMaps gLggBeamMaps;
+
+#endif // LGG_BEAMMAPS_H

indra/newview/lggbeamscolors.h

@@ -11,8 +11,8 @@
  * http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
-#ifndef  LGGBEAMCOLORDATA
-#define LGGBEAMCOLORDATA
+#ifndef LGG_BEAMSCOLORS_H
+#define LGG_BEAMSCOLORS_H
 
 #include "llviewerprecompiledheaders.h"
 
@@ -41,4 +41,4 @@ public:
 	// List sorted by name.
 };
 
-#endif
+#endif // LGG_BEAMSCOLORS_H

indra/newview/lggcontactsets.h

@@ -16,8 +16,8 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-#ifndef LGG_FRIENDS_GROUPS_H
-#define LGG_FRIENDS_GROUPS_H
+#ifndef LGG_CONTACTSETS_H
+#define LGG_CONTACTSETS_H
 
 #include "v4color.h"
 
@@ -88,4 +88,4 @@ private:
 
 };
 
-#endif 
+#endif // LGG_CONTACTSETS_H

indra/newview/lggcontactsetsfloater.h

@@ -16,8 +16,8 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-#ifndef LGG_FRIENDS_GROUPS_FLOATER_H
-#define LGG_FRIENDS_GROUPS_FLOATER_H
+#ifndef LGG_CONTACTSETSFLOATER_H
+#define LGG_CONTACTSETSFLOATER_H
 
 #include "llview.h"
 #include "llviewerinventory.h"
@@ -119,4 +119,4 @@ public:
 };
 
 
-#endif 
+#endif // LGG_CONTACTSETSFLOATER_H