fix typo and update text for new option in avatar menu
Appease VS2010 warning and make ui code more consistent with the modern standard in daeexport.cpp
Fix log timestamp inconsistency when including seconds
Don't crash when chanelp returned is null
Kill a compiler warning
Request: Add menu item separator between replace and remove.
Fix log being read from the top, woops
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
Revert OCD commit tick.

Revert "Appease VS2010 warning and make ui code more consistent with the modern standard in daeexport.cpp"

This reverts commit cb6dec62ec5e9a2bd09750b425b34871093e7c2a.
Re-apply warning fix after the previous revert
Fixed profile floater not displaying custom account type strings from server
Translation poking for my last commit
Rewrite of LLLogChat::loadHistory.

Tested to work.
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
Fix 1098 (caused by silly mistake in filepicker bit for windows)
Version 1.8.3
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer

Conflicts:
	indra/newview/lllogchat.cpp

	This conflict undoes d48a395e546f54515170446bda748a1e4a4bb2d0
	for now.
forgot to remove a line created by git to show the conflict
cleanup and bugfixes to LLLogChat::loadHistory()

	This is part one, doesn't work right yet.