4 files changed, 118 insertions, 2 deletions
diff --git a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
new file mode 100644
index 0000000..c2704ef
--- /dev/null
+++ b/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
@@ -0,0 +1,101 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{7924FD35-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenGrid.Framework.Manager</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenGrid.Framework.Manager</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">
+      <Name>OpenSim.Servers</Name>
+      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
+      <Name>XMLRPC</Name>
+      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GridManagementAgent.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="GridServerManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index b886f46..d4515ca 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -107,7 +107,10 @@ namespace OpenSim.Physics.BasicPhysicsPlugin
                                }
                                if(actor.Position.Z < (_heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X]+1))
                                {*/
-                                        actor.Position.Z = _heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X]+1;
+                if (actor.Position.Y > 0 && actor.Position.Y < 256 && actor.Position.X > 0 && actor.Position.X < 256)
+                {
+                    actor.Position.Z = _heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X] + 1;
+                }
                                //}
diff --git a/ServiceManager/ServiceManager.csproj.user b/ServiceManager/ServiceManager.csproj.user
index 842b560..d47d65d 100644
--- a/ServiceManager/ServiceManager.csproj.user
+++ b/ServiceManager/ServiceManager.csproj.user
@@ -2,7 +2,7 @@
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim07-05\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectTrust>0</ProjectTrust>

diff --git a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj new file mode 100644 index 0000000..c2704ef --- /dev/null +++ b/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
@@ -0,0 +1,101 @@
		1	<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
		2	<PropertyGroup>
		3	<ProjectType>Local</ProjectType>
		4	<ProductVersion>8.0.50727</ProductVersion>
		5	<SchemaVersion>2.0</SchemaVersion>
		6	<ProjectGuid>{7924FD35-0000-0000-0000-000000000000}</ProjectGuid>
		7	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
		8	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
		9	<ApplicationIcon></ApplicationIcon>
		10	<AssemblyKeyContainerName>
		11	</AssemblyKeyContainerName>
		12	<AssemblyName>OpenGrid.Framework.Manager</AssemblyName>
		13	<DefaultClientScript>JScript</DefaultClientScript>
		14	<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
		15	<DefaultTargetSchema>IE50</DefaultTargetSchema>
		16	<DelaySign>false</DelaySign>
		17	<OutputType>Library</OutputType>
		18	<AppDesignerFolder></AppDesignerFolder>
		19	<RootNamespace>OpenGrid.Framework.Manager</RootNamespace>
		20	<StartupObject></StartupObject>
		21	<FileUpgradeFlags>
		22	</FileUpgradeFlags>
		23	</PropertyGroup>
		24	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Debug\|AnyCPU' ">
		25	<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
		26	<BaseAddress>285212672</BaseAddress>
		27	<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
		28	<ConfigurationOverrideFile>
		29	</ConfigurationOverrideFile>
		30	<DefineConstants>TRACE;DEBUG</DefineConstants>
		31	<DocumentationFile></DocumentationFile>
		32	<DebugSymbols>True</DebugSymbols>
		33	<FileAlignment>4096</FileAlignment>
		34	<Optimize>False</Optimize>
		35	<OutputPath>..\bin\</OutputPath>
		36	<RegisterForComInterop>False</RegisterForComInterop>
		37	<RemoveIntegerChecks>False</RemoveIntegerChecks>
		38	<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
		39	<WarningLevel>4</WarningLevel>
		40	<NoWarn></NoWarn>
		41	</PropertyGroup>
		42	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Release\|AnyCPU' ">
		43	<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
		44	<BaseAddress>285212672</BaseAddress>
		45	<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
		46	<ConfigurationOverrideFile>
		47	</ConfigurationOverrideFile>
		48	<DefineConstants>TRACE</DefineConstants>
		49	<DocumentationFile></DocumentationFile>
		50	<DebugSymbols>False</DebugSymbols>
		51	<FileAlignment>4096</FileAlignment>
		52	<Optimize>True</Optimize>
		53	<OutputPath>..\bin\</OutputPath>
		54	<RegisterForComInterop>False</RegisterForComInterop>
		55	<RemoveIntegerChecks>False</RemoveIntegerChecks>
		56	<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
		57	<WarningLevel>4</WarningLevel>
		58	<NoWarn></NoWarn>
		59	</PropertyGroup>
		60	<ItemGroup>
		61	<Reference Include="System" >
		62	<HintPath>System.dll</HintPath>
		63	<Private>False</Private>
		64	</Reference>
		65	</ItemGroup>
		66	<ItemGroup>
		67	<ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
		68	<Name>OpenSim.Framework</Name>
		69	<Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
		70	<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
		71	<Private>False</Private>
		72	</ProjectReference>
		73	<ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">
		74	<Name>OpenSim.Servers</Name>
		75	<Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
		76	<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
		77	<Private>False</Private>
		78	</ProjectReference>
		79	<ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
		80	<Name>XMLRPC</Name>
		81	<Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
		82	<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
		83	<Private>False</Private>
		84	</ProjectReference>
		85	</ItemGroup>
		86	<ItemGroup>
		87	<Compile Include="GridManagementAgent.cs">
		88	<SubType>Code</SubType>
		89	</Compile>
		90	<Compile Include="GridServerManager.cs">
		91	<SubType>Code</SubType>
		92	</Compile>
		93	</ItemGroup>
		94	<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
		95	<PropertyGroup>
		96	<PreBuildEvent>
		97	</PreBuildEvent>
		98	<PostBuildEvent>
		99	</PostBuildEvent>
		100	</PropertyGroup>
		101	</Project>


