Streaming FBO checkbox in preferences->graphics->advanced enable switch was inverted due to vbo rebuild being deferred to a later frame.
Extend the octopus to allow avatar pickers to be used.
Remove the spammy leftover debug message. Thought I'd done that already...
Merge remote-tracking branch 'melanie_t/master'
Use legacy function pointer for old legacy setTextEntryCallback signature.
Merge remote-tracking branch 'shyotl/master'
Fix SuSe Linux build break
Allow the octopus to set a channel at floater level to disambiguate between simultaneously open floaters
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
LLSliderCtrl callbacks actually get the child LLSlider object, not the LLSliderCtrl object.
Support Legacy Region/Estate Environment

Also Disable Environment Tab when the cap required to use it isn't supported.
Merge remote-tracking branch 'shyotl/master'
Less prim peekaboo antics.
Update LSL information (Adds new AnimationOverride)
French translation update
TEMPORARILY disable erroring out during mesh upload
Add another menu insert point in the admin menu.
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
Added OverrideAnimations string, so that notifications present an actual permission QUESTION when asking for the perm.

Conflicts:

	indra/newview/llviewermessage.cpp
Wrap std::filebuf to work with unicode filepaths on Windows. (Use UTF-16)