diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Region/Framework/Interfaces/IPresenceModule.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IPresenceModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs index 630c6a3..d44c1e1 100644 --- a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs | |||
| @@ -31,13 +31,13 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 31 | { | 31 | { |
| 32 | public struct PresenceInfo | 32 | public struct PresenceInfo |
| 33 | { | 33 | { |
| 34 | public UUID userID; | 34 | public string UserID; |
| 35 | public UUID regionID; | 35 | public UUID RegionID; |
| 36 | 36 | ||
| 37 | public PresenceInfo(UUID userID, UUID regionID) | 37 | public PresenceInfo(string userID, UUID regionID) |
| 38 | { | 38 | { |
| 39 | this.userID = userID; | 39 | UserID = userID; |
| 40 | this.regionID = regionID; | 40 | RegionID = regionID; |
| 41 | } | 41 | } |
| 42 | } | 42 | } |
| 43 | 43 | ||