aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 43bb709..95d6f1f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1867,7 +1867,7 @@ namespace OpenSim.Region.Environment.Scenes
1867 client.OnUpdatePrimGroupScale += m_innerScene.UpdatePrimGroupScale; 1867 client.OnUpdatePrimGroupScale += m_innerScene.UpdatePrimGroupScale;
1868 client.OnUpdateExtraParams += m_innerScene.UpdateExtraParam; 1868 client.OnUpdateExtraParams += m_innerScene.UpdateExtraParam;
1869 client.OnUpdatePrimShape += m_innerScene.UpdatePrimShape; 1869 client.OnUpdatePrimShape += m_innerScene.UpdatePrimShape;
1870 client.OnRequestMapBlocks += RequestMapBlocks; 1870 //client.OnRequestMapBlocks += RequestMapBlocks; // handled in a module now.
1871 client.OnUpdatePrimTexture += m_innerScene.UpdatePrimTexture; 1871 client.OnUpdatePrimTexture += m_innerScene.UpdatePrimTexture;
1872 client.OnTeleportLocationRequest += RequestTeleportLocation; 1872 client.OnTeleportLocationRequest += RequestTeleportLocation;
1873 client.OnTeleportLandmarkRequest += RequestTeleportLandmark; 1873 client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
@@ -2487,7 +2487,8 @@ namespace OpenSim.Region.Environment.Scenes
2487 /// <param name="maxY"></param> 2487 /// <param name="maxY"></param>
2488 public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY) 2488 public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
2489 { 2489 {
2490 m_sceneGridService.RequestMapBlocks(remoteClient, minX, minY, maxX, maxX); 2490 m_log.InfoFormat("[MAPBLOCK]: {0}-{1}, {2}-{3}", minX, minY, maxX, maxY);
2491 m_sceneGridService.RequestMapBlocks(remoteClient, minX, minY, maxX, maxY);
2491 } 2492 }
2492 2493
2493 /// <summary> 2494 /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 300a363..2774a45 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Environment.Scenes
81 private ScriptControlled IgnoredControls = ScriptControlled.CONTROL_ZERO; 81 private ScriptControlled IgnoredControls = ScriptControlled.CONTROL_ZERO;
82 private ScriptControlled LastCommands = ScriptControlled.CONTROL_ZERO; 82 private ScriptControlled LastCommands = ScriptControlled.CONTROL_ZERO;
83 private SceneObjectGroup proxyObjectGroup = null; 83 private SceneObjectGroup proxyObjectGroup = null;
84 private SceneObjectPart proxyObjectPart = null; 84 //private SceneObjectPart proxyObjectPart = null;
85 85
86 public Vector3 lastKnownAllowedPosition = new Vector3(); 86 public Vector3 lastKnownAllowedPosition = new Vector3();
87 public bool sentMessageAboutRestrictedParcelFlyingDown = false; 87 public bool sentMessageAboutRestrictedParcelFlyingDown = false;