Second Life viewer sources 1.20.2

3 files changed, 50 insertions, 90 deletions

diff --git a/linden/indra/indra_complete/indra_complete.sln b/linden/indra/indra_complete/indra_complete.sln
index b9efa5a..e990489 100644
--- a/linden/indra/indra_complete/indra_complete.sln
+++ b/linden/indra/indra_complete/indra_complete.sln
@@ -112,7 +112,7 @@ EndProject
                 {B4B838C7-2C72-428E-BBFD-25764E659A8B} = {B4B838C7-2C72-428E-BBFD-25764E659A8B}
                 {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}
                 {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE} = {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE} = {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}
         EndProjectSection
 EndProject
         ProjectSection(ProjectDependencies) = postProject
@@ -194,6 +194,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test.vcproj
                 {777F38BE-2DFE-4051-9AAD-2832ABC474CC} = {777F38BE-2DFE-4051-9AAD-2832ABC474CC}
                 {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
                 {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE} = {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}
         EndProjectSection
 EndProject
         ProjectSection(ProjectDependencies) = postProject
@@ -209,6 +210,7 @@ EndProject
         EndProjectSection
 EndProject
         ProjectSection(ProjectDependencies) = postProject
+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
         EndProjectSection
 EndProject
         ProjectSection(ProjectDependencies) = postProject
@@ -239,6 +241,7 @@ EndProject
 Global
         GlobalSection(SolutionConfiguration) = preSolution
                 Debug = Debug
+                DebugMesaHeadless = DebugMesaHeadless
                 Release = Release
                 ReleaseForDownload = ReleaseForDownload
                 ReleaseNoOpt = ReleaseNoOpt
@@ -248,6 +251,7 @@ Global
         GlobalSection(ProjectConfiguration) = postSolution
                 {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Debug.ActiveCfg = Debug|Win32
                 {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Debug.Build.0 = Debug|Win32
+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Release.ActiveCfg = Release|Win32
                 {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Release.Build.0 = Release|Win32
                 {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -256,6 +260,7 @@ Global
                 {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Debug.ActiveCfg = Debug|Win32
                 {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Debug.Build.0 = Debug|Win32
+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Release.ActiveCfg = Release|Win32
                 {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Release.Build.0 = Release|Win32
                 {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -264,6 +269,7 @@ Global
                 {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Debug.ActiveCfg = Debug|Win32
                 {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Debug.Build.0 = Debug|Win32
+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Release.ActiveCfg = Release|Win32
                 {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Release.Build.0 = Release|Win32
                 {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -272,6 +278,7 @@ Global
                 {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {D37774F4-253D-4760-BF64-372A943224A1}.Debug.ActiveCfg = Debug|Win32
                 {D37774F4-253D-4760-BF64-372A943224A1}.Debug.Build.0 = Debug|Win32
+                {D37774F4-253D-4760-BF64-372A943224A1}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {D37774F4-253D-4760-BF64-372A943224A1}.Release.ActiveCfg = Release|Win32
                 {D37774F4-253D-4760-BF64-372A943224A1}.Release.Build.0 = Release|Win32
                 {D37774F4-253D-4760-BF64-372A943224A1}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -280,6 +287,7 @@ Global
                 {D37774F4-253D-4760-BF64-372A943224A1}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {A5470DA6-0C3A-4602-B930-43DB25511A59}.Debug.ActiveCfg = Debug|Win32
                 {A5470DA6-0C3A-4602-B930-43DB25511A59}.Debug.Build.0 = Debug|Win32
+                {A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {A5470DA6-0C3A-4602-B930-43DB25511A59}.Release.ActiveCfg = Release|Win32
                 {A5470DA6-0C3A-4602-B930-43DB25511A59}.Release.Build.0 = Release|Win32
                 {A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -288,6 +296,7 @@ Global
                 {A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {DE55D666-6A3D-476C-937F-109269B83681}.Debug.ActiveCfg = Debug|Win32
                 {DE55D666-6A3D-476C-937F-109269B83681}.Debug.Build.0 = Debug|Win32
+                {DE55D666-6A3D-476C-937F-109269B83681}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {DE55D666-6A3D-476C-937F-109269B83681}.Release.ActiveCfg = Release|Win32
                 {DE55D666-6A3D-476C-937F-109269B83681}.Release.Build.0 = Release|Win32
                 {DE55D666-6A3D-476C-937F-109269B83681}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -296,6 +305,7 @@ Global
                 {DE55D666-6A3D-476C-937F-109269B83681}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Debug.ActiveCfg = Debug|Win32
                 {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Debug.Build.0 = Debug|Win32
+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Release.ActiveCfg = Release|Win32
                 {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Release.Build.0 = Release|Win32
                 {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -304,6 +314,7 @@ Global
                 {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {FCC4483C-5B84-4944-B91F-4589A219BC0B}.Debug.ActiveCfg = Debug|Win32
                 {FCC4483C-5B84-4944-B91F-4589A219BC0B}.Debug.Build.0 = Debug|Win32
+                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {FCC4483C-5B84-4944-B91F-4589A219BC0B}.Release.ActiveCfg = Release|Win32
                 {FCC4483C-5B84-4944-B91F-4589A219BC0B}.Release.Build.0 = Release|Win32
                 {FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -312,6 +323,7 @@ Global
                 {FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Debug.ActiveCfg = Debug|Win32
                 {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Debug.Build.0 = Debug|Win32
+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Release.ActiveCfg = Release|Win32
                 {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Release.Build.0 = Release|Win32
                 {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -320,6 +332,7 @@ Global
                 {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Debug.ActiveCfg = Debug|Win32
                 {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Debug.Build.0 = Debug|Win32
+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Release.ActiveCfg = Release|Win32
                 {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Release.Build.0 = Release|Win32
                 {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -328,6 +341,7 @@ Global
                 {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Debug.ActiveCfg = Debug|Win32
                 {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Debug.Build.0 = Debug|Win32
+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Release.ActiveCfg = Release|Win32
                 {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Release.Build.0 = Release|Win32
                 {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -336,6 +350,7 @@ Global
                 {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {328D1968-924F-4863-AAE8-5F9A95BA68E5}.Debug.ActiveCfg = Debug|Win32
                 {328D1968-924F-4863-AAE8-5F9A95BA68E5}.Debug.Build.0 = Debug|Win32
+                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {328D1968-924F-4863-AAE8-5F9A95BA68E5}.Release.ActiveCfg = Release|Win32
                 {328D1968-924F-4863-AAE8-5F9A95BA68E5}.Release.Build.0 = Release|Win32
                 {328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -344,6 +359,7 @@ Global
                 {328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Debug.ActiveCfg = Debug|Win32
                 {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Debug.Build.0 = Debug|Win32
+                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Release.ActiveCfg = Release|Win32
                 {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Release.Build.0 = Release|Win32
                 {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseForDownload.ActiveCfg = ReleaseForDownload|Win32
@@ -352,6 +368,7 @@ Global
                 {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {B4B838C7-2C72-428E-BBFD-25764E659A8B}.Debug.ActiveCfg = Debug|Win32
                 {B4B838C7-2C72-428E-BBFD-25764E659A8B}.Debug.Build.0 = Debug|Win32
+                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {B4B838C7-2C72-428E-BBFD-25764E659A8B}.Release.ActiveCfg = Release|Win32
                 {B4B838C7-2C72-428E-BBFD-25764E659A8B}.Release.Build.0 = Release|Win32
                 {B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -360,6 +377,7 @@ Global
                 {B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Debug.ActiveCfg = Debug|Win32
                 {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Debug.Build.0 = Debug|Win32
+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugMesaHeadless.ActiveCfg = DebugMesaHeadless|Win32
                 {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Release.ActiveCfg = Release|Win32
                 {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Release.Build.0 = Release|Win32
                 {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -368,6 +386,7 @@ Global
                 {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Debug.ActiveCfg = Debug|Win32
                 {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Debug.Build.0 = Debug|Win32
+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Release.ActiveCfg = Release|Win32
                 {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Release.Build.0 = Release|Win32
                 {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -376,6 +395,7 @@ Global
                 {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Debug.ActiveCfg = Debug|Win32
                 {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Debug.Build.0 = Debug|Win32
+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Release.ActiveCfg = Release|Win32
                 {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Release.Build.0 = Release|Win32
                 {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -384,6 +404,7 @@ Global
                 {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {44CE6D82-7320-4609-8FC3-5965C19F4808}.Debug.ActiveCfg = Debug|Win32
                 {44CE6D82-7320-4609-8FC3-5965C19F4808}.Debug.Build.0 = Debug|Win32
+                {44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {44CE6D82-7320-4609-8FC3-5965C19F4808}.Release.ActiveCfg = Release|Win32
                 {44CE6D82-7320-4609-8FC3-5965C19F4808}.Release.Build.0 = Release|Win32
                 {44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -392,6 +413,7 @@ Global
                 {44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Debug.ActiveCfg = Debug|Win32
                 {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Debug.Build.0 = Debug|Win32
+                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Release.ActiveCfg = Release|Win32
                 {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Release.Build.0 = Release|Win32
                 {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -400,6 +422,7 @@ Global
                 {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Debug.ActiveCfg = Debug|Win32
                 {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Debug.Build.0 = Debug|Win32
+                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Release.ActiveCfg = Release|Win32
                 {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Release.Build.0 = Release|Win32
                 {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -408,6 +431,7 @@ Global
                 {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Debug.ActiveCfg = Debug|Win32
                 {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Debug.Build.0 = Debug|Win32
+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Release.ActiveCfg = Release|Win32
                 {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Release.Build.0 = Release|Win32
                 {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -416,6 +440,7 @@ Global
                 {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Debug.ActiveCfg = Debug|Win32
                 {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Debug.Build.0 = Debug|Win32
+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Release.ActiveCfg = Release|Win32
                 {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Release.Build.0 = Release|Win32
                 {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -424,18 +449,21 @@ Global
                 {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseNoOpt.Build.0 = Release|Win32
                 {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Debug.ActiveCfg = Debug|Win32
                 {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Debug.Build.0 = Debug|Win32
+                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Release.ActiveCfg = Release|Win32
                 {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Release.Build.0 = Release|Win32
                 {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseForDownload.ActiveCfg = Release|Win32
                 {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseNoOpt.ActiveCfg = Release|Win32
                 {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Debug.ActiveCfg = Debug|Win32
                 {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Debug.Build.0 = Debug|Win32
+                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Release.ActiveCfg = Release|Win32
                 {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Release.Build.0 = Release|Win32
                 {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseForDownload.ActiveCfg = Release|Win32
                 {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseNoOpt.ActiveCfg = Release|Win32
                 {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Debug.ActiveCfg = Debug|Win32
                 {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Debug.Build.0 = Debug|Win32
+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Release.ActiveCfg = Release|Win32
                 {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Release.Build.0 = Release|Win32
                 {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -444,6 +472,7 @@ Global
                 {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Debug.ActiveCfg = Debug|Win32
                 {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Debug.Build.0 = Debug|Win32
+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Release.ActiveCfg = Release|Win32
                 {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Release.Build.0 = Release|Win32
                 {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -451,11 +480,13 @@ Global
                 {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
                 {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {F56CA265-93E9-4068-8A67-8B104C876D70}.Debug.ActiveCfg = Debug|Win32
+                {F56CA265-93E9-4068-8A67-8B104C876D70}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {F56CA265-93E9-4068-8A67-8B104C876D70}.Release.ActiveCfg = Release|Win32
                 {F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseForDownload.ActiveCfg = Release|Win32
                 {F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
                 {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug.ActiveCfg = Debug|Win32
                 {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug.Build.0 = Debug|Win32
+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Release.ActiveCfg = Release|Win32
                 {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Release.Build.0 = Release|Win32
                 {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -464,6 +495,7 @@ Global
                 {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Debug.ActiveCfg = Debug|Win32
                 {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Debug.Build.0 = Debug|Win32
+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Release.ActiveCfg = Release|Win32
                 {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Release.Build.0 = Release|Win32
                 {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -472,6 +504,7 @@ Global
                 {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {BBAA6588-CA96-4A87-A988-B02270B8D02B}.Debug.ActiveCfg = Debug|Win32
                 {BBAA6588-CA96-4A87-A988-B02270B8D02B}.Debug.Build.0 = Debug|Win32
+                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {BBAA6588-CA96-4A87-A988-B02270B8D02B}.Release.ActiveCfg = Release|Win32
                 {BBAA6588-CA96-4A87-A988-B02270B8D02B}.Release.Build.0 = Release|Win32
                 {BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -479,22 +512,26 @@ Global
                 {BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Debug.ActiveCfg = Debug|Win32
                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Debug.Build.0 = Debug|Win32
+                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Release.ActiveCfg = Release|Win32
                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Release.Build.0 = Release|Win32
                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload.ActiveCfg = Release|Win32
                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload.Build.0 = Release|Win32
                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Debug.ActiveCfg = Debug|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Debug.Build.0 = Debug|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Release.ActiveCfg = Release|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Release.Build.0 = Release|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseForDownload.ActiveCfg = Release|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseForDownload.Build.0 = Release|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Debug.ActiveCfg = Debug|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Debug.Build.0 = Debug|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugMesaHeadless.ActiveCfg = DebugHk460|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugMesaHeadless.Build.0 = DebugHk460|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Release.ActiveCfg = Release|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Release.Build.0 = Release|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseForDownload.ActiveCfg = Release|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseForDownload.Build.0 = Release|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug.ActiveCfg = Debug|Win32
                 {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug.Build.0 = Debug|Win32
+                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Release.ActiveCfg = Release|Win32
                 {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Release.Build.0 = Release|Win32
                 {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -503,6 +540,7 @@ Global
                 {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {076DD042-2E58-42EA-9401-53210B65C1FC}.Debug.ActiveCfg = Debug|Win32
                 {076DD042-2E58-42EA-9401-53210B65C1FC}.Debug.Build.0 = Debug|Win32
+                {076DD042-2E58-42EA-9401-53210B65C1FC}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {076DD042-2E58-42EA-9401-53210B65C1FC}.Release.ActiveCfg = Release|Win32
                 {076DD042-2E58-42EA-9401-53210B65C1FC}.Release.Build.0 = Release|Win32
                 {076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -511,6 +549,7 @@ Global
                 {076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Debug.ActiveCfg = Debug|Win32
                 {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Debug.Build.0 = Debug|Win32
+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Release.ActiveCfg = Release|Win32
                 {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Release.Build.0 = Release|Win32
                 {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -519,6 +558,7 @@ Global
                 {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                 {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Debug.ActiveCfg = Debug|Win32
                 {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Debug.Build.0 = Debug|Win32
+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                 {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Release.ActiveCfg = Release|Win32
                 {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Release.Build.0 = Release|Win32
                 {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseForDownload.ActiveCfg = Release|Win32
diff --git a/linden/indra/indra_complete/indra_complete_vc8.sln b/linden/indra/indra_complete/indra_complete_vc8.sln
index e35c0f9..54bad30 100644
--- a/linden/indra/indra_complete/indra_complete_vc8.sln
+++ b/linden/indra/indra_complete/indra_complete_vc8.sln
@@ -83,7 +83,6 @@ EndProject
                 {B4B838C7-2C72-428E-BBFD-25764E659A8B} = {B4B838C7-2C72-428E-BBFD-25764E659A8B}

                 {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}

                 {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE} = {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}

         EndProjectSection

 EndProject

         ProjectSection(ProjectDependencies) = postProject

@@ -129,19 +128,6 @@ EndProject
                 {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

         EndProjectSection

 EndProject

-        ProjectSection(ProjectDependencies) = postProject

-                {2ADE3C14-94C4-40BF-B033-70F3C954EE90} = {2ADE3C14-94C4-40BF-B033-70F3C954EE90}

-                {B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}

-                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B} = {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}

-                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3} = {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}

-                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

-                {DE55D666-6A3D-476C-937F-109269B83681} = {DE55D666-6A3D-476C-937F-109269B83681}

-                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}

-                {E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}

-                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

-                {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

-        EndProjectSection

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmedia", "..\llmedia\llmedia_vc8.vcproj", "{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"

 EndProject

 EndProject

@@ -175,7 +161,6 @@ EndProject
         EndProjectSection

 EndProject

 EndProject

-EndProject

         ProjectSection(ProjectDependencies) = postProject

                 {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

                 {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}

@@ -193,8 +178,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llimagej2coj", "..\llimagej
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile_fb_vc8", "..\lscript\lscript_compile\lscript_compile_fb_vc8.vcproj", "{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "web-plugin-asset-upload", "..\web\doc\web-plugin-asset-upload_vc8.vcproj", "{0332E7B1-8913-4669-AD7E-7E2EB6204A75}"

-EndProject

 Global

         GlobalSection(SolutionConfigurationPlatforms) = preSolution

                 Debug|Win32 = Debug|Win32

@@ -454,15 +437,6 @@ Global
                 {F56CA265-93E9-4068-8A67-8B104C876D70}.Release|Win32.ActiveCfg = Release|Win32

                 {F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

                 {F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.Debug|Win32.ActiveCfg = Debug|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.Debug|Win32.Build.0 = Debug|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.Release|Win32.ActiveCfg = Release|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.Release|Win32.Build.0 = Release|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

                 {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug|Win32.ActiveCfg = Debug|Win32

                 {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug|Win32.Build.0 = Debug|Win32

                 {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

@@ -502,16 +476,6 @@ Global
                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload|Win32.Build.0 = Release|Win32

                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Debug|Win32.ActiveCfg = Debug|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Debug|Win32.Build.0 = Debug|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Release|Win32.ActiveCfg = Release|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Release|Win32.Build.0 = Release|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseForDownload|Win32.Build.0 = Release|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

                 {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug|Win32.ActiveCfg = Debug|Win32

                 {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug|Win32.Build.0 = Debug|Win32

                 {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

@@ -562,16 +526,6 @@ Global
                 {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseForDownload|Win32.Build.0 = Release|Win32

                 {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseNoOpt|Win32.ActiveCfg = Release|Win32

                 {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseNoOpt|Win32.Build.0 = Release|Win32

-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.Debug|Win32.ActiveCfg = Debug|Win32

-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.Debug|Win32.Build.0 = Debug|Win32

-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.Release|Win32.ActiveCfg = Release|Win32

-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.Release|Win32.Build.0 = Release|Win32

-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.ReleaseForDownload|Win32.Build.0 = Release|Win32

-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.ReleaseNoOpt|Win32.ActiveCfg = Release|Win32

-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.ReleaseNoOpt|Win32.Build.0 = Release|Win32

         EndGlobalSection

         GlobalSection(SolutionProperties) = preSolution

                 HideSolutionNode = FALSE

diff --git a/linden/indra/indra_complete/indra_complete_vc9.sln b/linden/indra/indra_complete/indra_complete_vc9.sln
index 8424eb3..d7e781d 100644
--- a/linden/indra/indra_complete/indra_complete_vc9.sln
+++ b/linden/indra/indra_complete/indra_complete_vc9.sln
@@ -83,7 +83,6 @@ EndProject
                 {B4B838C7-2C72-428E-BBFD-25764E659A8B} = {B4B838C7-2C72-428E-BBFD-25764E659A8B}

                 {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}

                 {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE} = {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}

         EndProjectSection

 EndProject

         ProjectSection(ProjectDependencies) = postProject

@@ -129,19 +128,6 @@ EndProject
                 {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

         EndProjectSection

 EndProject

-        ProjectSection(ProjectDependencies) = postProject

-                {2ADE3C14-94C4-40BF-B033-70F3C954EE90} = {2ADE3C14-94C4-40BF-B033-70F3C954EE90}

-                {B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}

-                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B} = {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}

-                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3} = {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}

-                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

-                {DE55D666-6A3D-476C-937F-109269B83681} = {DE55D666-6A3D-476C-937F-109269B83681}

-                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}

-                {E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}

-                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

-                {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

-        EndProjectSection

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmedia", "..\llmedia\llmedia_vc9.vcproj", "{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"

 EndProject

 EndProject

@@ -175,7 +161,6 @@ EndProject
         EndProjectSection

 EndProject

 EndProject

-EndProject

         ProjectSection(ProjectDependencies) = postProject

                 {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

                 {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}

@@ -191,7 +176,7 @@ EndProject
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llimagej2coj", "..\llimagej2coj\llimagej2coj_vc9.vcproj", "{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile_fb_vc9", "..\lscript\lscript_compile\lscript_compile_fb_vc9.vcproj", "{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile_fb_vc8", "..\lscript\lscript_compile\lscript_compile_fb_vc9.vcproj", "{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"

 EndProject

 Global

         GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -455,15 +440,6 @@ Global
                 {F56CA265-93E9-4068-8A67-8B104C876D70}.Release|Win32.ActiveCfg = Release|Win32

                 {F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

                 {F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.Debug|Win32.ActiveCfg = Debug|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.Debug|Win32.Build.0 = Debug|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.Release|Win32.ActiveCfg = Release|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.Release|Win32.Build.0 = Release|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

-                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

                 {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug|Win32.ActiveCfg = Debug|Win32

                 {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug|Win32.Build.0 = Debug|Win32

                 {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

@@ -503,16 +479,6 @@ Global
                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload|Win32.Build.0 = Release|Win32

                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

                 {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Debug|Win32.ActiveCfg = Debug|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Debug|Win32.Build.0 = Debug|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Release|Win32.ActiveCfg = Release|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Release|Win32.Build.0 = Release|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseForDownload|Win32.Build.0 = Release|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

                 {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug|Win32.ActiveCfg = Debug|Win32

                 {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug|Win32.Build.0 = Debug|Win32

                 {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32