Merge branch 'dev-next' into dev-syntax-code

trunk/Properties/AssemblyInfo.cs

@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("LSL-Editor for editing and compiling LSL scripts")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyProduct("LSL Editor")]
 [assembly: AssemblyCopyright("2006 - 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -70,7 +70,7 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.47.0.*")]
+[assembly: AssemblyVersion("2.47.1.0")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the
@@ -100,4 +100,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDelaySign(false)]
 //[assembly: AssemblyKeyName("")]
 [assembly: ComVisibleAttribute(false)]
-[assembly: AssemblyFileVersionAttribute("2.47.0.0")]
+[assembly: AssemblyFileVersionAttribute("2.47.1.5")]

trunk/Resource/ConfLSL.xml

@@ -4847,16 +4847,6 @@
 			<Word name="OBJECT_TOTAL_SCRIPT_COUNT" value="10" />
 			<Word name="OBJECT_UNKNOWN_DETAIL" value="-1" />
 			
-			<Word name="OPT_AVATAR" type="integer" value="1">Returned for avatars.</Word>
-			<Word name="OPT_CHARACTER" type="integer" value="2">Returned for pathfinding characters.</Word>
-			<Word name="OPT_EXCLUSION_VOLUME" type="integer" value="6">Returned for exclusion volumes.</Word>
-			<Word name="OPT_LEGACY_LINKSET" type="integer" value="0">Returned for movable obstacles, movable phantoms, physical, and volumedetect objects.</Word>
-			<Word name="OPT_MATERIAL_VOLUME" type="integer" value="5">Returned for material volumes.</Word>
-			<Word name="OPT_OTHER" type="integer" value="-1">Returned for attachments, Linden trees, and grass.</Word>
-			<Word name="OPT_STATIC_OBSTACLE" type="integer" value="4">Returned for static obstacles.</Word>
-			<Word name="OPT_WALKABLE" type="integer" value="3">Returned for walkable objects.</Word>
-			
-
 			<Word name="OPT_AVATAR" type="integer" value="1">Returned for avatars.</Word>
 			<Word name="OPT_CHARACTER" type="integer" value="2">Returned for pathfinding characters.</Word>
 			<Word name="OPT_EXCLUSION_VOLUME" type="integer" value="6">Returned for exclusion volumes.</Word>
@@ -5120,8 +5110,6 @@
 			
 			<Word name="SIM_STAT_PCT_CHARS_STEPPED" type="integer" value="0">Returns the % of pathfinding characters skipped each frame, averaged over the last minute.</Word>
 
-			<Word name="SIM_STAT_PCT_CHARS_STEPPED" type="integer" value="0">Returns the % of pathfinding characters skipped each frame, averaged over the last minute.</Word>
-
 			<Word name="STRING_TRIM" />
 			<Word name="STRING_TRIM_HEAD" />
 			<Word name="STRING_TRIM_TAIL" />

trunk/Resource/ReleaseNotes.htm

@@ -66,7 +66,7 @@
                                 <div>
 					* Fixed:
 					<ul>
-						<li></li>
+					    <li>LSLEditor.exe now shows its version number, etc when using Windows Explorer&apos;s Properties => Details.</li>
 					</ul>
                                 </div>
 			</div>

trunk/lsleditor.csproj

@@ -7,8 +7,7 @@
     <ProjectGuid>{59468D25-6E68-4113-B740-C6EF4695045B}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
+    <ApplicationIcon>App.ico</ApplicationIcon>
-    </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>LSLEditor</AssemblyName>
@@ -20,16 +19,19 @@
     <DelaySign>false</DelaySign>
     <OutputType>WinExe</OutputType>
     <RootNamespace>LSLEditor</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
     <StartupObject>LSLEditor.LSLEditorForm</StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <SignAssembly>true</SignAssembly>
-    <Win32Resource>LSLEditor.RES</Win32Resource>
+    <Win32Resource>
+    </Win32Resource>
     <OldToolsVersion>3.5</OldToolsVersion>
     <IsWebBootstrapper>true</IsWebBootstrapper>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
     <PublishUrl>http://localhost/LSLEditor/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
@@ -44,8 +46,6 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\bin\Debug\</OutputPath>
@@ -629,6 +629,7 @@
     <EmbeddedResource Include="Images\Close-Active.gif" />
     <EmbeddedResource Include="Images\Close-Disabled.gif" />
     <EmbeddedResource Include="Images\Close-Inactive.gif" />
+    <Content Include="App.ico" />
     <Content Include="Docking\DockPanel.bmp" />
     <Content Include="Docking\Resources\DockIndicator_PaneDiamond.bmp" />
     <Content Include="Docking\Resources\DockIndicator_PaneDiamond_Bottom.bmp" />
@@ -842,7 +843,7 @@
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
       <Install>false</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">