diff options
author | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
commit | f518ca7feb33c0c1641ccb8f3956246b855f9b6c (patch) | |
tree | 8dafdff97f14290b259bb04a03c5e7bb98756c24 /OpenSim/Region/Environment/Modules/World/Land | |
parent | Reverting the texture sending patch and the new libOMV. This makes this (diff) | |
download | opensim-SC-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.zip opensim-SC-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.gz opensim-SC-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.bz2 opensim-SC-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.xz |
Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new
libOMV.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Land')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 27c7014..197d5c2 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | |||
@@ -369,7 +369,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
369 | List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>(); | 369 | List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>(); |
370 | foreach (ParcelManager.ParcelAccessEntry entry in newData.ParcelAccessList) | 370 | foreach (ParcelManager.ParcelAccessEntry entry in newData.ParcelAccessList) |
371 | { | 371 | { |
372 | if (entry.Flags == (AccessList) flags) | 372 | if (entry.Flags == (AccessList)flags) |
373 | { | 373 | { |
374 | toRemove.Add(entry); | 374 | toRemove.Add(entry); |
375 | } | 375 | } |
@@ -384,7 +384,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
384 | ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry(); | 384 | ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry(); |
385 | temp.AgentID = entry.AgentID; | 385 | temp.AgentID = entry.AgentID; |
386 | temp.Time = new DateTime(); //Pointless? Yes. | 386 | temp.Time = new DateTime(); //Pointless? Yes. |
387 | temp.Flags = (AccessList) flags; | 387 | temp.Flags = (AccessList)flags; |
388 | 388 | ||
389 | if (!newData.ParcelAccessList.Contains(temp)) | 389 | if (!newData.ParcelAccessList.Contains(temp)) |
390 | { | 390 | { |