Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
Showing
- doc/contributions.txt 21 additions, 0 deletionsdoc/contributions.txt
- indra/llcommon/llevent.cpp 4 additions, 6 deletionsindra/llcommon/llevent.cpp
- indra/llcommon/llevent.h 1 addition, 0 deletionsindra/llcommon/llevent.h
- indra/llcommon/llsd.cpp 3 additions, 1 deletionindra/llcommon/llsd.cpp
- indra/llcommon/llstring.cpp 1 addition, 0 deletionsindra/llcommon/llstring.cpp
- indra/llmath/lloctree.h 2 additions, 9 deletionsindra/llmath/lloctree.h
- indra/llmessage/message.cpp 11 additions, 3 deletionsindra/llmessage/message.cpp
- indra/llrender/llfontgl.cpp 1 addition, 1 deletionindra/llrender/llfontgl.cpp
- indra/llui/llfloater.cpp 46 additions, 17 deletionsindra/llui/llfloater.cpp
- indra/llui/llscrolllistctrl.cpp 1 addition, 1 deletionindra/llui/llscrolllistctrl.cpp
- indra/llvfs/llvfs.cpp 58 additions, 34 deletionsindra/llvfs/llvfs.cpp
- indra/llwindow/llmousehandler.h 2 additions, 0 deletionsindra/llwindow/llmousehandler.h
- indra/llxml/llxmlnode.cpp 2 additions, 2 deletionsindra/llxml/llxmlnode.cpp
- indra/lscript/lscript_execute/lscript_execute.cpp 50 additions, 22 deletionsindra/lscript/lscript_execute/lscript_execute.cpp
- indra/lscript/lscript_library/lscript_alloc.cpp 1 addition, 50 deletionsindra/lscript/lscript_library/lscript_alloc.cpp
- indra/lscript/lscript_library/lscript_library.cpp 1 addition, 1 deletionindra/lscript/lscript_library/lscript_library.cpp
- indra/newview/llcurrencyuimanager.cpp 8 additions, 8 deletionsindra/newview/llcurrencyuimanager.cpp
- indra/newview/llfloateravatartextures.cpp 2 additions, 2 deletionsindra/newview/llfloateravatartextures.cpp
- indra/newview/llfloaterbuyland.cpp 20 additions, 7 deletionsindra/newview/llfloaterbuyland.cpp
- indra/newview/llfloaterfriends.cpp 1 addition, 2 deletionsindra/newview/llfloaterfriends.cpp
Loading
Please register or sign in to comment