Merge branch 'master' into DRTVWR-544-maint
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
No related branches found
No related tags found
Showing
- doc/contributions.txt 2 additions, 0 deletionsdoc/contributions.txt
- indra/llui/llfloater.cpp 14 additions, 3 deletionsindra/llui/llfloater.cpp
- indra/llui/llfloater.h 1 addition, 0 deletionsindra/llui/llfloater.h
- indra/llui/lliconctrl.cpp 13 additions, 0 deletionsindra/llui/lliconctrl.cpp
- indra/llui/lliconctrl.h 6 additions, 1 deletionindra/llui/lliconctrl.h
- indra/llui/llmenubutton.cpp 8 additions, 0 deletionsindra/llui/llmenubutton.cpp
- indra/llui/llmenubutton.h 2 additions, 1 deletionindra/llui/llmenubutton.h
- indra/llui/lltabcontainer.cpp 12 additions, 6 deletionsindra/llui/lltabcontainer.cpp
- indra/llui/lltextbase.cpp 46 additions, 4 deletionsindra/llui/lltextbase.cpp
- indra/llui/lltextbase.h 6 additions, 1 deletionindra/llui/lltextbase.h
- indra/newview/CMakeLists.txt 14 additions, 8 deletionsindra/newview/CMakeLists.txt
- indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletionindra/newview/VIEWER_VERSION.txt
- indra/newview/app_settings/commands.xml 2 additions, 4 deletionsindra/newview/app_settings/commands.xml
- indra/newview/llagentpicksinfo.h 2 additions, 2 deletionsindra/newview/llagentpicksinfo.h
- indra/newview/llavataractions.cpp 132 additions, 26 deletionsindra/newview/llavataractions.cpp
- indra/newview/llavataractions.h 19 additions, 9 deletionsindra/newview/llavataractions.h
- indra/newview/llavatarpropertiesprocessor.cpp 222 additions, 32 deletionsindra/newview/llavatarpropertiesprocessor.cpp
- indra/newview/llavatarpropertiesprocessor.h 20 additions, 1 deletionindra/newview/llavatarpropertiesprocessor.h
- indra/newview/llcallingcard.cpp 1 addition, 0 deletionsindra/newview/llcallingcard.cpp
- indra/newview/llfloaterchatvoicevolume.cpp 1 addition, 1 deletionindra/newview/llfloaterchatvoicevolume.cpp
Loading
Please register or sign in to comment