ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

more uuid ==

Browse Source
This commit is contained in:
UbitUmarov
2022-03-18 23:09:53 +00:00
parent 7bf6e2e543
commit 21c02fca19
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@@ -458,7 +458,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public void EventManagerOnAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, UUID regionID)
{
if (m_scene.RegionInfo.RegionID == regionID)
if (m_scene.RegionInfo.RegionID.Equals(regionID))
{
ILandObject parcelAvatarIsEntering;
lock (m_landList)
@@ -467,7 +467,7 @@ namespace OpenSim.Region.CoreModules.World.Land
}
if (parcelAvatarIsEntering != null &&
avatar.currentParcelUUID != parcelAvatarIsEntering.LandData.GlobalID)
avatar.currentParcelUUID.NotEqual(parcelAvatarIsEntering.LandData.GlobalID))
{
SendLandUpdate(avatar, parcelAvatarIsEntering);
avatar.currentParcelUUID = parcelAvatarIsEntering.LandData.GlobalID;
@@ -581,7 +581,7 @@ namespace OpenSim.Region.CoreModules.World.Land
if(ldata == null)
return;
if(ldata.OwnerID == targetID)
if(ldata.OwnerID.Equals(targetID))
return;
if(ldata.PassHours == 0)
@@ -605,7 +605,7 @@ namespace OpenSim.Region.CoreModules.World.Land
int idx = land.LandData.ParcelAccessList.FindIndex(
delegate(LandAccessEntry e)
{
if (e.AgentID == targetID && e.Flags == AccessList.Access)
if (e.Flags == AccessList.Access && e.AgentID.Equals(targetID))
return true;
return false;
});
@@ -1413,7 +1413,7 @@ namespace OpenSim.Region.CoreModules.World.Land
continue;
// types
if (currentParcel.LandData.OwnerID == remote_client.AgentId)
if (currentParcel.LandData.OwnerID.Equals(remote_client.AgentId))
{
//Owner Flag
curByte = LandChannel.LAND_TYPE_OWNED_BY_REQUESTER;
@@ -1612,7 +1612,7 @@ namespace OpenSim.Region.CoreModules.World.Land
else if (land == aland)
aland.SendLandProperties(0, true, LandChannel.LAND_RESULT_SINGLE, client);
}
if (avatar.currentParcelUUID == parcelID)
if (avatar.currentParcelUUID.Equals(parcelID))
avatar.currentParcelUUID = parcelID; // force parcel flags review
});
}
@@ -2179,7 +2179,7 @@ namespace OpenSim.Region.CoreModules.World.Land
else if (args.TryGetValue("region_id", out tmp) && tmp is OSDUUID)
{
UUID regionID = tmp.AsUUID();
if (regionID == m_scene.RegionInfo.RegionID)
if (regionID.Equals(m_scene.RegionInfo.RegionID))
{
ILandObject l = GetLandObjectClippedXY(x, y);
if (l != null)
@@ -2423,7 +2423,7 @@ namespace OpenSim.Region.CoreModules.World.Land
{
((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
{
if (e.OwnerID == targetID)
if (e.OwnerID.Equals(targetID))
{
returns.Add(e);
}
@@ -2434,7 +2434,7 @@ namespace OpenSim.Region.CoreModules.World.Land
{
((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
{
if (e.OwnerID == targetID)
if (e.OwnerID.Equals(targetID))
{
if (e.ContainsScripts())
{
@@ -2447,7 +2447,7 @@ namespace OpenSim.Region.CoreModules.World.Land
{
((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
{
if (e.OwnerID == targetID)
if (e.OwnerID.Equals(targetID))
{
ILandObject landobject = ((Scene)client.Scene).LandChannel.GetLandObject(e.AbsolutePosition.X, e.AbsolutePosition.Y);
if (landobject.LandData.OwnerID != e.OwnerID)
@@ -2594,7 +2594,7 @@ namespace OpenSim.Region.CoreModules.World.Land
m_scene.Permissions.IsAdministrator(remoteClient.AgentId) ||
m_scene.Permissions.IsGod(remoteClient.AgentId) ||
// (b) land owners can set home
remoteClient.AgentId == land.LandData.OwnerID ||
remoteClient.AgentId.Equals(land.LandData.OwnerID) ||
// (c) members of the land-associated group in roles that can set home
((gpowers & (ulong)GroupPowers.AllowSetHome) == (ulong)GroupPowers.AllowSetHome) ||
// (d) parcels with telehubs can be the home of anyone

22
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -3680,7 +3680,7 @@ namespace OpenSim.Region.Framework.Scenes
RemoveFromPhysicalScene();
if (part.SitTargetAvatar == UUID)
if (part.SitTargetAvatar.Equals(UUID))
{
Vector3 sitTargetPos = part.SitTargetPosition;
Quaternion sitTargetOrient = part.SitTargetOrientation;
@@ -4276,7 +4276,7 @@ namespace OpenSim.Region.Framework.Scenes
m_scene.ForEachRootScenePresence(delegate(ScenePresence p)
{
// only send information about other root agents
if (p.UUID == UUID)
if (p.UUID.Equals(UUID))
return;
// get the avatar, then a kill if can't see it
@@ -4408,7 +4408,7 @@ namespace OpenSim.Region.Framework.Scenes
return;
// only send information to other root agents
if (scenePresence.UUID == UUID)
if (scenePresence.m_localId == m_localId)
return;
SendAppearanceToAgent(scenePresence);
@@ -5975,7 +5975,7 @@ namespace OpenSim.Region.Framework.Scenes
// still skeleton code
if((permissions & (16 | 0x8000 )) == 0) //PERMISSION_TRIGGER_ANIMATION | PERMISSION_OVERRIDE_ANIMATIONS
return;
if(objectID == m_scene.RegionInfo.RegionID) // for all objects
if(objectID.Equals(m_scene.RegionInfo.RegionID)) // for all objects
{
List<SceneObjectGroup> sogs = m_scene.GetSceneObjectGroups();
for(int i = 0; i < sogs.Count; ++i)
@@ -6006,7 +6006,7 @@ namespace OpenSim.Region.Framework.Scenes
foreach (ScriptControllers c in scriptedcontrols.Values)
{
if (c.objectID == obj)
if (c.objectID.Equals(obj))
takers.Add(c.itemID);
}
foreach (UUID t in takers)
@@ -6240,7 +6240,7 @@ namespace OpenSim.Region.Framework.Scenes
ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
if (land.LandData.LandingType != (byte)LandingType.LandingPoint
|| land.LandData.OwnerID == m_uuid)
|| land.LandData.OwnerID.Equals(m_uuid))
return true;
Vector3 landLocation = land.LandData.UserLocation;
@@ -6875,7 +6875,7 @@ namespace OpenSim.Region.Framework.Scenes
continue;
// only those on previous parcel need receive kills
if (previusParcelID == p.currentParcelUUID)
if (previusParcelID.Equals(p.currentParcelUUID))
{
if(!p.IsViewerUIGod)
killsToSendto.Add(p); // they dont see me
@@ -6883,7 +6883,7 @@ namespace OpenSim.Region.Framework.Scenes
killsToSendme.Add(p); // i dont see them
}
// only those on new parcel need see
if (currentParcelID == p.currentParcelUUID)
if (currentParcelID.Equals(p.currentParcelUUID))
{
viewsToSendto.Add(p); // they see me
viewsToSendme.Add(p); // i see them
@@ -6901,7 +6901,7 @@ namespace OpenSim.Region.Framework.Scenes
continue;
// those not on new parcel dont see me
if (currentParcelID != p.currentParcelUUID && !p.IsViewerUIGod)
if (!p.IsViewerUIGod && currentParcelID.NotEqual(p.currentParcelUUID))
{
killsToSendto.Add(p); // they dont see me
}
@@ -6926,7 +6926,7 @@ namespace OpenSim.Region.Framework.Scenes
if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
continue;
// only those old parcel need kills
if (previusParcelID == p.currentParcelUUID && !IsViewerUIGod)
if (!IsViewerUIGod && previusParcelID.Equals(p.currentParcelUUID))
{
killsToSendme.Add(p); // i dont see them
}
@@ -6997,7 +6997,7 @@ namespace OpenSim.Region.Framework.Scenes
if (p.IsDeleted || p == this || p.IsChildAgent || p.ControllingClient == null || !p.ControllingClient.IsActive)
continue;
if (p.currentParcelUUID == m_currentParcelUUID)
if (p.currentParcelUUID.Equals(m_currentParcelUUID))
{
p.SendKillTo(this);
}