merge uv-picking branch.
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
Showing
- indra/llmath/llrect.h 3 additions, 2 deletionsindra/llmath/llrect.h
- indra/llmath/llvolume.cpp 179 additions, 45 deletionsindra/llmath/llvolume.cpp
- indra/llmath/llvolume.h 13 additions, 1 deletionindra/llmath/llvolume.h
- indra/llmath/v2math.cpp 1 addition, 0 deletionsindra/llmath/v2math.cpp
- indra/llmath/v2math.h 11 additions, 3 deletionsindra/llmath/v2math.h
- indra/llmath/v3math.cpp 8 additions, 0 deletionsindra/llmath/v3math.cpp
- indra/llmath/v3math.h 2 additions, 0 deletionsindra/llmath/v3math.h
- indra/llmessage/lltemplatemessagereader.cpp 3 additions, 1 deletionindra/llmessage/lltemplatemessagereader.cpp
- indra/llmessage/message_prehash.cpp 3 additions, 0 deletionsindra/llmessage/message_prehash.cpp
- indra/llmessage/message_prehash.h 3 additions, 1 deletionindra/llmessage/message_prehash.h
- indra/llui/llview.cpp 0 additions, 1 deletionindra/llui/llview.cpp
- indra/llwindow/llwindowmacosx.cpp 5 additions, 0 deletionsindra/llwindow/llwindowmacosx.cpp
- indra/llwindow/llwindowwin32.cpp 4 additions, 0 deletionsindra/llwindow/llwindowwin32.cpp
- indra/lscript/lscript_library/lscript_library.cpp 8 additions, 0 deletionsindra/lscript/lscript_library/lscript_library.cpp
- indra/newview/app_settings/settings.xml 22 additions, 0 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llagent.cpp 16 additions, 12 deletionsindra/newview/llagent.cpp
- indra/newview/llagent.h 7 additions, 1 deletionindra/newview/llagent.h
- indra/newview/lldrawpoolavatar.cpp 2 additions, 9 deletionsindra/newview/lldrawpoolavatar.cpp
- indra/newview/llface.cpp 106 additions, 132 deletionsindra/newview/llface.cpp
- indra/newview/llface.h 2 additions, 1 deletionindra/newview/llface.h
Loading
Please register or sign in to comment