Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
merged all changes, post copy, from the following branches: linden/brachnes/enable-o-v user/cg/qar-1538 user/mani/viewer2-enable-o-v
Showing
- indra/cmake/00-Common.cmake 1 addition, 1 deletionindra/cmake/00-Common.cmake
- indra/llcharacter/lljoint.h 1 addition, 1 deletionindra/llcharacter/lljoint.h
- indra/llcommon/lldependencies.h 3 additions, 0 deletionsindra/llcommon/lldependencies.h
- indra/llcommon/llevents.h 9 additions, 0 deletionsindra/llcommon/llevents.h
- indra/llcommon/llpreprocessor.h 3 additions, 1 deletionindra/llcommon/llpreprocessor.h
- indra/llcommon/llsd.cpp 8 additions, 0 deletionsindra/llcommon/llsd.cpp
- indra/llmath/lloctree.h 3 additions, 7 deletionsindra/llmath/lloctree.h
- indra/llmessage/llassetstorage.cpp 6 additions, 6 deletionsindra/llmessage/llassetstorage.cpp
- indra/llmessage/llassetstorage.h 3 additions, 3 deletionsindra/llmessage/llassetstorage.h
- indra/llmessage/llcurl.cpp 2 additions, 2 deletionsindra/llmessage/llcurl.cpp
- indra/llmessage/llcurl.h 1 addition, 1 deletionindra/llmessage/llcurl.h
- indra/llmessage/llhttpassetstorage.cpp 1 addition, 1 deletionindra/llmessage/llhttpassetstorage.cpp
- indra/llmessage/llhttpassetstorage.h 2 additions, 0 deletionsindra/llmessage/llhttpassetstorage.h
- indra/llmessage/llhttpnode.cpp 9 additions, 9 deletionsindra/llmessage/llhttpnode.cpp
- indra/llmessage/llhttpnode.h 6 additions, 5 deletionsindra/llmessage/llhttpnode.h
- indra/llmessage/lliohttpserver.cpp 1 addition, 0 deletionsindra/llmessage/lliohttpserver.cpp
- indra/llmessage/llregionpresenceverifier.h 1 addition, 0 deletionsindra/llmessage/llregionpresenceverifier.h
- indra/llmessage/llsdappservices.cpp 2 additions, 2 deletionsindra/llmessage/llsdappservices.cpp
- indra/llmessage/llsdhttpserver.cpp 2 additions, 2 deletionsindra/llmessage/llsdhttpserver.cpp
- indra/llmessage/llsdmessage.cpp 2 additions, 2 deletionsindra/llmessage/llsdmessage.cpp
Loading
Please register or sign in to comment