diff --git a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user new file mode 100644 index 0000000..d47d65d --- /dev/null +++ b/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
@@ -0,0 +1,12 @@
		1	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
		2	<PropertyGroup>
		3	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
		4	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
		5	<ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
		6	<LastOpenVersion>8.0.50727</LastOpenVersion>
		7	<ProjectView>ProjectFiles</ProjectView>
		8	<ProjectTrust>0</ProjectTrust>
		9	</PropertyGroup>
		10	<PropertyGroup Condition = " '$(Configuration)\|$(Platform)' == 'Debug\|AnyCPU' " />
		11	<PropertyGroup Condition = " '$(Configuration)\|$(Platform)' == 'Release\|AnyCPU' " />
		12	</Project>


diff --git a/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs index b886f46..d4515ca 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs +++ b/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -107,7 +107,10 @@ namespace OpenSim.Physics.BasicPhysicsPlugin
107	}	107	}
108	if(actor.Position.Z < (_heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X]+1))	108	if(actor.Position.Z < (_heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X]+1))
109	{*/	109	{*/
110	actor.Position.Z = _heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X]+1;	110	if (actor.Position.Y > 0 && actor.Position.Y < 256 && actor.Position.X > 0 && actor.Position.X < 256)
		111	{
		112	actor.Position.Z = _heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X] + 1;
		113	}
111	//}	114	//}
112		115
113		116


diff --git a/ServiceManager/ServiceManager.csproj.user b/ServiceManager/ServiceManager.csproj.user index 842b560..d47d65d 100644 --- a/ServiceManager/ServiceManager.csproj.user +++ b/ServiceManager/ServiceManager.csproj.user
@@ -2,7 +2,7 @@
2	<PropertyGroup>	2	<PropertyGroup>
3	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>	3	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>	4	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5	<ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim07-05\trunk\bin\</ReferencePath>	5	<ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6	<LastOpenVersion>8.0.50727</LastOpenVersion>	6	<LastOpenVersion>8.0.50727</LastOpenVersion>
7	<ProjectView>ProjectFiles</ProjectView>	7	<ProjectView>ProjectFiles</ProjectView>
8	<ProjectTrust>0</ProjectTrust>	8	<ProjectTrust>0</ProjectTrust>