-
- Downloads
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions.
Showing
- indra/lib/python/indra/__init__.py 5 additions, 7 deletionsindra/lib/python/indra/__init__.py
- indra/llcharacter/lljoint.cpp 0 additions, 33 deletionsindra/llcharacter/lljoint.cpp
- indra/llcharacter/lljoint.h 0 additions, 5 deletionsindra/llcharacter/lljoint.h
- indra/llcommon/indra_constants.h 6 additions, 4 deletionsindra/llcommon/indra_constants.h
- indra/llcommon/llmemory.cpp 4 additions, 1 deletionindra/llcommon/llmemory.cpp
- indra/llcommon/llmemtype.h 2 additions, 0 deletionsindra/llcommon/llmemtype.h
- indra/llcommon/llprocessor.cpp 11 additions, 3 deletionsindra/llcommon/llprocessor.cpp
- indra/llcommon/llsdserialize_xml.cpp 5 additions, 1 deletionindra/llcommon/llsdserialize_xml.cpp
- indra/llcommon/llsys.cpp 5 additions, 1 deletionindra/llcommon/llsys.cpp
- indra/llimage/llimagejpeg.h 7 additions, 2 deletionsindra/llimage/llimagejpeg.h
- indra/llmath/lloctree.h 34 additions, 34 deletionsindra/llmath/lloctree.h
- indra/llmath/lltreenode.h 11 additions, 11 deletionsindra/llmath/lltreenode.h
- indra/llmath/llvolume.h 1 addition, 1 deletionindra/llmath/llvolume.h
- indra/llmessage/llcurl.cpp 1 addition, 1 deletionindra/llmessage/llcurl.cpp
- indra/llmessage/llhttpassetstorage.cpp 5 additions, 1 deletionindra/llmessage/llhttpassetstorage.cpp
- indra/llmessage/llnamevalue.cpp 3 additions, 0 deletionsindra/llmessage/llnamevalue.cpp
- indra/llmessage/lluseroperation.cpp 16 additions, 5 deletionsindra/llmessage/lluseroperation.cpp
- indra/llmessage/lluseroperation.h 4 additions, 0 deletionsindra/llmessage/lluseroperation.h
- indra/llrender/llimagegl.h 0 additions, 1 deletionindra/llrender/llimagegl.h
- indra/llui/llfloater.cpp 63 additions, 43 deletionsindra/llui/llfloater.cpp
Loading
Please register or sign in to comment