Fixed windows build in debug mode
Fixed build with DEBUG_CURLIO defined
Tweaked alert dialogs. Clicking 'x' issues a response. Either 'close', 'cancel', 'ok' or a dummy 'close' which will result in LLNotification::getSelectedOption returning -1 in callback. Listed in order of preference.
Disable AA when drawing ui.
Fix some subtle bugs in llrender.
Avoid using invalid iterator in LLNotifications::getChannel if channel is not found.
Renamed SHAlphaMaskMaxRMSE to SHAutoMaskMaxRMSE. Disabled alpha masking on attachments.
Fix llalertdialog.cpp (accidentally grabbed some changes that only work with future alterations I've yet to push to master.)
Merge remote-tracking branch 'shyotl/master'
Streaming FBO checkbox in preferences->graphics->advanced enable switch was inverted due to vbo rebuild being deferred to a later frame.
Merge remote-tracking branch 'melanie_t/master'
Merge remote-tracking branch 'melanie_t/master'
Use legacy function pointer for old legacy setTextEntryCallback signature.
Merge remote-tracking branch 'shyotl/master'
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer