Merge. Refresh from viewer-release after 3.7.13 release.
No related branches found
No related tags found
Showing
- .hgtags 1 addition, 0 deletions.hgtags
- indra/llui/lltooltip.cpp 2 additions, 1 deletionindra/llui/lltooltip.cpp
- indra/newview/CMakeLists.txt 7 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletionindra/newview/VIEWER_VERSION.txt
- indra/newview/app_settings/settings.xml 10 additions, 10 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llconversationmodel.cpp 9 additions, 0 deletionsindra/newview/llconversationmodel.cpp
- indra/newview/llconversationmodel.h 2 additions, 0 deletionsindra/newview/llconversationmodel.h
- indra/newview/llfloatergroupbulkban.cpp 134 additions, 0 deletionsindra/newview/llfloatergroupbulkban.cpp
- indra/newview/llfloatergroupbulkban.h 48 additions, 0 deletionsindra/newview/llfloatergroupbulkban.h
- indra/newview/llfloaterimcontainer.cpp 118 additions, 0 deletionsindra/newview/llfloaterimcontainer.cpp
- indra/newview/llfloaterimcontainer.h 4 additions, 0 deletionsindra/newview/llfloaterimcontainer.h
- indra/newview/llgroupactions.cpp 1 addition, 4 deletionsindra/newview/llgroupactions.cpp
- indra/newview/llgroupmgr.cpp 181 additions, 19 deletionsindra/newview/llgroupmgr.cpp
- indra/newview/llgroupmgr.h 62 additions, 19 deletionsindra/newview/llgroupmgr.h
- indra/newview/llnamelistctrl.cpp 32 additions, 1 deletionindra/newview/llnamelistctrl.cpp
- indra/newview/llnamelistctrl.h 12 additions, 1 deletionindra/newview/llnamelistctrl.h
- indra/newview/llpanelgroupbulk.cpp 421 additions, 0 deletionsindra/newview/llpanelgroupbulk.cpp
- indra/newview/llpanelgroupbulk.h 74 additions, 0 deletionsindra/newview/llpanelgroupbulk.h
- indra/newview/llpanelgroupbulkban.cpp 259 additions, 0 deletionsindra/newview/llpanelgroupbulkban.cpp
- indra/newview/llpanelgroupbulkban.h 49 additions, 0 deletionsindra/newview/llpanelgroupbulkban.h
Loading
Please register or sign in to comment