svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fix
NOTE: r63705 is *not* the earliest rev# for dpo-3-bug-fix.
Showing
- etc/message.xml 32 additions, 1 deletionetc/message.xml
- indra/llcommon/lluri.cpp 23 additions, 12 deletionsindra/llcommon/lluri.cpp
- indra/llcommon/lluri.h 56 additions, 41 deletionsindra/llcommon/lluri.h
- indra/llmessage/llhttpclient.cpp 37 additions, 3 deletionsindra/llmessage/llhttpclient.cpp
- indra/llmessage/llhttpclient.h 2 additions, 0 deletionsindra/llmessage/llhttpclient.h
- indra/llmessage/llmessageconfig.cpp 16 additions, 0 deletionsindra/llmessage/llmessageconfig.cpp
- indra/llmessage/llmessageconfig.h 2 additions, 0 deletionsindra/llmessage/llmessageconfig.h
- indra/llmessage/llservicebuilder.cpp 18 additions, 1 deletionindra/llmessage/llservicebuilder.cpp
- indra/newview/llpanelavatar.cpp 23 additions, 4 deletionsindra/newview/llpanelavatar.cpp
- indra/newview/llpanelavatar.h 12 additions, 6 deletionsindra/newview/llpanelavatar.h
- indra/test/llservicebuilder_tut.cpp 17 additions, 0 deletionsindra/test/llservicebuilder_tut.cpp
Loading
Please register or sign in to comment