Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3
Includes: * DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips * DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor * Some cleanup to llerror so that it doesn't depend on llfixedbuffer * A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
Showing
- indra/llcommon/CMakeLists.txt 2 additions, 0 deletionsindra/llcommon/CMakeLists.txt
- indra/llcommon/llapp.h 3 additions, 2 deletionsindra/llcommon/llapp.h
- indra/llcommon/llerror.cpp 8 additions, 9 deletionsindra/llcommon/llerror.cpp
- indra/llcommon/llerrorcontrol.h 13 additions, 2 deletionsindra/llcommon/llerrorcontrol.h
- indra/llcommon/llfixedbuffer.cpp 7 additions, 6 deletionsindra/llcommon/llfixedbuffer.cpp
- indra/llcommon/llfixedbuffer.h 9 additions, 13 deletionsindra/llcommon/llfixedbuffer.h
- indra/llcommon/lloptioninterface.cpp 39 additions, 0 deletionsindra/llcommon/lloptioninterface.cpp
- indra/llcommon/lloptioninterface.h 46 additions, 0 deletionsindra/llcommon/lloptioninterface.h
- indra/llcommon/llstring.h 16 additions, 4 deletionsindra/llcommon/llstring.h
- indra/llvfs/lldir.cpp 2 additions, 0 deletionsindra/llvfs/lldir.cpp
- indra/lscript/lscript_compile/lscript_tree.cpp 10 additions, 8 deletionsindra/lscript/lscript_compile/lscript_tree.cpp
- indra/lscript/lscript_execute/lscript_execute.cpp 22 additions, 22 deletionsindra/lscript/lscript_execute/lscript_execute.cpp
- indra/lscript/lscript_execute/lscript_readlso.cpp 2 additions, 2 deletionsindra/lscript/lscript_execute/lscript_readlso.cpp
- indra/lscript/lscript_library.h 3 additions, 5 deletionsindra/lscript/lscript_library.h
- indra/lscript/lscript_library/lscript_library.cpp 375 additions, 407 deletionsindra/lscript/lscript_library/lscript_library.cpp
- indra/newview/llappviewer.cpp 4 additions, 4 deletionsindra/newview/llappviewer.cpp
- indra/newview/llpreviewscript.cpp 60 additions, 15 deletionsindra/newview/llpreviewscript.cpp
- indra/newview/llviewerprecompiledheaders.h 0 additions, 1 deletionindra/newview/llviewerprecompiledheaders.h
- indra/newview/skins/default/xui/en/strings.xml 355 additions, 1 deletionindra/newview/skins/default/xui/en/strings.xml
Loading
Please register or sign in to comment