diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-24 10:08:13 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-24 10:08:13 -0400 |
commit | 76fb5f1542297a7e1afdf983d8a0db459fc0b8ab (patch) | |
tree | 0c35366715e4a944361f5ec1cbf61535b04b6ab0 /indra/tools | |
parent | ff42e557848158d5a01cc260bac0bbf974650934 (diff) | |
parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) |
merge with viewer tools update
Diffstat (limited to 'indra/tools')
-rwxr-xr-x | indra/tools/vstool/VSTool.exe | bin | 24576 -> 24576 bytes | |||
-rwxr-xr-x | indra/tools/vstool/main.cs | 8 |
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/tools/vstool/VSTool.exe b/indra/tools/vstool/VSTool.exe Binary files differindex 8be428614e..854290b90a 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 cc73261e30..ef2e582b90 100755 --- a/indra/tools/vstool/main.cs +++ b/indra/tools/vstool/main.cs @@ -555,6 +555,10 @@ namespace VSTool version = "VC100";
break;
+ case "12.00":
+ version = "VC120";
+ break;
+
default:
throw new ApplicationException("Unknown .sln version: " + format);
}
@@ -595,6 +599,10 @@ namespace VSTool progid = "VisualStudio.DTE.10.0";
break;
+ case "VC120":
+ progid = "VisualStudio.DTE.12.0";
+ break;
+
default:
throw new ApplicationException("Can't handle VS version: " + version);
}
|