svn merge -r 68690:69597...
svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release Merge patches made in the 1-18-3 RC iterations into the trunk. NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
Showing
- doc/contributions.txt 1 addition, 0 deletionsdoc/contributions.txt
- indra/llcommon/lllslconstants.h 1 addition, 1 deletionindra/llcommon/lllslconstants.h
- indra/llcommon/llversionviewer.h 2 additions, 2 deletionsindra/llcommon/llversionviewer.h
- indra/llmath/llvolume.cpp 25 additions, 18 deletionsindra/llmath/llvolume.cpp
- indra/llui/llspinctrl.cpp 5 additions, 0 deletionsindra/llui/llspinctrl.cpp
- indra/llui/llspinctrl.h 3 additions, 1 deletionindra/llui/llspinctrl.h
- indra/lscript/lscript_compile/indra.l 1 addition, 1 deletionindra/lscript/lscript_compile/indra.l
- indra/lscript/lscript_library/lscript_library.cpp 1 addition, 1 deletionindra/lscript/lscript_library/lscript_library.cpp
- indra/newview/English.lproj/InfoPlist.strings 2 additions, 2 deletionsindra/newview/English.lproj/InfoPlist.strings
- indra/newview/Info-SecondLife.plist 1 addition, 1 deletionindra/newview/Info-SecondLife.plist
- indra/newview/app_settings/keywords.ini 1 addition, 1 deletionindra/newview/app_settings/keywords.ini
- indra/newview/linux_tools/wrapper.sh 7 additions, 1 deletionindra/newview/linux_tools/wrapper.sh
- indra/newview/llpanelgroupgeneral.cpp 32 additions, 23 deletionsindra/newview/llpanelgroupgeneral.cpp
- indra/newview/llpanelgroupgeneral.h 2 additions, 2 deletionsindra/newview/llpanelgroupgeneral.h
- indra/newview/lltracker.cpp 24 additions, 27 deletionsindra/newview/lltracker.cpp
Loading
Please register or sign in to comment