-
- Downloads
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
Showing
- doc/contributions.txt 85 additions, 2 deletionsdoc/contributions.txt
- indra/llcommon/llapr.cpp 1 addition, 1 deletionindra/llcommon/llapr.cpp
- indra/llcommon/llapr.h 1 addition, 0 deletionsindra/llcommon/llapr.h
- indra/llcommon/llerror.cpp 0 additions, 1 deletionindra/llcommon/llerror.cpp
- indra/llcommon/llmemory.cpp 143 additions, 0 deletionsindra/llcommon/llmemory.cpp
- indra/llcommon/llmemory.h 4 additions, 1 deletionindra/llcommon/llmemory.h
- indra/llcommon/llthread.cpp 1 addition, 1 deletionindra/llcommon/llthread.cpp
- indra/llimage/llimagetga.cpp 47 additions, 0 deletionsindra/llimage/llimagetga.cpp
- indra/llmath/xform.h 56 additions, 11 deletionsindra/llmath/xform.h
- indra/llmessage/llhttpassetstorage.cpp 22 additions, 11 deletionsindra/llmessage/llhttpassetstorage.cpp
- indra/llmessage/llmessageconfig.cpp 5 additions, 4 deletionsindra/llmessage/llmessageconfig.cpp
- indra/llmessage/llpumpio.cpp 3 additions, 2 deletionsindra/llmessage/llpumpio.cpp
- indra/llmessage/message.cpp 5 additions, 3 deletionsindra/llmessage/message.cpp
- indra/llui/llpanel.cpp 1 addition, 1 deletionindra/llui/llpanel.cpp
- indra/llui/llscrolllistctrl.cpp 33 additions, 8 deletionsindra/llui/llscrolllistctrl.cpp
- indra/llwindow/llwindowsdl.cpp 1 addition, 0 deletionsindra/llwindow/llwindowsdl.cpp
- indra/newview/linux_tools/client-readme.txt 0 additions, 2 deletionsindra/newview/linux_tools/client-readme.txt
- indra/newview/linux_tools/wrapper.sh 10 additions, 0 deletionsindra/newview/linux_tools/wrapper.sh
- indra/newview/llagent.cpp 3 additions, 3 deletionsindra/newview/llagent.cpp
- indra/newview/llassetuploadresponders.cpp 23 additions, 0 deletionsindra/newview/llassetuploadresponders.cpp
Loading
Please register or sign in to comment