diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Framework/LandData.cs')
| -rw-r--r-- | OpenSim/Framework/LandData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 58a80ef..f6271ef 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
| @@ -34,7 +34,7 @@ using OpenMetaverse; | |||
| 34 | 34 | ||
| 35 | namespace OpenSim.Framework | 35 | namespace OpenSim.Framework |
| 36 | { | 36 | { |
| 37 | public struct LandAccessEntry | 37 | public class LandAccessEntry |
| 38 | { | 38 | { |
| 39 | public UUID AgentID; | 39 | public UUID AgentID; |
| 40 | public int Expires; | 40 | public int Expires; |