Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
commit
021485b581
|
@ -377,7 +377,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
protocol = "https";
|
||||
}
|
||||
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;
|
||||
|
||||
|
||||
|
|
|
@ -333,7 +333,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
protocol = "https";
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
|
@ -3449,7 +3449,9 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
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();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue