4 files changed, 22 insertions, 16 deletions

diff --git a/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenGrid.Framework.Manager/GridServerManager.cs
index 16ea6e8..c536e33 100644
--- a/OpenGrid.Framework.Manager/GridServerManager.cs
+++ b/OpenGrid.Framework.Manager/GridServerManager.cs
@@ -19,7 +19,7 @@ namespace OpenGrid.Framework.Manager {
                         Hashtable requestData = (Hashtable)request.Params[0];
                         Hashtable responseData = new Hashtable();
            
-                        if(requestData["authkey"]!=recvkey) {
+                        if((string)requestData["authkey"] != recvkey) {
                                 responseData["error"]="INVALID KEY";
                         } else {
                                 responseData["msg"]="Shutdown command accepted";
diff --git a/OpenGridServices.AssetServer/Main.cs b/OpenGridServices.AssetServer/Main.cs
index ef9cc67..684d683 100644
--- a/OpenGridServices.AssetServer/Main.cs
+++ b/OpenGridServices.AssetServer/Main.cs
@@ -140,7 +140,6 @@ namespace OpenGridServices.AssetServer
 

         public byte[] getAssetData(LLUUID assetID, bool isTexture)

         {

-            byte[] idata = null;

             bool found = false;

             AssetStorage foundAsset = null;

 

diff --git a/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim.Physics/OdePlugin/OdePlugin.cs
index 8ddfd5c..599dea8 100644
--- a/OpenSim.Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim.Physics/OdePlugin/OdePlugin.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Physics.OdePlugin
         static public IntPtr space;

         static private IntPtr contactgroup;

         static private IntPtr LandGeom;

-        static private IntPtr Land;

+        //static private IntPtr Land;

         private double[] _heightmap;

         static private d.NearCallback nearCallback = near;

         private List<OdeCharacter> _characters = new List<OdeCharacter>();

diff --git a/ServiceManager/ServiceManager.csproj b/ServiceManager/ServiceManager.csproj
index f703ef1..ac118c3 100644
--- a/ServiceManager/ServiceManager.csproj
+++ b/ServiceManager/ServiceManager.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>ServiceManager</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Exe</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>ServiceManager</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,18 +61,19 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.ServiceProcess" >

+    <Reference Include="System.ServiceProcess">

       <HintPath>System.ServiceProcess.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -75,7 +82,7 @@
   </ItemGroup>

   <ItemGroup>

     <Compile Include="ServiceManager.cs">

-      <SubType>Code</SubType>

+      <SubType>Component</SubType>

     </Compile>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

@@ -85,4 +92,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file