diff options
| author | Melanie | 2009-11-18 06:20:21 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-18 06:20:21 +0000 |
| commit | 5d0778014df68b48abb08c8f63204cf7e077af7f (patch) | |
| tree | 5f6ef28958950412130f68fa3bbe1491a456eef7 /OpenSim/Data | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change PresenceData to PresenceInfo to remove a naming conflict in the (diff) | |
| download | opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.zip opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.gz opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.bz2 opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -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 | ||