Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into master
No related branches found
No related tags found
Showing
- autobuild.xml 5 additions, 5 deletionsautobuild.xml
- doc/contributions.txt 3 additions, 2 deletionsdoc/contributions.txt
- indra/llcommon/llcoros.cpp 1 addition, 21 deletionsindra/llcommon/llcoros.cpp
- indra/llcommon/llexception.cpp 25 additions, 0 deletionsindra/llcommon/llexception.cpp
- indra/llcommon/llexception.h 10 additions, 0 deletionsindra/llcommon/llexception.h
- indra/llcommon/llsys.cpp 10 additions, 18 deletionsindra/llcommon/llsys.cpp
- indra/llcommon/lluriparser.cpp 64 additions, 23 deletionsindra/llcommon/lluriparser.cpp
- indra/llcommon/lluriparser.h 0 additions, 1 deletionindra/llcommon/lluriparser.h
- indra/llmessage/llassetstorage.h 1 addition, 1 deletionindra/llmessage/llassetstorage.h
- indra/llmessage/llavatarnamecache.cpp 31 additions, 19 deletionsindra/llmessage/llavatarnamecache.cpp
- indra/llmessage/llcoproceduremanager.cpp 4 additions, 4 deletionsindra/llmessage/llcoproceduremanager.cpp
- indra/llmessage/llcoproceduremanager.h 3 additions, 0 deletionsindra/llmessage/llcoproceduremanager.h
- indra/llprimitive/llmaterial.cpp 39 additions, 1 deletionindra/llprimitive/llmaterial.cpp
- indra/llprimitive/llmaterial.h 11 additions, 0 deletionsindra/llprimitive/llmaterial.h
- indra/llui/llcheckboxctrl.cpp 27 additions, 3 deletionsindra/llui/llcheckboxctrl.cpp
- indra/llui/llfolderviewmodel.h 3 additions, 3 deletionsindra/llui/llfolderviewmodel.h
- indra/llui/lllayoutstack.cpp 1 addition, 1 deletionindra/llui/lllayoutstack.cpp
- indra/llui/llmenugl.cpp 13 additions, 8 deletionsindra/llui/llmenugl.cpp
- indra/llui/llmenugl.h 1 addition, 1 deletionindra/llui/llmenugl.h
- indra/llui/lltextbase.cpp 1 addition, 1 deletionindra/llui/lltextbase.cpp
Loading
Please register or sign in to comment