svn merge...
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3 EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
Showing
- indra/llui/llmenugl.cpp 27 additions, 16 deletionsindra/llui/llmenugl.cpp
- indra/llui/llmenugl.h 3 additions, 0 deletionsindra/llui/llmenugl.h
- indra/llui/llsearcheditor.h 8 additions, 0 deletionsindra/llui/llsearcheditor.h
- indra/newview/CMakeLists.txt 5 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/settings.xml 33 additions, 11 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llagent.cpp 10 additions, 161 deletionsindra/newview/llagent.cpp
- indra/newview/llagent.h 1 addition, 6 deletionsindra/newview/llagent.h
- indra/newview/llagentui.cpp 179 additions, 0 deletionsindra/newview/llagentui.cpp
- indra/newview/llagentui.h 51 additions, 0 deletionsindra/newview/llagentui.h
- indra/newview/llchannelmanager.cpp 51 additions, 17 deletionsindra/newview/llchannelmanager.cpp
- indra/newview/llchannelmanager.h 16 additions, 19 deletionsindra/newview/llchannelmanager.h
- indra/newview/llchiclet.cpp 53 additions, 41 deletionsindra/newview/llchiclet.cpp
- indra/newview/llchiclet.h 18 additions, 0 deletionsindra/newview/llchiclet.h
- indra/newview/llclassifiedstatsresponder.cpp 0 additions, 1 deletionindra/newview/llclassifiedstatsresponder.cpp
- indra/newview/lldrawpoolalpha.cpp 0 additions, 1 deletionindra/newview/lldrawpoolalpha.cpp
- indra/newview/lldrawpoolavatar.cpp 0 additions, 1 deletionindra/newview/lldrawpoolavatar.cpp
- indra/newview/lldrawpoolbump.cpp 0 additions, 1 deletionindra/newview/lldrawpoolbump.cpp
- indra/newview/lldrawpoolsimple.cpp 0 additions, 1 deletionindra/newview/lldrawpoolsimple.cpp
- indra/newview/lldrawpoolwlsky.cpp 0 additions, 1 deletionindra/newview/lldrawpoolwlsky.cpp
- indra/newview/llemote.cpp 0 additions, 1 deletionindra/newview/llemote.cpp
Loading
Please register or sign in to comment