-
- Downloads
Automated merge with...
Automated merge with bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.t3awyz\ssh__richard@hg.lindenlab.com_richard_viewer-experience-merge_2xcevh.hg
No related branches found
No related tags found
Showing
- BuildParams 0 additions, 7 deletionsBuildParams
- indra/llwindow/llwindowmacosx.cpp 67 additions, 34 deletionsindra/llwindow/llwindowmacosx.cpp
- indra/llwindow/llwindowmacosx.h 2 additions, 1 deletionindra/llwindow/llwindowmacosx.h
- indra/newview/CMakeLists.txt 2 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/settings.xml 2 additions, 2 deletionsindra/newview/app_settings/settings.xml
- indra/newview/app_settings/settings_minimal.xml 2 additions, 2 deletionsindra/newview/app_settings/settings_minimal.xml
- indra/newview/llagent.cpp 3 additions, 0 deletionsindra/newview/llagent.cpp
- indra/newview/llbottomtray.cpp 24 additions, 11 deletionsindra/newview/llbottomtray.cpp
- indra/newview/llchiclet.cpp 2 additions, 1 deletionindra/newview/llchiclet.cpp
- indra/newview/llfloatersounddevices.cpp 85 additions, 0 deletionsindra/newview/llfloatersounddevices.cpp
- indra/newview/llfloatersounddevices.h 49 additions, 0 deletionsindra/newview/llfloatersounddevices.h
- indra/newview/llimview.cpp 3 additions, 3 deletionsindra/newview/llimview.cpp
- indra/newview/llmediactrl.cpp 5 additions, 15 deletionsindra/newview/llmediactrl.cpp
- indra/newview/llpanellogin.cpp 10 additions, 159 deletionsindra/newview/llpanellogin.cpp
- indra/newview/llpanellogin.h 0 additions, 2 deletionsindra/newview/llpanellogin.h
- indra/newview/llpanelvoicedevicesettings.cpp 1 addition, 1 deletionindra/newview/llpanelvoicedevicesettings.cpp
- indra/newview/llspeakbutton.cpp 0 additions, 20 deletionsindra/newview/llspeakbutton.cpp
- indra/newview/llspeakbutton.h 0 additions, 5 deletionsindra/newview/llspeakbutton.h
- indra/newview/lltoolpie.cpp 9 additions, 0 deletionsindra/newview/lltoolpie.cpp
- indra/newview/lltoolpie.h 1 addition, 0 deletionsindra/newview/lltoolpie.h
Loading
Please register or sign in to comment