Removing the error Invalid Resx file. Could not find a part of the path IdealistRadeg...

Also disabling the plug-in for the moment

git-svn-id: https://radegast.googlecode.com/svn/trunk@210 f7a694da-4d33-11de-9ad6-1127a62b9fcd

diff --git a/plugins/IdealistRadegastPlugin/IdealistPlugin.cs b/plugins/IdealistRadegastPlugin/IdealistPlugin.cs
index 87fed1a..7dd48e0 100644 (file)
--- a/plugins/IdealistRadegastPlugin/IdealistPlugin.cs
+++ b/plugins/IdealistRadegastPlugin/IdealistPlugin.cs
@@ -25,6 +25,7 @@ namespace IdealistRadegastPlugin
         }\r
         public void StartPlugin(RadegastInstance inst)\r
         {\r
+            return;\r
             Instance = inst;\r
             XmlConfigurator.Configure();\r
 \r

diff --git a/plugins/IdealistRadegastPlugin/IdealistRadegastPlugin.csproj b/plugins/IdealistRadegastPlugin/IdealistRadegastPlugin.csproj
index bc242c0..ecc1819 100644 (file)
--- a/plugins/IdealistRadegastPlugin/IdealistRadegastPlugin.csproj
+++ b/plugins/IdealistRadegastPlugin/IdealistRadegastPlugin.csproj
@@ -1,67 +1,160 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">\r
   <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProjectType>Local</ProjectType>\r
     <ProductVersion>9.0.30729</ProductVersion>\r
     <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{AC593C3E-88D5-4904-AD4F-C012A7C7B5AA}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>IdealistRadegastPlugin</RootNamespace>\r
+    <ProjectGuid>{8FB7F368-3916-47A3-B274-96FA898F4B9A}</ProjectGuid>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ApplicationIcon>\r
+    </ApplicationIcon>\r
+    <AssemblyKeyContainerName>\r
+    </AssemblyKeyContainerName>\r
     <AssemblyName>IdealistRadegastPlugin</AssemblyName>\r
+    <DefaultClientScript>JScript</DefaultClientScript>\r
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>\r
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>\r
+    <DelaySign>false</DelaySign>\r
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>\r
+    </AppDesignerFolder>\r
+    <RootNamespace>IdealistRadegastPlugin</RootNamespace>\r
     <StartupObject>\r
     </StartupObject>\r
+    <FileUpgradeFlags>\r
+    </FileUpgradeFlags>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <Optimize>false</Optimize>\r
-    <OutputPath>..\..\bin\Debug\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>\r
+    <ConfigurationOverrideFile>\r
+    </ConfigurationOverrideFile>\r
+    <DefineConstants>TRACE;VISUAL_STUDIO</DefineConstants>\r
+    <DocumentationFile>\r
+    </DocumentationFile>\r
+    <DebugSymbols>False</DebugSymbols>\r
+    <FileAlignment>4096</FileAlignment>\r
+    <Optimize>True</Optimize>\r
+    <OutputPath>..\..\bin\</OutputPath>\r
+    <RegisterForComInterop>False</RegisterForComInterop>\r
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>\r
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>\r
+    <WarningLevel>3</WarningLevel>\r
+    <NoStdLib>False</NoStdLib>\r
+    <NoWarn>1591,1574,0419,0618,0414,0169</NoWarn>\r
     <PlatformTarget>x86</PlatformTarget>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <OutputPath>bin\Release\</OutputPath>\r
-    <DefineConstants>TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>\r
+    <ConfigurationOverrideFile>\r
+    </ConfigurationOverrideFile>\r
+    <DefineConstants>TRACE;DEBUG;VISUAL_STUDIO</DefineConstants>\r
+    <DocumentationFile>\r
+    </DocumentationFile>\r
+    <DebugSymbols>True</DebugSymbols>\r
+    <FileAlignment>4096</FileAlignment>\r
+    <Optimize>False</Optimize>\r
+    <OutputPath>..\..\bin\</OutputPath>\r
+    <RegisterForComInterop>False</RegisterForComInterop>\r
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>\r
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>\r
+    <WarningLevel>3</WarningLevel>\r
+    <NoStdLib>False</NoStdLib>\r
+    <NoWarn>1591,1574,0419,0618,0414,0169</NoWarn>\r
+    <PlatformTarget>x86</PlatformTarget>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <Reference Include="HttpServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />\r
-    <Reference Include="Irrlicht.Extensions, Version=0.8.3253.28437, Culture=neutral, processorArchitecture=MSIL" />\r
-    <Reference Include="Irrlicht.NET, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL" />\r
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />\r
-    <Reference Include="MXP, Version=0.4.0.1, Culture=neutral, processorArchitecture=MSIL" />\r
-    <Reference Include="Nini, Version=1.1.0.0, Culture=neutral, PublicKeyToken=691faec150a7fa7b, processorArchitecture=MSIL" />\r
-    <Reference Include="PrimMesher, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />\r
-    <Reference Include="protobuf-net, Version=1.0.0.237, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL" />\r
-    <Reference Include="System" />\r
+    <Reference Include="HttpServer">\r
+      <Name>HttpServer</Name>\r
+    </Reference>\r
+    <Reference Include="Irrlicht.Extensions">\r
+      <Name>Irrlicht.Extensions</Name>\r
+    </Reference>\r
+    <Reference Include="Irrlicht.NET">\r
+      <Name>Irrlicht.NET</Name>\r
+    </Reference>\r
+    <Reference Include="log4net">\r
+      <Name>log4net</Name>\r
+    </Reference>\r
+    <Reference Include="MXP">\r
+      <Name>MXP</Name>\r
+    </Reference>\r
+    <Reference Include="Nini">\r
+      <Name>Nini</Name>\r
+    </Reference>\r
+    <Reference Include="PrimMesher">\r
+      <Name>PrimMesher</Name>\r
+    </Reference>\r
+    <Reference Include="protobuf-net">\r
+      <Name>protobuf-net</Name>\r
+    </Reference>\r
+    <Reference Include="System">\r
+      <Name>System</Name>\r
+    </Reference>\r
     <Reference Include="System.Core">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
+      <Name>System.Core</Name>\r
+    </Reference>\r
+    <Reference Include="System.Drawing">\r
+      <Name>System.Drawing</Name>\r
+    </Reference>\r
+    <Reference Include="System.Windows.Forms">\r
+      <Name>System.Windows.Forms</Name>\r
     </Reference>\r
-    <Reference Include="System.Drawing" />\r
-    <Reference Include="System.Windows.Forms" />\r
     <Reference Include="System.Xml.Linq">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
+      <Name>System.Xml.Linq</Name>\r
     </Reference>\r
     <Reference Include="System.Data.DataSetExtensions">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
+      <Name>System.Data.DataSetExtensions</Name>\r
+    </Reference>\r
+    <Reference Include="System.Data">\r
+      <Name>System.Data</Name>\r
+    </Reference>\r
+    <Reference Include="System.Xml">\r
+      <Name>System.Xml</Name>\r
     </Reference>\r
-    <Reference Include="System.Data" />\r
-    <Reference Include="System.Xml" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <Compile Include="IdealistPlugin.cs" />\r
+    <ProjectReference Include="..\OpenMetaverse\OpenMetaverse.csproj">\r
+      <Name>OpenMetaverse</Name>\r
+      <Project>{A09AB4F6-EA97-4860-93A0-D06778177FBB}</Project>\r
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\OpenMetaverseTypes\OpenMetaverseTypes.csproj">\r
+      <Name>OpenMetaverseTypes</Name>\r
+      <Project>{5455C710-2CE4-4BC2-8E8A-50BCF3A87B1A}</Project>\r
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\OpenMetaverseCore\OpenMetaverseCore.csproj">\r
+      <Name>OpenMetaverseCore</Name>\r
+      <Project>{C0901414-E66C-4BAC-AAE6-236C12B40206}</Project>\r
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\IdealistViewer\IdealistViewer.csproj">\r
+      <Name>IdealistViewer</Name>\r
+      <Project>{3CAE4FD8-F513-40B1-A540-793E213AA394}</Project>\r
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\Radegast\Radegast.csproj">\r
+      <Name>Radegast</Name>\r
+      <Project>{F216BEA5-6C63-4803-BD0B-0EAFF20CDF3F}</Project>\r
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="IdealistPlugin.cs">\r
+    </Compile>\r
+    <Compile Include="Viewer.cs">\r
+    </Compile>\r
+    <Compile Include="Network\LibOmvNetworkModule.cs">\r
+    </Compile>\r
+    <Compile Include="Properties\AssemblyInfo.cs">\r
+    </Compile>\r
     <Compile Include="Properties\Resources.Designer.cs">\r
       <AutoGen>True</AutoGen>\r
-      <DesignTime>True</DesignTime>\r
       <DependentUpon>Resources.resx</DependentUpon>\r
     </Compile>\r
     <Compile Include="Renderer\IdealistViewControl.cs">\r
@@ -76,33 +169,12 @@
     <Compile Include="Renderer\ParentWindowForm.Designer.cs">\r
       <DependentUpon>ParentWindowForm.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="Network\LibOmvNetworkModule.cs" />\r
-    <Compile Include="Renderer\Renderer.cs" />\r
-    <Compile Include="Viewer.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\..\..\idealistviewer\trunk\IdealistViewer\IdealistViewer.csproj">\r
-      <Project>{48E99D95-0000-0000-0000-000000000000}</Project>\r
-      <Name>IdealistViewer</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\..\..\libopenmetaverse\OpenMetaverseTypes\OpenMetaverseTypes.csproj">\r
-      <Project>{0AE91182-9B41-4DD2-9A69-4F3FF0B91D57}</Project>\r
-      <Name>OpenMetaverseTypes</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\..\..\libopenmetaverse\OpenMetaverse\OpenMetaverse.csproj">\r
-      <Project>{3778636D-71F7-4EA0-95C6-8E1B691E3457}</Project>\r
-      <Name>OpenMetaverse</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\..\Radegast\Radegast.csproj">\r
-      <Project>{A6D955CD-1F55-459F-A7AD-01E591404989}</Project>\r
-      <Name>Radegast</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
+    <Compile Include="Renderer\Renderer.cs">\r
+    </Compile>\r
     <EmbeddedResource Include="Properties\Resources.resx">\r
       <Generator>ResXFileCodeGenerator</Generator>\r
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
+      <SubType>Designer</SubType>\r
     </EmbeddedResource>\r
     <EmbeddedResource Include="Renderer\IdealistViewControl.resx">\r
       <DependentUpon>IdealistViewControl.cs</DependentUpon>\r
@@ -111,15 +183,11 @@
       <DependentUpon>ParentWindowForm.cs</DependentUpon>\r
     </EmbeddedResource>\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Resources\" />\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />\r
+  <PropertyGroup>\r
+    <PreBuildEvent>\r
+    </PreBuildEvent>\r
+    <PostBuildEvent>\r
+    </PostBuildEvent>\r
+  </PropertyGroup>\r
 </Project>
\ No newline at end of file

diff --git a/plugins/IdealistRadegastPlugin/Properties/Resources.Designer.cs b/plugins/IdealistRadegastPlugin/Properties/Resources.Designer.cs
index 77cca2a..a2ce2ac 100644 (file)
--- a/plugins/IdealistRadegastPlugin/Properties/Resources.Designer.cs
+++ b/plugins/IdealistRadegastPlugin/Properties/Resources.Designer.cs
@@ -59,12 +59,5 @@ namespace IdealistRadegastPlugin.Properties {
                 resourceCulture = value;\r
             }\r
         }\r
