aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-09-24 11:23:01 +0000
committerlbsa712007-09-24 11:23:01 +0000
commit9f6b709f3c9f33651e31d8102f4f3cb0f5e0a0da (patch)
tree880dbc42f4d1513715f8830a274fd4af47b5f766
parent* Applied tleiades patch #435 fixing HttpBaseServer ABEND (thanx!) (diff)
downloadopensim-SC-9f6b709f3c9f33651e31d8102f4f3cb0f5e0a0da.zip
opensim-SC-9f6b709f3c9f33651e31d8102f4f3cb0f5e0a0da.tar.gz
opensim-SC-9f6b709f3c9f33651e31d8102f4f3cb0f5e0a0da.tar.bz2
opensim-SC-9f6b709f3c9f33651e31d8102f4f3cb0f5e0a0da.tar.xz
* the worlds most insignificant commit
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs1
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 8e838d1..64e8e4b 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -162,13 +162,11 @@ namespace OpenSim.Grid.GridServer
162 { 162 {
163 Dictionary<ulong, SimProfileData> regions = new Dictionary<ulong, SimProfileData>(); 163 Dictionary<ulong, SimProfileData> regions = new Dictionary<ulong, SimProfileData>();
164 164
165 SimProfileData[] neighbours;
166
167 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 165 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
168 { 166 {
169 try 167 try
170 { 168 {
171 neighbours = kvp.Value.GetProfilesInRange(xmin, ymin, xmax, ymax); 169 SimProfileData[] neighbours = kvp.Value.GetProfilesInRange(xmin, ymin, xmax, ymax);
172 foreach (SimProfileData neighbour in neighbours) 170 foreach (SimProfileData neighbour in neighbours)
173 { 171 {
174 regions[neighbour.regionHandle] = neighbour; 172 regions[neighbour.regionHandle] = neighbour;
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 5b17d95..83626b8 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -429,6 +429,7 @@ namespace OpenSim.Region.Environment.Scenes
429 // Console.WriteLine("DEBUG: HandleAgentUpdate: null PhysicsActor!"); 429 // Console.WriteLine("DEBUG: HandleAgentUpdate: null PhysicsActor!");
430 return; 430 return;
431 } 431 }
432
432 int i = 0; 433 int i = 0;
433 bool update_movementflag = false; 434 bool update_movementflag = false;
434 bool update_rotation = false; 435 bool update_rotation = false;