diff options
author | Jeff Ames | 2008-03-17 17:39:42 +0000 |
---|---|---|
committer | Jeff Ames | 2008-03-17 17:39:42 +0000 |
commit | a8aeec29dad25043252d609932a4d22b69613785 (patch) | |
tree | 2c66a175ad7d6934eea30b844c2763685242f380 /OpenSim/Region/Environment | |
parent | * Reduce the annoyingness of clients that continually request unfound texture... (diff) | |
download | opensim-SC_OLD-a8aeec29dad25043252d609932a4d22b69613785.zip opensim-SC_OLD-a8aeec29dad25043252d609932a4d22b69613785.tar.gz opensim-SC_OLD-a8aeec29dad25043252d609932a4d22b69613785.tar.bz2 opensim-SC_OLD-a8aeec29dad25043252d609932a4d22b69613785.tar.xz |
Fix a few mono compiler warnings. Minor cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/PermissionManager.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs index 171ced1..30f91ad 100644 --- a/OpenSim/Region/Environment/PermissionManager.cs +++ b/OpenSim/Region/Environment/PermissionManager.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Environment | |||
83 | } | 83 | } |
84 | 84 | ||
85 | // If there is no master avatar, return false | 85 | // If there is no master avatar, return false |
86 | if (m_scene.RegionInfo.MasterAvatarAssignedUUID != null) | 86 | if (!m_scene.RegionInfo.MasterAvatarAssignedUUID.Equals(null)) |
87 | { | 87 | { |
88 | return m_scene.RegionInfo.MasterAvatarAssignedUUID == user; | 88 | return m_scene.RegionInfo.MasterAvatarAssignedUUID == user; |
89 | } | 89 | } |
@@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment | |||
97 | { | 97 | { |
98 | return true; | 98 | return true; |
99 | } | 99 | } |
100 | if (user != null) | 100 | if (!user.Equals(null)) |
101 | { | 101 | { |
102 | LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers; | 102 | LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers; |
103 | for (int i = 0; i < estatemanagers.Length; i++) | 103 | for (int i = 0; i < estatemanagers.Length; i++) |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 78b28d5..229ab1c 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -342,7 +342,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
342 | asset.Description = description; | 342 | asset.Description = description; |
343 | asset.InvType = invType; | 343 | asset.InvType = invType; |
344 | asset.Type = assetType; | 344 | asset.Type = assetType; |
345 | asset.FullID = LLUUID.Random(); // TODO: check for conflicts | 345 | asset.FullID = LLUUID.Random(); |
346 | asset.Data = (data == null) ? new byte[1] : data; | 346 | asset.Data = (data == null) ? new byte[1] : data; |
347 | return asset; | 347 | return asset; |
348 | } | 348 | } |
@@ -781,7 +781,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
781 | InventoryItemBase item = new InventoryItemBase(); | 781 | InventoryItemBase item = new InventoryItemBase(); |
782 | item.avatarID = remoteClient.AgentId; | 782 | item.avatarID = remoteClient.AgentId; |
783 | item.creatorsID = remoteClient.AgentId; | 783 | item.creatorsID = remoteClient.AgentId; |
784 | item.inventoryID = LLUUID.Random(); // TODO: check for conflicts | 784 | item.inventoryID = LLUUID.Random(); |
785 | item.assetID = asset.FullID; | 785 | item.assetID = asset.FullID; |
786 | item.inventoryDescription = asset.Description; | 786 | item.inventoryDescription = asset.Description; |
787 | item.inventoryName = asset.Name; | 787 | item.inventoryName = asset.Name; |