DRTVWR-546, SL-16220, SL-16094: Undo previous glthread branch revert.
Reverting a merge is sticky: it tells git you never want to see that branch again. Merging the DRTVWR-546 branch, which contained the revert, into the glthread branch undid much of the development work on that branch. To restore it we must revert the revert. This reverts commit 029b41c0.
Showing
- indra/llcommon/CMakeLists.txt 2 additions, 1 deletionindra/llcommon/CMakeLists.txt
- indra/llcommon/llsingleton.h 8 additions, 6 deletionsindra/llcommon/llsingleton.h
- indra/llcommon/tests/threadsafeschedule_test.cpp 2 additions, 2 deletionsindra/llcommon/tests/threadsafeschedule_test.cpp
- indra/llcommon/tests/workqueue_test.cpp 71 additions, 1 deletionindra/llcommon/tests/workqueue_test.cpp
- indra/llcommon/timing.cpp 0 additions, 25 deletionsindra/llcommon/timing.cpp
- indra/llcommon/workqueue.cpp 28 additions, 2 deletionsindra/llcommon/workqueue.cpp
- indra/llcommon/workqueue.h 126 additions, 71 deletionsindra/llcommon/workqueue.h
- indra/llrender/llimagegl.cpp 15 additions, 74 deletionsindra/llrender/llimagegl.cpp
- indra/llrender/llimagegl.h 9 additions, 18 deletionsindra/llrender/llimagegl.h
- indra/llwindow/llwindowwin32.cpp 32 additions, 289 deletionsindra/llwindow/llwindowwin32.cpp
- indra/llwindow/llwindowwin32.h 1 addition, 35 deletionsindra/llwindow/llwindowwin32.h
- indra/newview/CMakeLists.txt 1 addition, 2 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/settings.xml 25 additions, 0 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llappviewer.cpp 7 additions, 44 deletionsindra/newview/llappviewer.cpp
- indra/newview/llmainlooprepeater.cpp 0 additions, 88 deletionsindra/newview/llmainlooprepeater.cpp
- indra/newview/llmainlooprepeater.h 0 additions, 64 deletionsindra/newview/llmainlooprepeater.h
- indra/newview/llstartup.cpp 17 additions, 0 deletionsindra/newview/llstartup.cpp
- indra/newview/llviewertexture.cpp 23 additions, 11 deletionsindra/newview/llviewertexture.cpp
- indra/newview/llviewertexture.h 4 additions, 0 deletionsindra/newview/llviewertexture.h
Loading
Please register or sign in to comment