aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/PresenceService/PresenceService.cs
diff options
context:
space:
mode:
authorMelanie2010-05-09 17:04:23 +0100
committerMelanie2010-05-09 17:04:23 +0100
commit4e0d62547d2760ce48cf64373917dcfb893da543 (patch)
tree9f84ddc57b58ed107cd6d610aaeb62039d483a71 /OpenSim/Services/PresenceService/PresenceService.cs
parentMerge branch 'careminster' into careminster-presence-refactor (diff)
parentAdd a field asset_flags and a corresponding enum to the asset database. This (diff)
downloadopensim-SC-4e0d62547d2760ce48cf64373917dcfb893da543.zip
opensim-SC-4e0d62547d2760ce48cf64373917dcfb893da543.tar.gz
opensim-SC-4e0d62547d2760ce48cf64373917dcfb893da543.tar.bz2
opensim-SC-4e0d62547d2760ce48cf64373917dcfb893da543.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/PresenceService/PresenceService.cs')
-rw-r--r--OpenSim/Services/PresenceService/PresenceService.cs6
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 }