-        \r
-        internal static System.Drawing.Bitmap radegast {\r
-            get {\r
-                object obj = ResourceManager.GetObject("radegast", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
     }\r
 }\r

diff --git a/plugins/IdealistRadegastPlugin/Properties/Resources.resx b/plugins/IdealistRadegastPlugin/Properties/Resources.resx
index e02fdde..4d26a2a 100644 (file)
--- a/plugins/IdealistRadegastPlugin/Properties/Resources.resx
+++ b/plugins/IdealistRadegastPlugin/Properties/Resources.resx
@@ -118,7 +118,4 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
-  <data name="radegast" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\radegast.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
 </root>
\ No newline at end of file

diff --git a/plugins/IdealistRadegastPlugin/Viewer.cs b/plugins/IdealistRadegastPlugin/Viewer.cs
index 4d248ad..c57aaf0 100644 (file)
--- a/plugins/IdealistRadegastPlugin/Viewer.cs
+++ b/plugins/IdealistRadegastPlugin/Viewer.cs
@@ -19,7 +19,7 @@ using IConfigSource = Nini.Config.IConfigSource;
 using IniConfigSource = Nini.Config.IniConfigSource;\r
 using Console = IdealistViewer.Console;\r
 using MainConsole=IdealistViewer.MainConsole;\r
-//using Renderer = IdealistRadegastPlugin.Renderer;\r
+using Renderer = IdealistRadegastPlugin.RaegastRenderer;\r
 \r
 namespace IdealistRadegastPlugin\r
 {\r