From ccf046e8e212753ffe2144e2133d558b380740c4 Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 15 May 2007 20:44:14 +0000
Subject: fixed part of the bug from 116 (should no longer get the repeated
Failed with exception System.IndexOutOfRangeException: Array index is out of
range error)
---
.../OpenGrid.Framework.Manager.csproj | 101 +++++++++++++++++++++
.../OpenGrid.Framework.Manager.csproj.user | 12 +++
.../BasicPhysicsPlugin/BasicPhysicsPlugin.cs | 5 +-
ServiceManager/ServiceManager.csproj.user | 2 +-
4 files changed, 118 insertions(+), 2 deletions(-)
create mode 100644 OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
create mode 100644 OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
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 @@
+
+
+ Local
+ 8.0.50727
+ 2.0
+ {7924FD35-0000-0000-0000-000000000000}
+ Debug
+ AnyCPU
+
+
+
+ OpenGrid.Framework.Manager
+ JScript
+ Grid
+ IE50
+ false
+ Library
+
+ OpenGrid.Framework.Manager
+
+
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE;DEBUG
+
+ True
+ 4096
+ False
+ ..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE
+
+ False
+ 4096
+ True
+ ..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+
+ System.dll
+ False
+
+
+
+
+ OpenSim.Framework
+ {8ACA2445-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Servers
+ {8BB20F0A-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ XMLRPC
+ {8E81D43C-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+ Debug
+ AnyCPU
+ C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\
+ 8.0.50727
+ ProjectFiles
+ 0
+
+
+
+
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 @@
Debug
AnyCPU
- C:\New Folder\second-life-viewer\opensim-dailys2\opensim07-05\trunk\bin\
+ C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\
8.0.50727
ProjectFiles
0
--
cgit v1.1