-
- Downloads
svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841
this is a combined mergeback of the following branches as per QAR-841: maint-server/maint-server-1 (absorbed by maint-server-2) maint-server/maint-server-2 maint-server/maint-server-3 havok4/havok4-8 havok4/havok4-9 yes dataserver-is-deprecated
Showing
- indra/llcommon/llcommon.cpp 2 additions, 2 deletionsindra/llcommon/llcommon.cpp
- indra/llcommon/llsdserialize.cpp 1 addition, 1 deletionindra/llcommon/llsdserialize.cpp
- indra/llcommon/llsdserialize_xml.cpp 6 additions, 7 deletionsindra/llcommon/llsdserialize_xml.cpp
- indra/llcommon/llstat.cpp 77 additions, 82 deletionsindra/llcommon/llstat.cpp
- indra/llcommon/llstat.h 33 additions, 4 deletionsindra/llcommon/llstat.h
- indra/llcommon/llstl.h 4 additions, 1 deletionindra/llcommon/llstl.h
- indra/llcommon/llthread.cpp 2 additions, 2 deletionsindra/llcommon/llthread.cpp
- indra/llcommon/llthread.h 2 additions, 2 deletionsindra/llcommon/llthread.h
- indra/llimage/llimage.cpp 60 additions, 15 deletionsindra/llimage/llimage.cpp
- indra/llimage/llimage.h 24 additions, 9 deletionsindra/llimage/llimage.h
- indra/llimage/llimagej2c.cpp 100 additions, 41 deletionsindra/llimage/llimagej2c.cpp
- indra/llimage/llimagej2c.h 5 additions, 0 deletionsindra/llimage/llimagej2c.h
- indra/llimage/llimageworker.cpp 2 additions, 2 deletionsindra/llimage/llimageworker.cpp
- indra/llimage/llimageworker.h 4 additions, 2 deletionsindra/llimage/llimageworker.h
- indra/llmath/v3color.h 71 additions, 6 deletionsindra/llmath/v3color.h
- indra/llmath/v4color.cpp 100 additions, 66 deletionsindra/llmath/v4color.cpp
- indra/llmath/v4color.h 97 additions, 12 deletionsindra/llmath/v4color.h
- indra/llmath/v4coloru.cpp 1 addition, 1 deletionindra/llmath/v4coloru.cpp
- indra/llmath/v4coloru.h 70 additions, 19 deletionsindra/llmath/v4coloru.h
- indra/llmessage/llcurl.cpp 4 additions, 0 deletionsindra/llmessage/llcurl.cpp
Loading
Please register or sign in to comment