EFFECTIVE MERGE: svn merge -r 65485:66133...
EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392 ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
Showing
- doc/contributions.txt 7 additions, 6 deletionsdoc/contributions.txt
- indra/lib/python/indra/__init__.py 7 additions, 5 deletionsindra/lib/python/indra/__init__.py
- indra/linux_crash_logger/linux_crash_logger.cpp 2 additions, 4 deletionsindra/linux_crash_logger/linux_crash_logger.cpp
- indra/llcommon/llprocessor.cpp 27 additions, 19 deletionsindra/llcommon/llprocessor.cpp
- indra/llcommon/llprocessor.h 14 additions, 0 deletionsindra/llcommon/llprocessor.h
- indra/llcommon/llsys.cpp 78 additions, 33 deletionsindra/llcommon/llsys.cpp
- indra/llcommon/llsys.h 1 addition, 0 deletionsindra/llcommon/llsys.h
- indra/llui/llbutton.cpp 12 additions, 2 deletionsindra/llui/llbutton.cpp
- indra/llui/llbutton.h 4 additions, 0 deletionsindra/llui/llbutton.h
- indra/llui/llcheckboxctrl.cpp 12 additions, 0 deletionsindra/llui/llcheckboxctrl.cpp
- indra/llui/llcheckboxctrl.h 2 additions, 0 deletionsindra/llui/llcheckboxctrl.h
- indra/llui/lllineeditor.h 1 addition, 0 deletionsindra/llui/lllineeditor.h
- indra/llui/lluictrl.h 3 additions, 0 deletionsindra/llui/lluictrl.h
- indra/lscript/lscript_compile/indra.l 1 addition, 1 deletionindra/lscript/lscript_compile/indra.l
- indra/newview/linux_tools/client-readme.txt 2 additions, 3 deletionsindra/newview/linux_tools/client-readme.txt
- indra/newview/llagent.cpp 1 addition, 1 deletionindra/newview/llagent.cpp
- indra/newview/llfloaterland.cpp 4 additions, 0 deletionsindra/newview/llfloaterland.cpp
- indra/newview/llfloaterworldmap.cpp 69 additions, 6 deletionsindra/newview/llfloaterworldmap.cpp
- indra/newview/llfloaterworldmap.h 1 addition, 0 deletionsindra/newview/llfloaterworldmap.h
- indra/newview/llfolderview.cpp 40 additions, 17 deletionsindra/newview/llfolderview.cpp
Loading
Please register or sign in to comment