-
- Downloads
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
No related branches found
No related tags found
Showing
- autobuild.xml 6 additions, 6 deletionsautobuild.xml
- doc/contributions.txt 2 additions, 0 deletionsdoc/contributions.txt
- indra/llcommon/llmetricperformancetester.cpp 0 additions, 1 deletionindra/llcommon/llmetricperformancetester.cpp
- indra/llmath/llvolume.cpp 15 additions, 14 deletionsindra/llmath/llvolume.cpp
- indra/llplugin/llpluginprocessparent.cpp 109 additions, 13 deletionsindra/llplugin/llpluginprocessparent.cpp
- indra/llplugin/llpluginprocessparent.h 8 additions, 0 deletionsindra/llplugin/llpluginprocessparent.h
- indra/llprimitive/llmodel.cpp 8 additions, 0 deletionsindra/llprimitive/llmodel.cpp
- indra/llui/llfloaterreg.cpp 52 additions, 0 deletionsindra/llui/llfloaterreg.cpp
- indra/llui/llfloaterreg.h 1 addition, 0 deletionsindra/llui/llfloaterreg.h
- indra/llui/llnotifications.cpp 14 additions, 0 deletionsindra/llui/llnotifications.cpp
- indra/llui/llnotifications.h 6 additions, 0 deletionsindra/llui/llnotifications.h
- indra/llui/llscrolllistcell.cpp 22 additions, 1 deletionindra/llui/llscrolllistcell.cpp
- indra/llui/llscrolllistcell.h 7 additions, 0 deletionsindra/llui/llscrolllistcell.h
- indra/llui/llscrolllistctrl.cpp 14 additions, 4 deletionsindra/llui/llscrolllistctrl.cpp
- indra/llui/llscrolllistctrl.h 4 additions, 0 deletionsindra/llui/llscrolllistctrl.h
- indra/llui/llscrolllistitem.cpp 2 additions, 1 deletionindra/llui/llscrolllistitem.cpp
- indra/llui/llscrolllistitem.h 4 additions, 0 deletionsindra/llui/llscrolllistitem.h
- indra/llui/lltextbase.cpp 8 additions, 5 deletionsindra/llui/lltextbase.cpp
- indra/llui/llui.cpp 1 addition, 0 deletionsindra/llui/llui.cpp
- indra/llwindow/llcursortypes.cpp 2 additions, 0 deletionsindra/llwindow/llcursortypes.cpp
Loading
Please register or sign in to comment