svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22
Merge back of viewer 1.22 RC6 and RC7 change to trunk. QAR-1214 and QAR-1227
Showing
- doc/contributions.txt 3 additions, 0 deletionsdoc/contributions.txt
- indra/linux_crash_logger/llcrashloggerlinux.cpp 12 additions, 3 deletionsindra/linux_crash_logger/llcrashloggerlinux.cpp
- indra/llprimitive/llprimitive.cpp 4 additions, 201 deletionsindra/llprimitive/llprimitive.cpp
- indra/llrender/llimagegl.cpp 0 additions, 12 deletionsindra/llrender/llimagegl.cpp
- indra/llrender/llimagegl.h 0 additions, 2 deletionsindra/llrender/llimagegl.h
- indra/newview/app_settings/settings.xml 1 addition, 1 deletionindra/newview/app_settings/settings.xml
- indra/newview/llappviewer.cpp 6 additions, 3 deletionsindra/newview/llappviewer.cpp
- indra/newview/llappviewer.h 1 addition, 0 deletionsindra/newview/llappviewer.h
- indra/newview/llappviewerwin32.cpp 1 addition, 1 deletionindra/newview/llappviewerwin32.cpp
- indra/newview/lldrawable.cpp 10 additions, 2 deletionsindra/newview/lldrawable.cpp
- indra/newview/lldrawpoolbump.cpp 3 additions, 4 deletionsindra/newview/lldrawpoolbump.cpp
- indra/newview/lldrawpoolbump.h 1 addition, 2 deletionsindra/newview/lldrawpoolbump.h
- indra/newview/lleventpoll.cpp 11 additions, 6 deletionsindra/newview/lleventpoll.cpp
- indra/newview/llfloaterinspect.cpp 6 additions, 0 deletionsindra/newview/llfloaterinspect.cpp
- indra/newview/llfloaterlagmeter.cpp 1 addition, 1 deletionindra/newview/llfloaterlagmeter.cpp
- indra/newview/llfloatervoicedevicesettings.cpp 26 additions, 8 deletionsindra/newview/llfloatervoicedevicesettings.cpp
- indra/newview/llhudeffectpointat.cpp 3 additions, 1 deletionindra/newview/llhudeffectpointat.cpp
- indra/newview/llhudicon.cpp 1 addition, 1 deletionindra/newview/llhudicon.cpp
- indra/newview/lllogchat.cpp 2 additions, 1 deletionindra/newview/lllogchat.cpp
- indra/newview/llmutelist.cpp 32 additions, 17 deletionsindra/newview/llmutelist.cpp
Loading
Please register or sign in to comment