svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
Showing
- etc/message.xml 10 additions, 10 deletionsetc/message.xml
- indra/cmake/LLAddBuildTest.cmake 10 additions, 9 deletionsindra/cmake/LLAddBuildTest.cmake
- indra/llcommon/indra_constants.h 3 additions, 2 deletionsindra/llcommon/indra_constants.h
- indra/llcommon/lldate.h 1 addition, 1 deletionindra/llcommon/lldate.h
- indra/llcommon/llqueuedthread.cpp 2 additions, 1 deletionindra/llcommon/llqueuedthread.cpp
- indra/llcommon/llstring.h 2 additions, 1 deletionindra/llcommon/llstring.h
- indra/llmessage/llcachename.cpp 1 addition, 0 deletionsindra/llmessage/llcachename.cpp
- indra/llmessage/llclassifiedflags.cpp 21 additions, 4 deletionsindra/llmessage/llclassifiedflags.cpp
- indra/llmessage/llclassifiedflags.h 14 additions, 3 deletionsindra/llmessage/llclassifiedflags.h
- indra/llmessage/lldispatcher.cpp 29 additions, 3 deletionsindra/llmessage/lldispatcher.cpp
- indra/llmessage/lleventflags.h 1 addition, 0 deletionsindra/llmessage/lleventflags.h
- indra/llmessage/llhttpclient.cpp 14 additions, 0 deletionsindra/llmessage/llhttpclient.cpp
- indra/llmessage/llhttpclientadapter.cpp 9 additions, 2 deletionsindra/llmessage/llhttpclientadapter.cpp
- indra/llmessage/llqueryflags.h 32 additions, 0 deletionsindra/llmessage/llqueryflags.h
- indra/llmessage/llsdmessagereader.cpp 6 additions, 0 deletionsindra/llmessage/llsdmessagereader.cpp
- indra/llmessage/message.cpp 24 additions, 2 deletionsindra/llmessage/message.cpp
- indra/llmessage/message.h 1 addition, 0 deletionsindra/llmessage/message.h
- indra/llmessage/message_prehash.cpp 3 additions, 0 deletionsindra/llmessage/message_prehash.cpp
- indra/llmessage/message_prehash.h 2 additions, 0 deletionsindra/llmessage/message_prehash.h
- indra/llvfs/llvfs.cpp 36 additions, 19 deletionsindra/llvfs/llvfs.cpp
Loading
Please register or sign in to comment