Merge

indra/llui/llmultislider.cpp

indra/llui/llmultislider.h

indra/llui/llmultisliderctrl.h

indra/newview/llenvironment.cpp

indra/newview/llenvironment.h

indra/newview/llfloatereditextdaycycle.cpp

indra/newview/llfloatereditextdaycycle.h

indra/newview/llfloaterland.cpp

indra/newview/llfloaterregioninfo.cpp

indra/newview/llinventorypanel.cpp

indra/newview/llinventorypanel.h

indra/newview/llpanelenvironment.cpp

indra/newview/llpanelenvironment.h

indra/newview/llsettingspicker.cpp

indra/newview/llsettingspicker.h

indra/newview/llsettingsvo.cpp

...wview/skins/default/xui/en/floater_edit_ext_day_cycle.xml

indra/newview/skins/default/xui/en/notifications.xml

...newview/skins/default/xui/en/panel_region_environment.xml