QAR-377 maintenance-6 merge:
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
Showing
- doc/contributions.txt 7 additions, 0 deletionsdoc/contributions.txt
- indra/lib/python/indra/util/llmanifest.py 1 addition, 1 deletionindra/lib/python/indra/util/llmanifest.py
- indra/llcommon/llerror.cpp 49 additions, 8 deletionsindra/llcommon/llerror.cpp
- indra/llcommon/llstreamtools.cpp 13 additions, 68 deletionsindra/llcommon/llstreamtools.cpp
- indra/llcommon/llstreamtools.h 0 additions, 5 deletionsindra/llcommon/llstreamtools.h
- indra/llinventory/llinventory.cpp 1 addition, 0 deletionsindra/llinventory/llinventory.cpp
- indra/llinventory/llparcelflags.h 1 addition, 1 deletionindra/llinventory/llparcelflags.h
- indra/llmessage/llnamevalue.cpp 12 additions, 1204 deletionsindra/llmessage/llnamevalue.cpp
- indra/llmessage/llnamevalue.h 19 additions, 35 deletionsindra/llmessage/llnamevalue.h
- indra/llmessage/llregionflags.h 2 additions, 1 deletionindra/llmessage/llregionflags.h
- indra/mac_updater/mac_updater.cpp 1 addition, 0 deletionsindra/mac_updater/mac_updater.cpp
- indra/newview/app_settings/keywords.ini 0 additions, 2 deletionsindra/newview/app_settings/keywords.ini
- indra/newview/llappviewer.cpp 6 additions, 14 deletionsindra/newview/llappviewer.cpp
- indra/newview/llappviewer.h 0 additions, 1 deletionindra/newview/llappviewer.h
- indra/newview/lldelayedgestureerror.cpp 125 additions, 0 deletionsindra/newview/lldelayedgestureerror.cpp
- indra/newview/lldelayedgestureerror.h 82 additions, 0 deletionsindra/newview/lldelayedgestureerror.h
- indra/newview/llfloaterabout.cpp 0 additions, 6 deletionsindra/newview/llfloaterabout.cpp
- indra/newview/llfloaterregioninfo.cpp 131 additions, 52 deletionsindra/newview/llfloaterregioninfo.cpp
- indra/newview/llgesturemgr.cpp 3 additions, 8 deletionsindra/newview/llgesturemgr.cpp
- indra/newview/llimview.cpp 11 additions, 7 deletionsindra/newview/llimview.cpp
Loading
Please register or sign in to comment