merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4) * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3) * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771) * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3) Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry * QAR-590 Merge Lock Request for Support Sprint * QAR-627 Merge snapshot improvements * QAR-686 Merge Lock request for Featurettes
Showing
- doc/contributions.txt 4 additions, 0 deletionsdoc/contributions.txt
- etc/message.xml 16 additions, 0 deletionsetc/message.xml
- indra/llimage/llimage.cpp 3 additions, 9 deletionsindra/llimage/llimage.cpp
- indra/llimage/llimage.h 2 additions, 0 deletionsindra/llimage/llimage.h
- indra/llimage/llimagebmp.cpp 4 additions, 4 deletionsindra/llimage/llimagebmp.cpp
- indra/llimage/llimagebmp.h 1 addition, 0 deletionsindra/llimage/llimagebmp.h
- indra/llimage/llimagedxt.h 1 addition, 0 deletionsindra/llimage/llimagedxt.h
- indra/llimage/llimagej2c.h 1 addition, 0 deletionsindra/llimage/llimagej2c.h
- indra/llimage/llimagejpeg.cpp 4 additions, 2 deletionsindra/llimage/llimagejpeg.cpp
- indra/llimage/llimagejpeg.h 2 additions, 1 deletionindra/llimage/llimagejpeg.h
- indra/llimage/llimagepng.h 4 additions, 3 deletionsindra/llimage/llimagepng.h
- indra/llimage/llimagetga.h 1 addition, 0 deletionsindra/llimage/llimagetga.h
- indra/llmath/llmath.h 32 additions, 2 deletionsindra/llmath/llmath.h
- indra/llui/llfloater.cpp 31 additions, 47 deletionsindra/llui/llfloater.cpp
- indra/llui/llfloater.h 9 additions, 8 deletionsindra/llui/llfloater.h
- indra/llui/llscrolllistctrl.cpp 10 additions, 2 deletionsindra/llui/llscrolllistctrl.cpp
- indra/llui/llspinctrl.cpp 10 additions, 0 deletionsindra/llui/llspinctrl.cpp
- indra/llui/llspinctrl.h 2 additions, 0 deletionsindra/llui/llspinctrl.h
- indra/llui/lltexteditor.cpp 27 additions, 8 deletionsindra/llui/lltexteditor.cpp
- indra/llwindow/llwindowsdl.cpp 16 additions, 2 deletionsindra/llwindow/llwindowsdl.cpp
Loading
Please register or sign in to comment