OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'avination' into ubitwork

avinationmerge
UbitUmarov 2012-12-18 02:15:35 +00:00
parent ed9cb18cf0 51354bad48
commit 72c7f4b2eb
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
View File

@ -377,7 +377,7 @@ namespace OpenSim.Region.ClientStack.Linden
protocol = "https"; protocol = "https";
} }
caps.RegisterHandler("GetMesh", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); caps.RegisterHandler("GetMesh", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
m_pollservices.Add(agentID, args); m_pollservices[agentID] = args;
m_capsDict[agentID] = capUrl; m_capsDict[agentID] = capUrl;

2
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
View File

@ -333,7 +333,7 @@ namespace OpenSim.Region.ClientStack.Linden
protocol = "https"; protocol = "https";
} }
caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
m_pollservices.Add(agentID, args); m_pollservices[agentID] = args;
m_capsDict[agentID] = capUrl; m_capsDict[agentID] = capUrl;
} }

10
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -3439,17 +3439,19 @@ namespace OpenSim.Region.Framework.Scenes
public void AdjustChildPrimPermissions() public void AdjustChildPrimPermissions()
{ {
uint newOwnerMask = (uint)PermissionMask.All & 0xfffffff8; // Mask folded bits //uint newOwnerMask = (uint)PermissionMask.All & 0xfffffff8; // Mask folded bits
uint foldedPerms = RootPart.OwnerMask & 3; //uint foldedPerms = RootPart.OwnerMask & 3;
ForEachPart(part => ForEachPart(part =>
{ {
newOwnerMask &= part.BaseMask; //newOwnerMask &= part.BaseMask;
if (part != RootPart) if (part != RootPart)
part.ClonePermissions(RootPart); part.ClonePermissions(RootPart);
}); });
RootPart.OwnerMask = newOwnerMask | foldedPerms; uint lockMask = ~(uint)PermissionMask.Move;
uint lockBit = RootPart.OwnerMask & (uint)PermissionMask.Move;
RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask);
RootPart.ScheduleFullUpdate(); RootPart.ScheduleFullUpdate();
} }