Rename 'Util' to 'CommonEntitiesUtil' so it can be added to other

projects without  name confusion.

CommonEntities/AssetManager.cs

@@ -29,7 +29,7 @@ using OMV = OpenMetaverse;
 using OMVA = OpenMetaverse.Assets;
 using OpenMetaverse.Imaging;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 using CSJ2K;
 

CommonEntities/BConverterOS.cs

@@ -26,7 +26,7 @@ using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 using OMV = OpenMetaverse;
 using OMVS = OpenMetaverse.StructuredData;

CommonEntities/BInstance.cs

@@ -20,7 +20,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 using OMV = OpenMetaverse;
 

CommonEntities/BSceneManipulation.cs

@@ -20,7 +20,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 using OMV = OpenMetaverse;
 using OMVR = OpenMetaverse.Rendering;

CommonEntities/CommonEntities-core.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <RootNamespace>CommonEntities_core</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,15 +9,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="log4net">
-      <HintPath>..\libs\log4net.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Util\CommonEntitiesUtil.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
     <Reference Include="Nini">
       <HintPath>..\libs\Nini.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\libs\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="OpenMetaverse">
       <HintPath>..\libs\OpenMetaverse.dll</HintPath>
     </Reference>

CommonEntities/CommonEntities.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DED4BC9A-CFBD-453D-814F-B3850D14FF27}</ProjectGuid>
+    <ProjectGuid>{C9DADDA3-1AD2-4378-9417-D681FADCA107}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CommonEntities</RootNamespace>
@@ -34,10 +34,6 @@
     <Reference Include="CSJ2K, Version=3.0.0.0, Culture=neutral, PublicKeyToken=0ca7be2ec378a773, processorArchitecture=MSIL">
       <HintPath>..\packages\CSJ2K.3.0.0\lib\net40-client\CSJ2K.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\libs\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="Nini">
       <HintPath>..\libs\Nini.dll</HintPath>
     </Reference>
@@ -95,13 +91,16 @@
     <Reference Include="PrimMesher">
       <HintPath>..\libs\PrimMesher.dll</HintPath>
     </Reference>
+    <Reference Include="SmartThreadPool">
+      <HintPath>..\libs\SmartThreadPool.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -113,20 +112,23 @@
     <Compile Include="BInstance.cs" />
     <Compile Include="BScene.cs" />
     <Compile Include="BSceneManipulation.cs" />
-    <Compile Include="PersistRules.cs" />
-    <Compile Include="Terrain.cs" />
     <Compile Include="Displayable.cs" />
     <Compile Include="ImageInfo.cs" />
     <Compile Include="MaterialInfo.cs" />
     <Compile Include="MeshInfo.cs" />
+    <Compile Include="PersistRules.cs" />
     <Compile Include="PrimToMesh.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Terrain.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Util\Util.csproj">
+    <ProjectReference Include="..\Util\CommonEntitiesUtil.csproj">
       <Project>{dab7cef5-c7c1-4dfa-85d7-267658efc466}</Project>
-      <Name>Util</Name>
+      <Name>CommonEntitiesUtil</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

CommonEntities/Displayable.cs

@@ -22,7 +22,7 @@ using System.Threading.Tasks;
 
 using OpenSim.Region.Framework.Scenes;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 using OMV = OpenMetaverse;
 

CommonEntities/ImageInfo.cs

@@ -20,7 +20,7 @@ using System.Drawing.Drawing2D;
 
 using OMV = OpenMetaverse;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 namespace org.herbal3d.cs.os.CommonEntities {
 

CommonEntities/MaterialInfo.cs

@@ -20,7 +20,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 using OMV = OpenMetaverse;
 using OMVR = OpenMetaverse.Rendering;

CommonEntities/MeshInfo.cs

@@ -20,7 +20,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 using OMV = OpenMetaverse;
 using OMVR = OpenMetaverse.Rendering;

CommonEntities/PersistRules.cs

@@ -23,7 +23,7 @@ using System.Drawing.Imaging;
 using System.Drawing.Drawing2D;
 using System.IO;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 using OMV = OpenMetaverse;
 

CommonEntities/PrimToMesh.cs

@@ -22,7 +22,7 @@ using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 using OMV = OpenMetaverse;
 using OMVS = OpenMetaverse.StructuredData;

CommonEntities/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("CommonEntities")]
+[assembly: AssemblyTitle("ClassLibrary1")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CommonEntities")]
+[assembly: AssemblyProduct("ClassLibrary1")]
 [assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("ded4bc9a-cfbd-453d-814f-b3850d14ff27")]
+[assembly: Guid("c9dadda3-1ad2-4378-9417-d681fadca107")]
 
 // Version information for an assembly consists of the following four values:
 //

CommonEntities/Terrain.cs

@@ -21,7 +21,7 @@ using System.Threading.Tasks;
 
 using OpenSim.Region.CoreModules.World.LegacyMap;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 using OMV = OpenMetaverse;
 using OpenSim.Region.Framework.Interfaces;

CommonEntities/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="CSJ2K" version="3.0.0" targetFramework="net461" />
+</packages>

Util/BHasher.cs

@@ -20,7 +20,7 @@ using System.Linq;
 using System.Text;
 using System.Security.Cryptography;
 
-namespace org.herbal3d.cs.Util {
+namespace org.herbal3d.cs.CommonEntitiesUtil {
 
     // Basil wrapper for hash functions.
     // There are several different hashing systems ranging from int's to SHA versions.

Util/EntityHandle.cs

@@ -19,7 +19,7 @@ using System.Collections.Generic;
 
 using OMV = OpenMetaverse;
 
-namespace org.herbal3d.cs.Util {
+namespace org.herbal3d.cs.CommonEntitiesUtil {
 
     // Class for collecting all me mess around asset names.
     // All filename, type, and version conversions are done here.

Util/IParameters.cs

@@ -18,7 +18,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace org.herbal3d.cs.Util {
+namespace org.herbal3d.cs.CommonEntitiesUtil {
     public interface IParameters {
         // Basic parameter fetching interface which returns the parameter
         //   value of the requested parameter name.

Util/Logger.cs

@@ -17,7 +17,7 @@ using System;
 
 using log4net;
 
-namespace org.herbal3d.cs.Util {
+namespace org.herbal3d.cs.CommonEntitiesUtil {
 
     public abstract class BLogger {
         public abstract void SetVerbose(bool val);

Util/Utilities.cs

@@ -5,7 +5,7 @@ using System.Text;
 
 using OMV = OpenMetaverse;
 
-namespace org.herbal3d.cs.Util {
+namespace org.herbal3d.cs.CommonEntitiesUtil {
     // A container for useful, static utility functions
     public class Utilities {
         // Base function that creates a 4x4 transform from pos, rotation, and scale.

convoar.sln

@@ -5,9 +5,9 @@ VisualStudioVersion = 15.0.27130.2003
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "convoar", "convoar\convoar.csproj", "{BD9942A1-315C-4961-B56A-D1770BED83B0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Util", "Util\Util.csproj", "{DAB7CEF5-C7C1-4DFA-85D7-267658EFC466}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonEntitiesUtil", "Util\CommonEntitiesUtil.csproj", "{DAB7CEF5-C7C1-4DFA-85D7-267658EFC466}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonEntities", "CommonEntities\CommonEntities.csproj", "{DED4BC9A-CFBD-453D-814F-B3850D14FF27}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonEntities", "CommonEntities\CommonEntities.csproj", "{C9DADDA3-1AD2-4378-9417-D681FADCA107}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,14 +33,14 @@ Global
 		{DAB7CEF5-C7C1-4DFA-85D7-267658EFC466}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DAB7CEF5-C7C1-4DFA-85D7-267658EFC466}.Release|x64.ActiveCfg = Release|Any CPU
 		{DAB7CEF5-C7C1-4DFA-85D7-267658EFC466}.Release|x64.Build.0 = Release|Any CPU
-		{DED4BC9A-CFBD-453D-814F-B3850D14FF27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DED4BC9A-CFBD-453D-814F-B3850D14FF27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DED4BC9A-CFBD-453D-814F-B3850D14FF27}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DED4BC9A-CFBD-453D-814F-B3850D14FF27}.Debug|x64.Build.0 = Debug|Any CPU
-		{DED4BC9A-CFBD-453D-814F-B3850D14FF27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DED4BC9A-CFBD-453D-814F-B3850D14FF27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DED4BC9A-CFBD-453D-814F-B3850D14FF27}.Release|x64.ActiveCfg = Release|Any CPU
-		{DED4BC9A-CFBD-453D-814F-B3850D14FF27}.Release|x64.Build.0 = Release|Any CPU
+		{C9DADDA3-1AD2-4378-9417-D681FADCA107}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9DADDA3-1AD2-4378-9417-D681FADCA107}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9DADDA3-1AD2-4378-9417-D681FADCA107}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C9DADDA3-1AD2-4378-9417-D681FADCA107}.Debug|x64.Build.0 = Debug|Any CPU
+		{C9DADDA3-1AD2-4378-9417-D681FADCA107}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9DADDA3-1AD2-4378-9417-D681FADCA107}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9DADDA3-1AD2-4378-9417-D681FADCA107}.Release|x64.ActiveCfg = Release|Any CPU
+		{C9DADDA3-1AD2-4378-9417-D681FADCA107}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

convoar/Convoar.cs

@@ -23,8 +23,8 @@ using System.Threading.Tasks;
 
 using OpenSim.Services.Interfaces;
 
-using org.herbal3d.cs.Util;
 using org.herbal3d.cs.os.CommonEntities;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 namespace org.herbal3d.convoar {
 

convoar/ConvoarParams.cs

@@ -20,7 +20,7 @@
 using System;
 using System.Text;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 using OMV = OpenMetaverse;
 

convoar/ConvoarStats.cs

@@ -35,7 +35,7 @@ namespace org.herbal3d.convoar {
 
         public Scene m_scene;
     #pragma warning disable 414
-        private static string _logHeader = "[Stats]";
+        private static readonly string _logHeader = "[Stats]";
     #pragma warning restore 414
 
         public ConvoarStats() {

convoar/ConvoarTests.cs

@@ -22,7 +22,7 @@ using System.Threading.Tasks;
 
 using OpenSim.Region.Framework.Scenes;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 using org.herbal3d.cs.os.CommonEntities;
 
 using OMV = OpenMetaverse;

convoar/GltfClasses.cs

@@ -18,7 +18,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.IO;
 
-using org.herbal3d.cs.Util;
+using org.herbal3d.cs.CommonEntitiesUtil;
 using org.herbal3d.cs.os.CommonEntities;
 
 // I hoped to keep the Gltf classes separate from the OMV requirement but

convoar/OarConverter.cs

@@ -38,8 +38,8 @@ using OpenSim.Region.PhysicsModules.SharedBase;
 using OpenSim.Tests.Common;
 using OpenSim.Data.Null;
 
-using org.herbal3d.cs.Util;
 using org.herbal3d.cs.os.CommonEntities;
+using org.herbal3d.cs.CommonEntitiesUtil;
 
 using OMV = OpenMetaverse;
 using OMVS = OpenMetaverse.StructuredData;

convoar/Resources/BuildDate.txt

@@ -1 +1 @@
-Sat 02/09/2019 10:22:53.71 
+Mon 02/11/2019  6:48:38.16 

convoar/Resources/GitCommit.txt

@@ -1 +1 @@
-d98fce3d25c6f1e1d5def8a781c1f4a71e0b6197
+819e37e46569910a3f36d1e906f602ecf8a6c9f0

convoar/convoar.csproj

@@ -70,9 +70,6 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CSJ2K, Version=3.0.0.0, Culture=neutral, PublicKeyToken=0ca7be2ec378a773, processorArchitecture=MSIL">
-      <HintPath>..\packages\CSJ2K.3.0.0\lib\net40-client\CSJ2K.dll</HintPath>
-    </Reference>
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\libs\log4net.dll</HintPath>
@@ -179,7 +176,6 @@
     <None Include="libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
@@ -218,12 +214,12 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CommonEntities\CommonEntities.csproj">
-      <Project>{ded4bc9a-cfbd-453d-814f-b3850d14ff27}</Project>
+      <Project>{c9dadda3-1ad2-4378-9417-d681fadca107}</Project>
       <Name>CommonEntities</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Util\Util.csproj">
+    <ProjectReference Include="..\Util\CommonEntitiesUtil.csproj">
       <Project>{dab7cef5-c7c1-4dfa-85d7-267658efc466}</Project>
-      <Name>Util</Name>
+      <Name>CommonEntitiesUtil</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

convoar/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CSJ2K" version="3.0.0" targetFramework="net46" />
-</packages>