-
- Downloads
svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
Showing
- doc/contributions.txt 1 addition, 0 deletionsdoc/contributions.txt
- indra/llmath/llvolume.cpp 28 additions, 2 deletionsindra/llmath/llvolume.cpp
- indra/llmath/llvolume.h 1 addition, 6 deletionsindra/llmath/llvolume.h
- indra/llrender/llimagegl.cpp 120 additions, 26 deletionsindra/llrender/llimagegl.cpp
- indra/llrender/llimagegl.h 16 additions, 11 deletionsindra/llrender/llimagegl.h
- indra/llrender/llpostprocess.cpp 53 additions, 40 deletionsindra/llrender/llpostprocess.cpp
- indra/llrender/llpostprocess.h 8 additions, 5 deletionsindra/llrender/llpostprocess.h
- indra/llrender/llrender.cpp 1 addition, 7 deletionsindra/llrender/llrender.cpp
- indra/llui/llmenugl.cpp 99 additions, 65 deletionsindra/llui/llmenugl.cpp
- indra/llui/llmenugl.h 10 additions, 6 deletionsindra/llui/llmenugl.h
- indra/mac_crash_logger/llcrashloggermac.cpp 2 additions, 0 deletionsindra/mac_crash_logger/llcrashloggermac.cpp
- indra/newview/CMakeLists.txt 1 addition, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/installers/windows/lang_zh.nsi 0 additions, 0 deletionsindra/newview/installers/windows/lang_zh.nsi
- indra/newview/installers/windows/language_menu.nsi 0 additions, 0 deletionsindra/newview/installers/windows/language_menu.nsi
- indra/newview/llappviewermacosx.cpp 96 additions, 11 deletionsindra/newview/llappviewermacosx.cpp
- indra/newview/lldrawpoolbump.cpp 0 additions, 5 deletionsindra/newview/lldrawpoolbump.cpp
- indra/newview/lldynamictexture.cpp 40 additions, 3 deletionsindra/newview/lldynamictexture.cpp
- indra/newview/lldynamictexture.h 3 additions, 0 deletionsindra/newview/lldynamictexture.h
- indra/newview/llfloaterimagepreview.cpp 10 additions, 25 deletionsindra/newview/llfloaterimagepreview.cpp
- indra/newview/llfloaterimagepreview.h 1 addition, 1 deletionindra/newview/llfloaterimagepreview.h
Loading
Please register or sign in to comment