Merge.

indra/llmessage/llpartdata.cpp

@@ -431,4 +431,4 @@ bool LLPartSysData::fromLLSD(LLSD& sd)
 	mTargetUUID = LLUUID(sd["TargetId"].asString());
 
 	return true;
-}
+}

indra/llui/llcheckboxctrl.cpp

@@ -263,4 +263,4 @@ void LLCheckBoxCtrl::draw()
 	}
 	LLUICtrl::draw();
 }
-// </FS:Ansariel>
+// </FS:Ansariel>

indra/mac_crash_logger/llcrashloggermacdelegate.mm

@@ -72,4 +72,4 @@ std::string* NSToString( NSString *ns_str )
     [ _window close];
 }
 @end
-*/
+*/

indra/newview/fsareasearch.h

@@ -423,4 +423,4 @@ private:
 	FSAreaSearch* mFSAreaSearch;
 };
 
-#endif // FS_AREASEARCH_H
+#endif // FS_AREASEARCH_H

indra/newview/fscommon.cpp

@@ -272,4 +272,4 @@ bool FSCommon::isLinden(const LLUUID& av_id)
 			last_name == LL_PRODUCTENGINE ||
 			last_name == LL_SCOUT ||
 			last_name == LL_TESTER);
-}
+}

indra/newview/fsconsoleutils.h

@@ -45,4 +45,4 @@ protected:
 
 };
 
-#endif // FS_CONSOLEUTILS_H
+#endif // FS_CONSOLEUTILS_H

indra/newview/fsfloaterposestand.cpp

@@ -110,4 +110,4 @@ void FSFloaterPoseStand::setLock(bool enabled)
 		gAgent.standUp();
 	}
 	mPoseStandLock = enabled;
-}
+}

indra/newview/fskeywords.h

@@ -23,4 +23,4 @@ private:
 	
 };
 
-#endif // FS_KEYWORDS_H
+#endif // FS_KEYWORDS_H

indra/newview/fslslpreproc.h

@@ -88,4 +88,4 @@ public:
 	std::string mMainScriptName;
 };
 
-#endif // FS_LSLPREPROC_H
+#endif // FS_LSLPREPROC_H

indra/newview/fspanelprefs.cpp

@@ -218,4 +218,4 @@ void PanelPreferenceFirestorm::onCommitTrans()
 	{
 		gSavedSettings.setBOOL("NextOwnerCopy", TRUE);
 	}
-}
+}

indra/newview/fspose.cpp

@@ -46,4 +46,4 @@ void FSPose::stopPose()
 		gAgent.sendAnimationRequest(mCurrentPose, ANIM_REQUEST_STOP);
 		mCurrentPose.setNull();
 	}
-}
+}

indra/newview/fsradarentry.h

@@ -80,4 +80,4 @@ private:
 	LLAvatarNameCache::callback_connection_t mAvatarNameCallbackConnection;
 };
 
-#endif // FS_RADARENTRY_H
+#endif // FS_RADARENTRY_H

indra/newview/fswsassetblacklist.h

@@ -59,4 +59,4 @@ private:
 	blacklist_data_t		mBlacklistData;
 };
 
-#endif // FS_WSASSETBLACKLIST_H
+#endif // FS_WSASSETBLACKLIST_H

indra/newview/kcwlinterface.h

@@ -84,4 +84,4 @@ protected:
 	bool mDisabled; // control bool to clear all states after being disabled
 };
 
-#endif // KC_WLINTERFACE_H
+#endif // KC_WLINTERFACE_H

indra/newview/lggbeamcolormapfloater.h

@@ -73,4 +73,4 @@ protected:
 
 };
 
-#endif // LGG_BEAMCOLORMAPFLOATER_H
+#endif // LGG_BEAMCOLORMAPFLOATER_H

indra/newview/lggbeammapfloater.h

@@ -79,4 +79,4 @@ private:
 	F32 mContextConeOpacity;
 };
 
-#endif // LGG_BEAMMAPFLOATER_H
+#endif // LGG_BEAMMAPFLOATER_H

indra/newview/lggbeammaps.h

@@ -55,4 +55,4 @@ class lggBeamMaps
 
 extern lggBeamMaps gLggBeamMaps;
 
-#endif // LGG_BEAMMAPS_H
+#endif // LGG_BEAMMAPS_H

indra/newview/lggcontactsets.cpp

@@ -976,4 +976,4 @@ LGGContactSets::ContactSetGroup* LGGContactSets::getGroup(const std::string& gro
 		return found->second;
 	}
 	return NULL;
-}
+}

indra/newview/llconversationlog.h

@@ -217,4 +217,4 @@ public:
 
 #endif /* LLCONVERSATIONLOG_H_ */
 
-#endif
+#endif