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

Fix a few mono compiler warnings. Minor cleanup.

0.6.0-stable
Jeff Ames 2008-03-17 17:39:42 +00:00
parent cd1978b424
commit a8aeec29da
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/PermissionManager.cs
View File

@ -83,7 +83,7 @@ namespace OpenSim.Region.Environment
} }
// If there is no master avatar, return false // If there is no master avatar, return false
if (m_scene.RegionInfo.MasterAvatarAssignedUUID != null) if (!m_scene.RegionInfo.MasterAvatarAssignedUUID.Equals(null))
{ {
return m_scene.RegionInfo.MasterAvatarAssignedUUID == user; return m_scene.RegionInfo.MasterAvatarAssignedUUID == user;
} }
@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment
{ {
return true; return true;
} }
if (user != null) if (!user.Equals(null))
{ {
LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers; LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers;
for (int i = 0; i < estatemanagers.Length; i++) for (int i = 0; i < estatemanagers.Length; i++)

4
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -342,7 +342,7 @@ namespace OpenSim.Region.Environment.Scenes
asset.Description = description; asset.Description = description;
asset.InvType = invType; asset.InvType = invType;
asset.Type = assetType; asset.Type = assetType;
asset.FullID = LLUUID.Random(); // TODO: check for conflicts asset.FullID = LLUUID.Random();
asset.Data = (data == null) ? new byte[1] : data; asset.Data = (data == null) ? new byte[1] : data;
return asset; return asset;
} }
@ -781,7 +781,7 @@ namespace OpenSim.Region.Environment.Scenes
InventoryItemBase item = new InventoryItemBase(); InventoryItemBase item = new InventoryItemBase();
item.avatarID = remoteClient.AgentId; item.avatarID = remoteClient.AgentId;
item.creatorsID = remoteClient.AgentId; item.creatorsID = remoteClient.AgentId;
item.inventoryID = LLUUID.Random(); // TODO: check for conflicts item.inventoryID = LLUUID.Random();
item.assetID = asset.FullID; item.assetID = asset.FullID;
item.inventoryDescription = asset.Description; item.inventoryDescription = asset.Description;
item.inventoryName = asset.Name; item.inventoryName = asset.Name;

2
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
View File

@ -258,7 +258,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin
if (ang_obj > ts.arc) keep = false; if (ang_obj > ts.arc) keep = false;
} }
if (keep && (ts.keyID != null) && (ts.keyID != LLUUID.Zero) && (ts.keyID != ent.UUID)) if (keep && (!ts.keyID.Equals(null)) && (ts.keyID != LLUUID.Zero) && (ts.keyID != ent.UUID))
{ {
keep = false; keep = false;
} }