diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 39f3007..0aa587e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -996,7 +996,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
996 | 996 | ||
997 | // Loop it | 997 | // Loop it |
998 | if (m_frame == Int32.MaxValue) | 998 | if (m_frame == Int32.MaxValue) |
999 | m_frame = 0; | 999 | m_frame = 0; |
1000 | 1000 | ||
1001 | otherMS = Environment.TickCount; | 1001 | otherMS = Environment.TickCount; |
1002 | // run through all entities looking for updates (slow) | 1002 | // run through all entities looking for updates (slow) |
@@ -2023,12 +2023,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2023 | return true; | 2023 | return true; |
2024 | } | 2024 | } |
2025 | break; | 2025 | break; |
2026 | case Cardinals.W: | 2026 | case Cardinals.W: |
2027 | foreach (Border b in WestBorders) | 2027 | foreach (Border b in WestBorders) |
2028 | { | 2028 | { |
2029 | if (b.TestCross(position)) | 2029 | if (b.TestCross(position)) |
2030 | return true; | 2030 | return true; |
2031 | } | 2031 | } |
2032 | break; | 2032 | break; |
2033 | } | 2033 | } |
2034 | } | 2034 | } |
@@ -2305,8 +2305,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2305 | "to avatar {0} at position {1}", | 2305 | "to avatar {0} at position {1}", |
2306 | sp.UUID.ToString(), grp.AbsolutePosition); | 2306 | sp.UUID.ToString(), grp.AbsolutePosition); |
2307 | AttachObject(sp.ControllingClient, | 2307 | AttachObject(sp.ControllingClient, |
2308 | grp.LocalId, (uint)0, | 2308 | grp.LocalId, 0, |
2309 | grp.GroupRotation, | 2309 | grp.Rotation, |
2310 | grp.AbsolutePosition, false); | 2310 | grp.AbsolutePosition, false); |
2311 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2311 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
2312 | grp.SendGroupFullUpdate(); | 2312 | grp.SendGroupFullUpdate(); |
@@ -3270,7 +3270,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3270 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", | 3270 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", |
3271 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); | 3271 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); |
3272 | //reason = String.Format("You are not currently on the access list for {0}",RegionInfo.RegionName); | 3272 | //reason = String.Format("You are not currently on the access list for {0}",RegionInfo.RegionName); |
3273 | return false; | 3273 | return false; |
3274 | } | 3274 | } |
3275 | } | 3275 | } |
3276 | 3276 | ||
@@ -3419,7 +3419,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3419 | /// We've got an update about an agent that sees into this region, | 3419 | /// We've got an update about an agent that sees into this region, |
3420 | /// send it to ScenePresence for processing It's the full data. | 3420 | /// send it to ScenePresence for processing It's the full data. |
3421 | /// </summary> | 3421 | /// </summary> |
3422 | /// <param name="cAgentData">Agent that contains all of the relevant things about an agent. | 3422 | /// <param name="cAgentData">Agent that contains all of the relevant things about an agent. |
3423 | /// Appearance, animations, position, etc.</param> | 3423 | /// Appearance, animations, position, etc.</param> |
3424 | /// <returns>true if we handled it.</returns> | 3424 | /// <returns>true if we handled it.</returns> |
3425 | public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData) | 3425 | public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData) |