diff options
author | Diva Canto | 2010-05-07 21:29:56 -0700 |
---|---|---|
committer | Diva Canto | 2010-05-07 21:29:56 -0700 |
commit | a58859a0d4206c194c9c56212218e2cafc2cc373 (patch) | |
tree | fed51a4e40c344b76f6b8b4d5c5b2ec0d2e142e4 /OpenSim/Services/Interfaces/IPresenceService.cs | |
parent | improve handling of undersize sculpt textures (diff) | |
download | opensim-SC-a58859a0d4206c194c9c56212218e2cafc2cc373.zip opensim-SC-a58859a0d4206c194c9c56212218e2cafc2cc373.tar.gz opensim-SC-a58859a0d4206c194c9c56212218e2cafc2cc373.tar.bz2 opensim-SC-a58859a0d4206c194c9c56212218e2cafc2cc373.tar.xz |
GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.
BTW, the Meshing files want to be committed too -- EOFs.
Diffstat (limited to 'OpenSim/Services/Interfaces/IPresenceService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IPresenceService.cs | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs index b4c1859..9687d22 100644 --- a/OpenSim/Services/Interfaces/IPresenceService.cs +++ b/OpenSim/Services/Interfaces/IPresenceService.cs | |||
@@ -55,23 +55,10 @@ namespace OpenSim.Services.Interfaces | |||
55 | UserID = kvp["UserID"].ToString(); | 55 | UserID = kvp["UserID"].ToString(); |
56 | if (kvp.ContainsKey("RegionID")) | 56 | if (kvp.ContainsKey("RegionID")) |
57 | UUID.TryParse(kvp["RegionID"].ToString(), out RegionID); | 57 | UUID.TryParse(kvp["RegionID"].ToString(), out RegionID); |
58 | if (kvp.ContainsKey("login")) | ||
59 | DateTime.TryParse(kvp["login"].ToString(), out Login); | ||
60 | if (kvp.ContainsKey("logout")) | ||
61 | DateTime.TryParse(kvp["logout"].ToString(), out Logout); | ||
62 | if (kvp.ContainsKey("lookAt")) | 58 | if (kvp.ContainsKey("lookAt")) |
63 | Vector3.TryParse(kvp["lookAt"].ToString(), out LookAt); | 59 | Vector3.TryParse(kvp["lookAt"].ToString(), out LookAt); |
64 | if (kvp.ContainsKey("online")) | ||
65 | Boolean.TryParse(kvp["online"].ToString(), out Online); | ||
66 | if (kvp.ContainsKey("position")) | 60 | if (kvp.ContainsKey("position")) |
67 | Vector3.TryParse(kvp["position"].ToString(), out Position); | 61 | Vector3.TryParse(kvp["position"].ToString(), out Position); |
68 | if (kvp.ContainsKey("HomeRegionID")) | ||
69 | UUID.TryParse(kvp["HomeRegionID"].ToString(), out HomeRegionID); | ||
70 | if (kvp.ContainsKey("HomePosition")) | ||
71 | Vector3.TryParse(kvp["HomePosition"].ToString(), out HomePosition); | ||
72 | if (kvp.ContainsKey("HomeLookAt")) | ||
73 | Vector3.TryParse(kvp["HomeLookAt"].ToString(), out HomeLookAt); | ||
74 | |||
75 | } | 62 | } |
76 | 63 | ||
77 | public Dictionary<string, object> ToKeyValuePairs() | 64 | public Dictionary<string, object> ToKeyValuePairs() |
@@ -79,14 +66,8 @@ namespace OpenSim.Services.Interfaces | |||
79 | Dictionary<string, object> result = new Dictionary<string, object>(); | 66 | Dictionary<string, object> result = new Dictionary<string, object>(); |
80 | result["UserID"] = UserID; | 67 | result["UserID"] = UserID; |
81 | result["RegionID"] = RegionID.ToString(); | 68 | result["RegionID"] = RegionID.ToString(); |
82 | result["online"] = Online.ToString(); | ||
83 | result["login"] = Login.ToString(); | ||
84 | result["logout"] = Logout.ToString(); | ||
85 | result["position"] = Position.ToString(); | 69 | result["position"] = Position.ToString(); |
86 | result["lookAt"] = LookAt.ToString(); | 70 | result["lookAt"] = LookAt.ToString(); |
87 | result["HomeRegionID"] = HomeRegionID.ToString(); | ||
88 | result["HomePosition"] = HomePosition.ToString(); | ||
89 | result["HomeLookAt"] = HomeLookAt.ToString(); | ||
90 | 71 | ||
91 | return result; | 72 | return result; |
92 | } | 73 | } |
@@ -115,11 +96,10 @@ namespace OpenSim.Services.Interfaces | |||
115 | public interface IPresenceService | 96 | public interface IPresenceService |
116 | { | 97 | { |
117 | bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID); | 98 | bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID); |
118 | bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookAt); | 99 | bool LogoutAgent(UUID sessionID); |
119 | bool LogoutRegionAgents(UUID regionID); | 100 | bool LogoutRegionAgents(UUID regionID); |
120 | 101 | ||
121 | bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt); | 102 | bool ReportAgent(UUID sessionID, UUID regionID); |
122 | bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt); | ||
123 | 103 | ||
124 | PresenceInfo GetAgent(UUID sessionID); | 104 | PresenceInfo GetAgent(UUID sessionID); |
125 | PresenceInfo[] GetAgents(string[] userIDs); | 105 | PresenceInfo[] GetAgents(string[] userIDs); |