Merge from product-engine
No related branches found
No related tags found
Showing
- indra/newview/llcallfloater.cpp 61 additions, 0 deletionsindra/newview/llcallfloater.cpp
- indra/newview/llcallfloater.h 11 additions, 0 deletionsindra/newview/llcallfloater.h
- indra/newview/llchathistory.cpp 15 additions, 15 deletionsindra/newview/llchathistory.cpp
- indra/newview/llimfloater.cpp 5 additions, 0 deletionsindra/newview/llimfloater.cpp
- indra/newview/llimview.cpp 24 additions, 12 deletionsindra/newview/llimview.cpp
- indra/newview/llimview.h 5 additions, 5 deletionsindra/newview/llimview.h
- indra/newview/llnotificationgrouphandler.cpp 2 additions, 0 deletionsindra/newview/llnotificationgrouphandler.cpp
- indra/newview/llnotificationhandler.h 14 additions, 1 deletionindra/newview/llnotificationhandler.h
- indra/newview/llnotificationhandlerutil.cpp 63 additions, 22 deletionsindra/newview/llnotificationhandlerutil.cpp
- indra/newview/llnotificationofferhandler.cpp 1 addition, 1 deletionindra/newview/llnotificationofferhandler.cpp
- indra/newview/llnotificationscripthandler.cpp 1 addition, 1 deletionindra/newview/llnotificationscripthandler.cpp
- indra/newview/llparticipantlist.cpp 11 additions, 2 deletionsindra/newview/llparticipantlist.cpp
- indra/newview/llparticipantlist.h 5 additions, 0 deletionsindra/newview/llparticipantlist.h
- indra/newview/skins/default/xui/en/floater_voice_controls.xml 36 additions, 7 deletions...a/newview/skins/default/xui/en/floater_voice_controls.xml
- indra/newview/skins/default/xui/en/notifications.xml 20 additions, 0 deletionsindra/newview/skins/default/xui/en/notifications.xml
- indra/newview/skins/default/xui/en/panel_im_control_panel.xml 0 additions, 1 deletion...a/newview/skins/default/xui/en/panel_im_control_panel.xml
Loading
Please register or sign in to comment