Merge branch 'master' into DRTVWR-501-maint

# Conflicts:
#	autobuild.xml
#	indra/newview/llimprocessing.cpp

2 files changed, 5 insertions, 1 deletions

diff --git a/indra/tools/vstool/VSTool.exe b/indra/tools/vstool/VSTool.exe
index 854290b90a..751540413a 100755
--- a/indra/tools/vstool/VSTool.exe
+++ b/indra/tools/vstool/VSTool.exe
diff --git a/indra/tools/vstool/main.cs b/indra/tools/vstool/main.cs
index ef2e582b90..1d6b2f14d1 100755
--- a/indra/tools/vstool/main.cs
+++ b/indra/tools/vstool/main.cs
@@ -556,7 +556,7 @@ namespace VSTool
                         break;

 

                     case "12.00":

-                        version = "VC120";

+                        version = "VC150";

                         break;

 

                     default:

@@ -603,6 +603,10 @@ namespace VSTool
                     progid = "VisualStudio.DTE.12.0";

                     break;

 

+                case "VC150":

+                    progid = "VisualStudio.DTE.15.0";

+                    break;

+

                 default:

                     throw new ApplicationException("Can't handle VS version: " + version);

             }