EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> release
ACTUAL MERGE: merge maint-viewer-3-merge -r 79051 -> release
Showing
- doc/contributions.txt 5 additions, 0 deletionsdoc/contributions.txt
- indra/newview/linux_tools/launch_url.sh 10 additions, 4 deletionsindra/newview/linux_tools/launch_url.sh
- indra/newview/linux_tools/wrapper.sh 6 additions, 0 deletionsindra/newview/linux_tools/wrapper.sh
- indra/newview/llagent.cpp 23 additions, 10 deletionsindra/newview/llagent.cpp
- indra/newview/llhudeffecttrail.cpp 1 addition, 1 deletionindra/newview/llhudeffecttrail.cpp
- indra/newview/llinventorybridge.cpp 18 additions, 5 deletionsindra/newview/llinventorybridge.cpp
- indra/newview/llselectmgr.cpp 18 additions, 1 deletionindra/newview/llselectmgr.cpp
- indra/newview/llstartup.cpp 6 additions, 1 deletionindra/newview/llstartup.cpp
- indra/newview/llviewerjointattachment.cpp 14 additions, 1 deletionindra/newview/llviewerjointattachment.cpp
- indra/newview/llviewermenu.cpp 24 additions, 14 deletionsindra/newview/llviewermenu.cpp
- indra/newview/llviewerobjectlist.cpp 4 additions, 4 deletionsindra/newview/llviewerobjectlist.cpp
- indra/newview/llvoavatar.cpp 175 additions, 144 deletionsindra/newview/llvoavatar.cpp
- indra/newview/llvoavatar.h 2 additions, 1 deletionindra/newview/llvoavatar.h
- indra/newview/llvoicevisualizer.cpp 1 addition, 0 deletionsindra/newview/llvoicevisualizer.cpp
- indra/newview/pipeline.cpp 4 additions, 4 deletionsindra/newview/pipeline.cpp
- indra/newview/viewer_manifest.py 2 additions, 2 deletionsindra/newview/viewer_manifest.py
Loading
Please register or sign in to comment