QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
Showing
- doc/contributions.txt 47 additions, 12 deletionsdoc/contributions.txt
- indra/cmake/ViewerMiscLibs.cmake 0 additions, 1 deletionindra/cmake/ViewerMiscLibs.cmake
- indra/llcharacter/llanimationstates.cpp 6 additions, 6 deletionsindra/llcharacter/llanimationstates.cpp
- indra/llcharacter/llmultigesture.h 2 additions, 0 deletionsindra/llcharacter/llmultigesture.h
- indra/llcommon/llbase32.cpp 3 additions, 5 deletionsindra/llcommon/llbase32.cpp
- indra/llcommon/llerrorlegacy.h 1 addition, 0 deletionsindra/llcommon/llerrorlegacy.h
- indra/llcommon/llfindlocale.cpp 2 additions, 4 deletionsindra/llcommon/llfindlocale.cpp
- indra/llcommon/llmemory.cpp 29 additions, 1 deletionindra/llcommon/llmemory.cpp
- indra/llcommon/llpreprocessor.h 10 additions, 1 deletionindra/llcommon/llpreprocessor.h
- indra/llcommon/llprocessor.cpp 36 additions, 1 deletionindra/llcommon/llprocessor.cpp
- indra/llcommon/llstring.h 7 additions, 0 deletionsindra/llcommon/llstring.h
- indra/llcommon/llsys.cpp 11 additions, 0 deletionsindra/llcommon/llsys.cpp
- indra/llcommon/lltimer.h 1 addition, 1 deletionindra/llcommon/lltimer.h
- indra/llcommon/stdtypes.h 2 additions, 0 deletionsindra/llcommon/stdtypes.h
- indra/llimage/llimage.cpp 1 addition, 1 deletionindra/llimage/llimage.cpp
- indra/llimage/llimagetga.cpp 1 addition, 1 deletionindra/llimage/llimagetga.cpp
- indra/llinventory/lleconomy.cpp 12 additions, 0 deletionsindra/llinventory/lleconomy.cpp
- indra/llmath/llvolume.cpp 49 additions, 35 deletionsindra/llmath/llvolume.cpp
- indra/llmath/llvolume.h 1 addition, 1 deletionindra/llmath/llvolume.h
- indra/llmessage/llassetstorage.cpp 3 additions, 0 deletionsindra/llmessage/llassetstorage.cpp
Loading
Please register or sign in to comment