Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer

# Conflicts: # indra/newview/llvoavatar.cpp Also Reverted reversion of removal of before() wrapper in llstl.h
2016-05-02 15:15:06 -04:00
parent cd66c61214 9e354801d8
commit 39b3f58e13
1477 changed files with 12486 additions and 16529 deletions
--- a/indra/newview/skins/apollo/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
+++ b/indra/newview/skins/apollo/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
--- a/indra/newview/skins/apollo/textures/account_id_green.tga
+++ b/indra/newview/skins/apollo/textures/account_id_green.tga
--- a/indra/newview/skins/apollo/textures/account_id_orange.tga
+++ b/indra/newview/skins/apollo/textures/account_id_orange.tga
--- a/indra/newview/skins/apollo/textures/active_speakers.tga
+++ b/indra/newview/skins/apollo/textures/active_speakers.tga
--- a/indra/newview/skins/apollo/textures/active_voice_tab.tga
+++ b/indra/newview/skins/apollo/textures/active_voice_tab.tga
--- a/indra/newview/skins/apollo/textures/alpha_gradient.tga
+++ b/indra/newview/skins/apollo/textures/alpha_gradient.tga
--- a/indra/newview/skins/apollo/textures/arrow_down.tga
+++ b/indra/newview/skins/apollo/textures/arrow_down.tga
--- a/indra/newview/skins/apollo/textures/arrow_up.tga
+++ b/indra/newview/skins/apollo/textures/arrow_up.tga
--- a/indra/newview/skins/apollo/textures/avatar_gone.tga
+++ b/indra/newview/skins/apollo/textures/avatar_gone.tga
--- a/indra/newview/skins/apollo/textures/avatar_new.tga
+++ b/indra/newview/skins/apollo/textures/avatar_new.tga
--- a/indra/newview/skins/apollo/textures/avatar_typing.tga
+++ b/indra/newview/skins/apollo/textures/avatar_typing.tga
--- a/indra/newview/skins/apollo/textures/button_anim_pause_disabled.tga
+++ b/indra/newview/skins/apollo/textures/button_anim_pause_disabled.tga
--- a/indra/newview/skins/apollo/textures/button_anim_play_disabled.tga
+++ b/indra/newview/skins/apollo/textures/button_anim_play_disabled.tga
--- a/indra/newview/skins/apollo/textures/button_anim_stop_disabled.tga
+++ b/indra/newview/skins/apollo/textures/button_anim_stop_disabled.tga
--- a/indra/newview/skins/apollo/textures/checkerboard_transparency_bg.png
+++ b/indra/newview/skins/apollo/textures/checkerboard_transparency_bg.png
--- a/indra/newview/skins/apollo/textures/circle.tga
+++ b/indra/newview/skins/apollo/textures/circle.tga
--- a/indra/newview/skins/apollo/textures/color_swatch_alpha.tga
+++ b/indra/newview/skins/apollo/textures/color_swatch_alpha.tga
--- a/indra/newview/skins/apollo/textures/crosshairs.tga
+++ b/indra/newview/skins/apollo/textures/crosshairs.tga
--- a/indra/newview/skins/apollo/textures/down_arrow.png
+++ b/indra/newview/skins/apollo/textures/down_arrow.png
--- a/indra/newview/skins/apollo/textures/ff_edit_mine.tga
+++ b/indra/newview/skins/apollo/textures/ff_edit_mine.tga
--- a/indra/newview/skins/apollo/textures/ff_edit_theirs.tga
+++ b/indra/newview/skins/apollo/textures/ff_edit_theirs.tga
--- a/indra/newview/skins/apollo/textures/ff_visible_map.tga
+++ b/indra/newview/skins/apollo/textures/ff_visible_map.tga
--- a/indra/newview/skins/apollo/textures/ff_visible_online.tga
+++ b/indra/newview/skins/apollo/textures/ff_visible_online.tga
--- a/indra/newview/skins/apollo/textures/icn_active-speakers-dot-lvl0.tga
+++ b/indra/newview/skins/apollo/textures/icn_active-speakers-dot-lvl0.tga
--- a/indra/newview/skins/apollo/textures/icn_active-speakers-dot-lvl1.tga
+++ b/indra/newview/skins/apollo/textures/icn_active-speakers-dot-lvl1.tga
--- a/indra/newview/skins/apollo/textures/icn_active-speakers-dot-lvl2.tga
+++ b/indra/newview/skins/apollo/textures/icn_active-speakers-dot-lvl2.tga
--- a/indra/newview/skins/apollo/textures/icn_active-speakers-typing1.tga
+++ b/indra/newview/skins/apollo/textures/icn_active-speakers-typing1.tga
--- a/indra/newview/skins/apollo/textures/icn_active-speakers-typing2.tga
+++ b/indra/newview/skins/apollo/textures/icn_active-speakers-typing2.tga
--- a/indra/newview/skins/apollo/textures/icn_active-speakers-typing3.tga
+++ b/indra/newview/skins/apollo/textures/icn_active-speakers-typing3.tga
--- a/indra/newview/skins/apollo/textures/icn_clear_lineeditor.tga
+++ b/indra/newview/skins/apollo/textures/icn_clear_lineeditor.tga
--- a/indra/newview/skins/apollo/textures/icn_media-pause.tga
+++ b/indra/newview/skins/apollo/textures/icn_media-pause.tga
--- a/indra/newview/skins/apollo/textures/icn_media-pause_active.tga
+++ b/indra/newview/skins/apollo/textures/icn_media-pause_active.tga
--- a/indra/newview/skins/apollo/textures/icn_media-pause_disabled.tga
+++ b/indra/newview/skins/apollo/textures/icn_media-pause_disabled.tga
--- a/indra/newview/skins/apollo/textures/icn_media-pause_enabled.tga
+++ b/indra/newview/skins/apollo/textures/icn_media-pause_enabled.tga
--- a/indra/newview/skins/apollo/textures/icn_media-play.tga
+++ b/indra/newview/skins/apollo/textures/icn_media-play.tga
--- a/indra/newview/skins/apollo/textures/icn_media-play_active.tga
+++ b/indra/newview/skins/apollo/textures/icn_media-play_active.tga
--- a/indra/newview/skins/apollo/textures/icn_media-play_disabled.tga
+++ b/indra/newview/skins/apollo/textures/icn_media-play_disabled.tga
--- a/indra/newview/skins/apollo/textures/icn_media-play_enabled.tga
+++ b/indra/newview/skins/apollo/textures/icn_media-play_enabled.tga
--- a/indra/newview/skins/apollo/textures/icn_media-stop_active.tga
+++ b/indra/newview/skins/apollo/textures/icn_media-stop_active.tga
--- a/indra/newview/skins/apollo/textures/icn_media-stop_disabled.tga
+++ b/indra/newview/skins/apollo/textures/icn_media-stop_disabled.tga
--- a/indra/newview/skins/apollo/textures/icn_media-stop_enabled.tga
+++ b/indra/newview/skins/apollo/textures/icn_media-stop_enabled.tga
--- a/indra/newview/skins/apollo/textures/icn_media.tga
+++ b/indra/newview/skins/apollo/textures/icn_media.tga
--- a/indra/newview/skins/apollo/textures/icn_music-pause.tga
+++ b/indra/newview/skins/apollo/textures/icn_music-pause.tga
--- a/indra/newview/skins/apollo/textures/icn_music-play.tga
+++ b/indra/newview/skins/apollo/textures/icn_music-play.tga
--- a/indra/newview/skins/apollo/textures/icn_music.tga
+++ b/indra/newview/skins/apollo/textures/icn_music.tga
--- a/indra/newview/skins/apollo/textures/icn_scrollbar.tga
+++ b/indra/newview/skins/apollo/textures/icn_scrollbar.tga
--- a/indra/newview/skins/apollo/textures/icn_scrollbar_bg.tga
+++ b/indra/newview/skins/apollo/textures/icn_scrollbar_bg.tga
--- a/indra/newview/skins/apollo/textures/icn_scrollbar_thumb.tga
+++ b/indra/newview/skins/apollo/textures/icn_scrollbar_thumb.tga
--- a/indra/newview/skins/apollo/textures/icn_speaker-muted_dark.tga
+++ b/indra/newview/skins/apollo/textures/icn_speaker-muted_dark.tga
--- a/indra/newview/skins/apollo/textures/icn_stop.tga
+++ b/indra/newview/skins/apollo/textures/icn_stop.tga
--- a/indra/newview/skins/apollo/textures/icn_textfield_enabled.tga
+++ b/indra/newview/skins/apollo/textures/icn_textfield_enabled.tga
--- a/indra/newview/skins/apollo/textures/icn_voice-call-end.tga
+++ b/indra/newview/skins/apollo/textures/icn_voice-call-end.tga
--- a/indra/newview/skins/apollo/textures/icn_voice-call-start.tga
+++ b/indra/newview/skins/apollo/textures/icn_voice-call-start.tga
--- a/indra/newview/skins/apollo/textures/icn_voice-groupfocus.tga
+++ b/indra/newview/skins/apollo/textures/icn_voice-groupfocus.tga
--- a/indra/newview/skins/apollo/textures/icn_voice-localchat.tga
+++ b/indra/newview/skins/apollo/textures/icn_voice-localchat.tga
--- a/indra/newview/skins/apollo/textures/icn_voice-pvtfocus.tga
+++ b/indra/newview/skins/apollo/textures/icn_voice-pvtfocus.tga
--- a/indra/newview/skins/apollo/textures/icn_voice_ptt-off.tga
+++ b/indra/newview/skins/apollo/textures/icn_voice_ptt-off.tga
--- a/indra/newview/skins/apollo/textures/icn_voice_ptt-on-lvl1.tga
+++ b/indra/newview/skins/apollo/textures/icn_voice_ptt-on-lvl1.tga
--- a/indra/newview/skins/apollo/textures/icn_voice_ptt-on-lvl2.tga
+++ b/indra/newview/skins/apollo/textures/icn_voice_ptt-on-lvl2.tga
--- a/indra/newview/skins/apollo/textures/icn_voice_ptt-on-lvl3.tga
+++ b/indra/newview/skins/apollo/textures/icn_voice_ptt-on-lvl3.tga
--- a/indra/newview/skins/apollo/textures/icn_voice_ptt-on.tga
+++ b/indra/newview/skins/apollo/textures/icn_voice_ptt-on.tga
--- a/indra/newview/skins/apollo/textures/icon_auction.tga
+++ b/indra/newview/skins/apollo/textures/icon_auction.tga
--- a/indra/newview/skins/apollo/textures/icon_avatar_online.tga
+++ b/indra/newview/skins/apollo/textures/icon_avatar_online.tga
--- a/indra/newview/skins/apollo/textures/icon_day_cycle.tga
+++ b/indra/newview/skins/apollo/textures/icon_day_cycle.tga
--- a/indra/newview/skins/apollo/textures/icon_diurnal.tga
+++ b/indra/newview/skins/apollo/textures/icon_diurnal.tga
--- a/indra/newview/skins/apollo/textures/icon_event_mature.tga
+++ b/indra/newview/skins/apollo/textures/icon_event_mature.tga
--- a/indra/newview/skins/apollo/textures/icon_popular.tga
+++ b/indra/newview/skins/apollo/textures/icon_popular.tga
--- a/indra/newview/skins/apollo/textures/lag_status_critical.tga
+++ b/indra/newview/skins/apollo/textures/lag_status_critical.tga
--- a/indra/newview/skins/apollo/textures/lag_status_good.tga
+++ b/indra/newview/skins/apollo/textures/lag_status_good.tga
--- a/indra/newview/skins/apollo/textures/lag_status_warning.tga
+++ b/indra/newview/skins/apollo/textures/lag_status_warning.tga
--- a/indra/newview/skins/apollo/textures/legend.tga
+++ b/indra/newview/skins/apollo/textures/legend.tga
--- a/indra/newview/skins/apollo/textures/lightgray.tga
+++ b/indra/newview/skins/apollo/textures/lightgray.tga
--- a/indra/newview/skins/apollo/textures/map_avatar_16.tga
+++ b/indra/newview/skins/apollo/textures/map_avatar_16.tga
--- a/indra/newview/skins/apollo/textures/map_avatar_32.tga
+++ b/indra/newview/skins/apollo/textures/map_avatar_32.tga
--- a/indra/newview/skins/apollo/textures/map_avatar_8.tga
+++ b/indra/newview/skins/apollo/textures/map_avatar_8.tga
--- a/indra/newview/skins/apollo/textures/map_avatar_above_32.tga
+++ b/indra/newview/skins/apollo/textures/map_avatar_above_32.tga
--- a/indra/newview/skins/apollo/textures/map_avatar_above_8.tga
+++ b/indra/newview/skins/apollo/textures/map_avatar_above_8.tga
--- a/indra/newview/skins/apollo/textures/map_avatar_below_32.tga
+++ b/indra/newview/skins/apollo/textures/map_avatar_below_32.tga
--- a/indra/newview/skins/apollo/textures/map_avatar_below_8.tga
+++ b/indra/newview/skins/apollo/textures/map_avatar_below_8.tga
--- a/indra/newview/skins/apollo/textures/map_avatar_you_32.tga
+++ b/indra/newview/skins/apollo/textures/map_avatar_you_32.tga
--- a/indra/newview/skins/apollo/textures/map_avatar_you_8.tga
+++ b/indra/newview/skins/apollo/textures/map_avatar_you_8.tga
--- a/indra/newview/skins/apollo/textures/map_home.tga
+++ b/indra/newview/skins/apollo/textures/map_home.tga
--- a/indra/newview/skins/apollo/textures/map_infohub.tga
+++ b/indra/newview/skins/apollo/textures/map_infohub.tga
--- a/indra/newview/skins/apollo/textures/map_track_16.tga
+++ b/indra/newview/skins/apollo/textures/map_track_16.tga
--- a/indra/newview/skins/apollo/textures/map_track_8.tga
+++ b/indra/newview/skins/apollo/textures/map_track_8.tga
--- a/indra/newview/skins/apollo/textures/media_icon.tga
+++ b/indra/newview/skins/apollo/textures/media_icon.tga
--- a/indra/newview/skins/apollo/textures/minimize.tga
+++ b/indra/newview/skins/apollo/textures/minimize.tga
--- a/indra/newview/skins/apollo/textures/missing_asset.tga
+++ b/indra/newview/skins/apollo/textures/missing_asset.tga
--- a/indra/newview/skins/apollo/textures/music_icon.tga
+++ b/indra/newview/skins/apollo/textures/music_icon.tga
--- a/indra/newview/skins/apollo/textures/mute_icon.tga
+++ b/indra/newview/skins/apollo/textures/mute_icon.tga
--- a/indra/newview/skins/apollo/textures/notify_box_icon.tga
+++ b/indra/newview/skins/apollo/textures/notify_box_icon.tga
--- a/indra/newview/skins/apollo/textures/notify_caution_icon.tga
+++ b/indra/newview/skins/apollo/textures/notify_caution_icon.tga
--- a/indra/newview/skins/apollo/textures/notify_tip_icon.tga
+++ b/indra/newview/skins/apollo/textures/notify_tip_icon.tga
--- a/indra/newview/skins/apollo/textures/progress_fill.tga
+++ b/indra/newview/skins/apollo/textures/progress_fill.tga
--- a/indra/newview/skins/apollo/textures/propertyline.tga
+++ b/indra/newview/skins/apollo/textures/propertyline.tga
--- a/indra/newview/skins/apollo/textures/skin_thumbnail_dark.png
+++ b/indra/newview/skins/apollo/textures/skin_thumbnail_dark.png
--- a/indra/newview/skins/apollo/textures/skin_thumbnail_default.png
+++ b/indra/newview/skins/apollo/textures/skin_thumbnail_default.png
--- a/indra/newview/skins/apollo/textures/skin_thumbnail_gred.png
+++ b/indra/newview/skins/apollo/textures/skin_thumbnail_gred.png
--- a/indra/newview/skins/apollo/textures/skin_thumbnail_phoenix.png
+++ b/indra/newview/skins/apollo/textures/skin_thumbnail_phoenix.png
--- a/indra/newview/skins/apollo/textures/skin_thumbnail_pslgreen.png
+++ b/indra/newview/skins/apollo/textures/skin_thumbnail_pslgreen.png
--- a/Show More
+++ b/Show More