diff options
author | UbitUmarov | 2017-04-15 10:56:46 +0100 |
---|---|---|
committer | UbitUmarov | 2017-04-15 10:56:46 +0100 |
commit | b52f7b920342b7ea3e0294eae054e7520801e339 (patch) | |
tree | 3cb8b121978a16afd597e21c04c34b296ee6f9a8 /OpenSim/Region | |
parent | several changes for osTeleportObject (diff) | |
download | opensim-SC_OLD-b52f7b920342b7ea3e0294eae054e7520801e339.zip opensim-SC_OLD-b52f7b920342b7ea3e0294eae054e7520801e339.tar.gz opensim-SC_OLD-b52f7b920342b7ea3e0294eae054e7520801e339.tar.bz2 opensim-SC_OLD-b52f7b920342b7ea3e0294eae054e7520801e339.tar.xz |
missing file and remove warnings
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs index 9585082..1b690ba 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | |||
@@ -102,6 +102,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
102 | 102 | ||
103 | ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, EntityTransferContext ctx); | 103 | ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, EntityTransferContext ctx); |
104 | 104 | ||
105 | bool CrossAgentCreateFarChild(ScenePresence agent, GridRegion neighbourRegion, Vector3 pos, EntityTransferContext ctx); | ||
106 | |||
105 | bool HandleIncomingSceneObject(SceneObjectGroup so, Vector3 newPosition); | 107 | bool HandleIncomingSceneObject(SceneObjectGroup so, Vector3 newPosition); |
106 | } | 108 | } |
107 | 109 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 0e7ac58..e73795e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
153 | timeLastChanged = DateTime.UtcNow.Ticks; | 153 | timeLastChanged = DateTime.UtcNow.Ticks; |
154 | if (!m_hasGroupChanged) | 154 | if (!m_hasGroupChanged) |
155 | timeFirstChanged = DateTime.UtcNow.Ticks; | 155 | timeFirstChanged = DateTime.UtcNow.Ticks; |
156 | if (m_rootPart != null && m_rootPart.UUID != null && m_scene != null) | 156 | if (m_rootPart != null && m_scene != null) |
157 | { | 157 | { |
158 | /* | 158 | /* |
159 | if (m_rand == null) | 159 | if (m_rand == null) |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index d50de27..6d4cb52 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -6488,7 +6488,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
6488 | if (check) | 6488 | if (check) |
6489 | { | 6489 | { |
6490 | // check is relative to current parcel only | 6490 | // check is relative to current parcel only |
6491 | if (currentParcelUUID == null || oldhide == currentParcelHide) | 6491 | if (oldhide == currentParcelHide) |
6492 | return; | 6492 | return; |
6493 | 6493 | ||
6494 | allpresences = m_scene.GetScenePresences(); | 6494 | allpresences = m_scene.GetScenePresences(); |