diff options
author | UbitUmarov | 2015-11-01 03:01:59 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-01 03:01:59 +0000 |
commit | 72684592ba196095311b308407cbe5751c6dd8dd (patch) | |
tree | c51a1fb67c6d425b1cb904e788bac8a720d951c8 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | fix cut points of UTF-8 strings (diff) | |
parent | Minor: Add an initializer to show what the default value would be. (diff) | |
download | opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.zip opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.gz opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.bz2 opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.xz |
Merge branch 'master' into avinationmerge
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/Servers/ServerBase.cs
OpenSim/Framework/VersionInfo.cs
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/GatekeeperService.cs
OpenSim/Services/Interfaces/IAvatarService.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index c97c838..e780f86 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -42,6 +42,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
42 | using OpenSim.Region.PhysicsModules.SharedBase; | 42 | using OpenSim.Region.PhysicsModules.SharedBase; |
43 | using OpenSim.Region.Framework.Scenes.Serialization; | 43 | using OpenSim.Region.Framework.Scenes.Serialization; |
44 | using PermissionMask = OpenSim.Framework.PermissionMask; | 44 | using PermissionMask = OpenSim.Framework.PermissionMask; |
45 | using OpenSim.Services.Interfaces; | ||
45 | 46 | ||
46 | namespace OpenSim.Region.Framework.Scenes | 47 | namespace OpenSim.Region.Framework.Scenes |
47 | { | 48 | { |
@@ -534,7 +535,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
534 | /// <returns></returns> | 535 | /// <returns></returns> |
535 | public bool IsAttachmentCheckFull() | 536 | public bool IsAttachmentCheckFull() |
536 | { | 537 | { |
537 | return (IsAttachment || (m_rootPart.Shape.PCode == (byte)PCodeEnum.Primitive && m_rootPart.Shape.State != 0)); | 538 | return (IsAttachment || |
539 | (m_rootPart.Shape.PCode == (byte)PCodeEnum.Primitive && m_rootPart.Shape.State != 0)); | ||
538 | } | 540 | } |
539 | 541 | ||
540 | private struct avtocrossInfo | 542 | private struct avtocrossInfo |
@@ -679,7 +681,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
679 | } | 681 | } |
680 | 682 | ||
681 | string reason = String.Empty; | 683 | string reason = String.Empty; |
682 | string version = String.Empty; | 684 | EntityTransferContext ctx = new EntityTransferContext(); |
683 | 685 | ||
684 | foreach (ScenePresence av in sog.m_sittingAvatars) | 686 | foreach (ScenePresence av in sog.m_sittingAvatars) |
685 | { | 687 | { |
@@ -691,7 +693,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
691 | 693 | ||
692 | // We set the avatar position as being the object | 694 | // We set the avatar position as being the object |
693 | // position to get the region to send to | 695 | // position to get the region to send to |
694 | if(!entityTransfer.checkAgentAccessToRegion(av, destination, newpos, out version, out reason)) | 696 | if(!entityTransfer.checkAgentAccessToRegion(av, destination, newpos, ctx, out reason)) |
695 | { | 697 | { |
696 | return sog; | 698 | return sog; |
697 | } | 699 | } |
@@ -731,7 +733,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
731 | 733 | ||
732 | // CrossAgentToNewRegionDelegate d = entityTransfer.CrossAgentToNewRegionAsync; | 734 | // CrossAgentToNewRegionDelegate d = entityTransfer.CrossAgentToNewRegionAsync; |
733 | // d.BeginInvoke(av, val, destination, av.Flying, version, CrossAgentToNewRegionCompleted, d); | 735 | // d.BeginInvoke(av, val, destination, av.Flying, version, CrossAgentToNewRegionCompleted, d); |
734 | entityTransfer.CrossAgentToNewRegionAsync(av, newpos, destination, av.Flying, version); | 736 | entityTransfer.CrossAgentToNewRegionAsync(av, newpos, destination, av.Flying, ctx); |
735 | if (av.IsChildAgent) | 737 | if (av.IsChildAgent) |
736 | { | 738 | { |
737 | // avatar crossed do some extra cleanup | 739 | // avatar crossed do some extra cleanup |