Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331
No related branches found
No related tags found
Showing
- .hgtags 1 addition, 0 deletions.hgtags
- BuildParams 12 additions, 3 deletionsBuildParams
- autobuild.xml 3 additions, 3 deletionsautobuild.xml
- build.sh 23 additions, 5 deletionsbuild.sh
- doc/contributions.txt 18 additions, 1 deletiondoc/contributions.txt
- indra/CMakeLists.txt 5 additions, 4 deletionsindra/CMakeLists.txt
- indra/cmake/BuildVersion.cmake 10 additions, 6 deletionsindra/cmake/BuildVersion.cmake
- indra/lib/python/indra/util/llmanifest.py 85 additions, 2 deletionsindra/lib/python/indra/util/llmanifest.py
- indra/llcommon/llsd.cpp 5 additions, 0 deletionsindra/llcommon/llsd.cpp
- indra/llcommon/llsd.h 5 additions, 1 deletionindra/llcommon/llsd.h
- indra/llcommon/llsys.cpp 38 additions, 7 deletionsindra/llcommon/llsys.cpp
- indra/llinventory/llparcel.cpp 0 additions, 111 deletionsindra/llinventory/llparcel.cpp
- indra/llinventory/llparcel.h 0 additions, 17 deletionsindra/llinventory/llparcel.h
- indra/llmath/llvolume.cpp 4 additions, 2 deletionsindra/llmath/llvolume.cpp
- indra/llmath/v4color.h 1 addition, 1 deletionindra/llmath/v4color.h
- indra/llmessage/llhttpclient.cpp 21 additions, 14 deletionsindra/llmessage/llhttpclient.cpp
- indra/llmessage/llhttpclient.h 13 additions, 6 deletionsindra/llmessage/llhttpclient.h
- indra/llmessage/llinstantmessage.h 1 addition, 1 deletionindra/llmessage/llinstantmessage.h
- indra/llmessage/llurlrequest.cpp 15 additions, 6 deletionsindra/llmessage/llurlrequest.cpp
- indra/llmessage/llurlrequest.h 5 additions, 4 deletionsindra/llmessage/llurlrequest.h
Loading
Please register or sign in to comment