-
- Downloads
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
This was yet another refresh from v-d because of significant changes to lltexturefetch that would not have been resolvable by casual application of any merge tool. There are still a few questions outstanding but this is the initial, optimistic merge.
Showing
- .hgignore 1 addition, 1 deletion.hgignore
- .hgtags 156 additions, 198 deletions.hgtags
- autobuild.xml 56 additions, 16 deletionsautobuild.xml
- doc/contributions.txt 13 additions, 1 deletiondoc/contributions.txt
- etc/message.xml 0 additions, 8 deletionsetc/message.xml
- indra/cmake/00-Common.cmake 5 additions, 0 deletionsindra/cmake/00-Common.cmake
- indra/cmake/LLAddBuildTest.cmake 9 additions, 0 deletionsindra/cmake/LLAddBuildTest.cmake
- indra/cmake/LLCommon.cmake 1 addition, 1 deletionindra/cmake/LLCommon.cmake
- indra/cmake/Variables.cmake 16 additions, 1 deletionindra/cmake/Variables.cmake
- indra/lib/python/indra/util/llmanifest.py 6 additions, 1 deletionindra/lib/python/indra/util/llmanifest.py
- indra/llcharacter/llhandmotion.cpp 55 additions, 5 deletionsindra/llcharacter/llhandmotion.cpp
- indra/llcommon/CMakeLists.txt 1 addition, 0 deletionsindra/llcommon/CMakeLists.txt
- indra/llcommon/llhandle.h 47 additions, 11 deletionsindra/llcommon/llhandle.h
- indra/llcommon/llstat.cpp 12 additions, 7 deletionsindra/llcommon/llstat.cpp
- indra/llcommon/llstat.h 3 additions, 3 deletionsindra/llcommon/llstat.h
- indra/llimage/llimage.cpp 7 additions, 2 deletionsindra/llimage/llimage.cpp
- indra/llimage/llimage.h 1 addition, 1 deletionindra/llimage/llimage.h
- indra/llimage/llimagej2c.cpp 0 additions, 0 deletionsindra/llimage/llimagej2c.cpp
- indra/llinventory/llparcel.cpp 0 additions, 67 deletionsindra/llinventory/llparcel.cpp
- indra/llinventory/llparcel.h 0 additions, 7 deletionsindra/llinventory/llparcel.h
Loading
Please register or sign in to comment