diff options
author | Tom Grimshaw | 2010-05-10 05:44:24 -0700 |
---|---|---|
committer | Tom Grimshaw | 2010-05-10 05:44:24 -0700 |
commit | 2e94c757296973e07529ad6ae927d9d9251627b6 (patch) | |
tree | 5fb348ddf750087898a6fcdfe0a492c305b35d3b /OpenSim/Services/PresenceService | |
parent | Greatly improve login time for users with large friends lists by requesting a... (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-2e94c757296973e07529ad6ae927d9d9251627b6.zip opensim-SC-2e94c757296973e07529ad6ae927d9d9251627b6.tar.gz opensim-SC-2e94c757296973e07529ad6ae927d9d9251627b6.tar.bz2 opensim-SC-2e94c757296973e07529ad6ae927d9d9251627b6.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/PresenceService')
-rw-r--r-- | OpenSim/Services/PresenceService/PresenceService.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs index 7e7e98e..19f636a 100644 --- a/OpenSim/Services/PresenceService/PresenceService.cs +++ b/OpenSim/Services/PresenceService/PresenceService.cs | |||
@@ -115,10 +115,6 @@ namespace OpenSim.Services.PresenceService | |||
115 | 115 | ||
116 | ret.UserID = data.UserID; | 116 | ret.UserID = data.UserID; |
117 | ret.RegionID = data.RegionID; | 117 | ret.RegionID = data.RegionID; |
118 | if (data.Data.ContainsKey("Position")) | ||
119 | ret.Position = Vector3.Parse(data.Data["Position"]); | ||
120 | if (data.Data.ContainsKey("LookAt")) | ||
121 | ret.LookAt = Vector3.Parse(data.Data["LookAt"]); | ||
122 | 118 | ||
123 | return ret; | 119 | return ret; |
124 | } | 120 | } |
@@ -138,8 +134,6 @@ namespace OpenSim.Services.PresenceService | |||
138 | 134 | ||
139 | ret.UserID = d.UserID; | 135 | ret.UserID = d.UserID; |
140 | ret.RegionID = d.RegionID; | 136 | ret.RegionID = d.RegionID; |
141 | ret.Position = Vector3.Parse(d.Data["Position"]); | ||
142 | ret.LookAt = Vector3.Parse(d.Data["LookAt"]); | ||
143 | 137 | ||
144 | info.Add(ret); | 138 | info.Add(ret); |
145 | } | 139 | } |