merge -r 73391:74133 maint-ui-3 -> release
Showing
- doc/contributions.txt 1 addition, 0 deletionsdoc/contributions.txt
- indra/llui/lluictrlfactory.cpp 5 additions, 2 deletionsindra/llui/lluictrlfactory.cpp
- indra/newview/llagent.cpp 25 additions, 1 deletionindra/newview/llagent.cpp
- indra/newview/llagent.h 7 additions, 2 deletionsindra/newview/llagent.h
- indra/newview/llfloaternamedesc.cpp 1 addition, 14 deletionsindra/newview/llfloaternamedesc.cpp
- indra/newview/llfloaterreporter.cpp 2 additions, 6 deletionsindra/newview/llfloaterreporter.cpp
- indra/newview/llfloaterworldmap.cpp 3 additions, 4 deletionsindra/newview/llfloaterworldmap.cpp
- indra/newview/llgesturemgr.cpp 8 additions, 2 deletionsindra/newview/llgesturemgr.cpp
- indra/newview/llpanellogin.cpp 1 addition, 1 deletionindra/newview/llpanellogin.cpp
- indra/newview/llpreviewgesture.cpp 7 additions, 2 deletionsindra/newview/llpreviewgesture.cpp
- indra/newview/llurldispatcher.cpp 10 additions, 2 deletionsindra/newview/llurldispatcher.cpp
- indra/newview/llurldispatcher.h 2 additions, 0 deletionsindra/newview/llurldispatcher.h
- indra/newview/llviewermenu.cpp 0 additions, 1 deletionindra/newview/llviewermenu.cpp
- indra/newview/llviewermenufile.cpp 2 additions, 8 deletionsindra/newview/llviewermenufile.cpp
- indra/newview/llviewermessage.cpp 9 additions, 4 deletionsindra/newview/llviewermessage.cpp
- indra/newview/llviewerstats.cpp 2 additions, 10 deletionsindra/newview/llviewerstats.cpp
- indra/newview/llviewerstats.h 1 addition, 1 deletionindra/newview/llviewerstats.h
Loading
Please register or sign in to comment