merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk
Showing
- indra/llcommon/lllslconstants.h 14 additions, 0 deletionsindra/llcommon/lllslconstants.h
- indra/llinventory/llparcel.h 1 addition, 1 deletionindra/llinventory/llparcel.h
- indra/llmessage/llhttpnode.cpp 8 additions, 2 deletionsindra/llmessage/llhttpnode.cpp
- indra/llmessage/llhttpnode.h 14 additions, 1 deletionindra/llmessage/llhttpnode.h
- indra/llmessage/lliohttpserver.cpp 58 additions, 13 deletionsindra/llmessage/lliohttpserver.cpp
- indra/llmessage/lliohttpserver.h 12 additions, 0 deletionsindra/llmessage/lliohttpserver.h
- indra/llmessage/llservicebuilder.cpp 21 additions, 1 deletionindra/llmessage/llservicebuilder.cpp
- indra/lscript/CMakeLists.txt 3 additions, 0 deletionsindra/lscript/CMakeLists.txt
- indra/lscript/llscriptresource.h 64 additions, 0 deletionsindra/lscript/llscriptresource.h
- indra/lscript/llscriptresourceconsumer.h 56 additions, 0 deletionsindra/lscript/llscriptresourceconsumer.h
- indra/lscript/llscriptresourcepool.h 46 additions, 0 deletionsindra/lscript/llscriptresourcepool.h
- indra/lscript/lscript_byteformat.h 8 additions, 1 deletionindra/lscript/lscript_byteformat.h
- indra/lscript/lscript_compile/indra.l 14 additions, 10 deletionsindra/lscript/lscript_compile/indra.l
- indra/lscript/lscript_compile/indra.y 21 additions, 0 deletionsindra/lscript/lscript_compile/indra.y
- indra/lscript/lscript_compile/lscript_tree.cpp 109 additions, 0 deletionsindra/lscript/lscript_compile/lscript_tree.cpp
- indra/lscript/lscript_compile/lscript_tree.h 28 additions, 2 deletionsindra/lscript/lscript_compile/lscript_tree.h
- indra/lscript/lscript_execute/CMakeLists.txt 6 additions, 0 deletionsindra/lscript/lscript_execute/CMakeLists.txt
- indra/lscript/lscript_execute/llscriptresource.cpp 86 additions, 0 deletionsindra/lscript/lscript_execute/llscriptresource.cpp
- indra/lscript/lscript_execute/llscriptresourceconsumer.cpp 101 additions, 0 deletionsindra/lscript/lscript_execute/llscriptresourceconsumer.cpp
- indra/lscript/lscript_execute/llscriptresourcepool.cpp 39 additions, 0 deletionsindra/lscript/lscript_execute/llscriptresourcepool.cpp
Loading
Please register or sign in to comment