Add toggle for RenderAnimateTrees in Advanced > Rendering
update floater_tools.xml and other minor fixes
Fix a render issue with Hightlight Transparent

The smoke texture is currently not applied to transparent objects.
This commit tweaks the red alpha overlay as a workaround for that.
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
Merge branch 'master' of github.com:DamianZhaoying/SingularityViewer
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
Fix a few signed unsigned mismatches
Fix /singularity/singularity-master/indra/plugins/filepicker/llfilepicker.cpp:762:61: warning: multi-character character constant

OSTypes are four byte sequences, therefore we should use 'JP2 ' instead of 'JP2'
Breaking pad: warning: 'OSStatus CarbonEventHandler(OpaqueEventHandlerCallRef*, OpaqueEventRef*, void*)' defined but not used
Feature Request: Make Log viewing cross platform by opening in a browser window

INB4 Windows users express discomfort.
There's no such thing as ATI Geforce... this seems to have been added because of VWR-29593, but there's no such thing...
Breaking pad: link SLPlugin.app with the exacption handler

Fixes loading of SLPlugin on OS X
Merge branch 'master' of https://github.com/slabua/SingularityViewer
Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer

Conflicts:
	indra/newview/llfloaterchat.cpp
	indra/newview/llimpanel.cpp

	* solved, using show_log_browser() like upstream, or xantispam
	  if a rule is in effect

	indra/newview/lllogchat.cpp

	* keeping my version