diff options
| author | Melanie | 2009-11-18 06:19:39 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-18 06:19:39 +0000 |
| commit | 0cd3bf074a9cc50d47e6e1873a9a5346453110ce (patch) | |
| tree | d33b8efd2a882df0ef07231ac0703019449d82f4 /OpenSim/Data | |
| parent | Correct formatting of Primitive.Textures in PrimitiveBaseShape.ToOmvPrimitive... (diff) | |
| download | opensim-SC_OLD-0cd3bf074a9cc50d47e6e1873a9a5346453110ce.zip opensim-SC_OLD-0cd3bf074a9cc50d47e6e1873a9a5346453110ce.tar.gz opensim-SC_OLD-0cd3bf074a9cc50d47e6e1873a9a5346453110ce.tar.bz2 opensim-SC_OLD-0cd3bf074a9cc50d47e6e1873a9a5346453110ce.tar.xz | |
Change PresenceData to PresenceInfo to remove a naming conflict in the
OpenSim.Data namespace
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/IPresenceData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/IPresenceData.cs b/OpenSim/Data/IPresenceData.cs index ca661a2..891b590 100644 --- a/OpenSim/Data/IPresenceData.cs +++ b/OpenSim/Data/IPresenceData.cs | |||
| @@ -34,8 +34,8 @@ namespace OpenSim.Data | |||
| 34 | { | 34 | { |
| 35 | public class PresenceData | 35 | public class PresenceData |
| 36 | { | 36 | { |
| 37 | public UUID PrincipalID; | 37 | public UUID UUID; |
| 38 | public UUID RegionID; | 38 | public UUID currentRegion; |
| 39 | public Dictionary<string, object> Data; | 39 | public Dictionary<string, object> Data; |
| 40 | } | 40 | } |
| 41 | 41 | ||