Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
Revert "[Preferences Refactor] Remove window size combo box from graphics preferences"

The issue wasn't the resolution box, and it apparently has its uses.
This reverts commit ac106b0aff3cb0c710b6473d7582e2d8f6b6def4.

Conflicts:
	indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
Feature Request: Show how many scripts are actually running when doing a script count (also shows mono!)
Attempt to fix Issue 1154: Streaming Audio Display no longer stays enabled across relogs
MAINT-3187: Name list controls do not properly resolve avatar names

Work by Ansariel

For us, this is just to disconnect properly, we had this commented out because it was broken.
STORM-2011: Group member lists not loading properly

Work by Ansariel

For us, this is just to disconnect properly, we didn't have this because it was broken.
STORM-2018: Group invite fails to let you join groups when groups maxed even when you leave group
Fix Issue 1182: Script Window Resize Issue
Added region positions to the world map tiles

This feature added the setting 'SFMapShowRegionPositions'
MAINT-4001 : Make Received Items not movable (protected), consolidate Received Items folders which may have been moved

Work by Merov Linden.
Repeats per meter goes negative when flipping, let it be modified while in the negative without clamping to a positive minimum.
[temp] demote this notification until the underlying problem is fixed
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer