-
- Downloads
Merge branch 'DRTVWR-546' into DRTVWR-539
# Conflicts: # indra/llcommon/tests/llprocess_test.cpp # indra/llui/llcombobox.cpp # indra/llui/llcombobox.h # indra/newview/VIEWER_VERSION.txt # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
No related branches found
No related tags found
Showing
- indra/llcommon/llrefcount.cpp 4 additions, 1 deletionindra/llcommon/llrefcount.cpp
- indra/llcommon/llrefcount.h 14 additions, 2 deletionsindra/llcommon/llrefcount.h
- indra/llimage/llimage.cpp 6 additions, 0 deletionsindra/llimage/llimage.cpp
- indra/llimage/llimage.h 6 additions, 0 deletionsindra/llimage/llimage.h
- indra/llmath/llvolume.cpp 1 addition, 1 deletionindra/llmath/llvolume.cpp
- indra/llrender/llgl.cpp 4 additions, 101 deletionsindra/llrender/llgl.cpp
- indra/llrender/llgl.h 0 additions, 45 deletionsindra/llrender/llgl.h
- indra/llrender/llgltexture.cpp 7 additions, 7 deletionsindra/llrender/llgltexture.cpp
- indra/llrender/llgltexture.h 12 additions, 3 deletionsindra/llrender/llgltexture.h
- indra/llrender/llimagegl.cpp 184 additions, 61 deletionsindra/llrender/llimagegl.cpp
- indra/llrender/llimagegl.h 21 additions, 6 deletionsindra/llrender/llimagegl.h
- indra/llrender/llrender.cpp 20 additions, 0 deletionsindra/llrender/llrender.cpp
- indra/llui/llcombobox.cpp 30 additions, 17 deletionsindra/llui/llcombobox.cpp
- indra/llui/llcombobox.h 3 additions, 5 deletionsindra/llui/llcombobox.h
- indra/llwindow/llwindowwin32.cpp 1 addition, 0 deletionsindra/llwindow/llwindowwin32.cpp
- indra/newview/CMakeLists.txt 2 additions, 4 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/settings.xml 1 addition, 1 deletionindra/newview/app_settings/settings.xml
- indra/newview/featuretable.txt 3 additions, 3 deletionsindra/newview/featuretable.txt
- indra/newview/featuretable_mac.txt 1 addition, 1 deletionindra/newview/featuretable_mac.txt
- indra/newview/llagentcamera.cpp 10 additions, 9 deletionsindra/newview/llagentcamera.cpp
Loading
Please register or sign in to comment