diff options
author | Justin Clarke Casey | 2008-09-12 20:12:03 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-09-12 20:12:03 +0000 |
commit | 52a4c4d82f9c5b808e6c61fd51c1c70e42865565 (patch) | |
tree | f63a4ea443597b2d79ad6c2b7acff058c4437425 /OpenSim/Framework/UserAgentData.cs | |
parent | remove hidden faces inside prim meshes to improve memory use and startup time (diff) | |
download | opensim-SC-52a4c4d82f9c5b808e6c61fd51c1c70e42865565.zip opensim-SC-52a4c4d82f9c5b808e6c61fd51c1c70e42865565.tar.gz opensim-SC-52a4c4d82f9c5b808e6c61fd51c1c70e42865565.tar.bz2 opensim-SC-52a4c4d82f9c5b808e6c61fd51c1c70e42865565.tar.xz |
* Check in first part of http://opensimulator.org/mantis/view.php?id=2073
* This patch aims to introduce look at direction persistence between logins. It won't be active until the second part of the patch is committed in about two weeks time. At
this point, region servers that haven't upgraded past this revision may run into problems
* This checkin upgrades the user database. As always, we recommend you have backups in case something goes wrong.
* Many thanks to tyre for this patch.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/UserAgentData.cs | 98 |
1 files changed, 56 insertions, 42 deletions
diff --git a/OpenSim/Framework/UserAgentData.cs b/OpenSim/Framework/UserAgentData.cs index 03a65c5..506a5e0 100644 --- a/OpenSim/Framework/UserAgentData.cs +++ b/OpenSim/Framework/UserAgentData.cs | |||
@@ -36,34 +36,35 @@ namespace OpenSim.Framework | |||
36 | public class UserAgentData | 36 | public class UserAgentData |
37 | { | 37 | { |
38 | /// <summary> | 38 | /// <summary> |
39 | /// The IP address of the user | 39 | /// The UUID of the users avatar (not the agent!) |
40 | /// </summary> | 40 | /// </summary> |
41 | private string agentIP = String.Empty; | 41 | private UUID UUID; |
42 | 42 | ||
43 | /// <summary> | 43 | /// <summary> |
44 | /// Is the user online? | 44 | /// The session ID for the user (also the agent ID) |
45 | /// </summary> | 45 | /// </summary> |
46 | private bool agentOnline; | 46 | private UUID sessionID; |
47 | 47 | ||
48 | /// <summary> | 48 | /// <summary> |
49 | /// The port of the user | 49 | /// The "secure" session ID for the user |
50 | /// </summary> | 50 | /// </summary> |
51 | private uint agentPort; | 51 | /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks> |
52 | private UUID secureSessionID; | ||
52 | 53 | ||
53 | /// <summary> | 54 | /// <summary> |
54 | /// Region handle of the current region the user is in | 55 | /// The IP address of the user |
55 | /// </summary> | 56 | /// </summary> |
56 | private ulong currentHandle; | 57 | private string agentIP = String.Empty; |
57 | 58 | ||
58 | /// <summary> | 59 | /// <summary> |
59 | /// The position of the user within the region | 60 | /// The port of the user |
60 | /// </summary> | 61 | /// </summary> |
61 | private Vector3 currentPos; | 62 | private uint agentPort; |
62 | 63 | ||
63 | /// <summary> | 64 | /// <summary> |
64 | /// Current region the user is logged into | 65 | /// Is the user online? |
65 | /// </summary> | 66 | /// </summary> |
66 | private UUID currentRegion; | 67 | private bool agentOnline; |
67 | 68 | ||
68 | /// <summary> | 69 | /// <summary> |
69 | /// A unix timestamp from when the user logged in | 70 | /// A unix timestamp from when the user logged in |
@@ -76,25 +77,29 @@ namespace OpenSim.Framework | |||
76 | private int logoutTime; | 77 | private int logoutTime; |
77 | 78 | ||
78 | /// <summary> | 79 | /// <summary> |
79 | /// The region the user logged into initially | 80 | /// Region ID the user is logged into |
80 | /// </summary> | 81 | /// </summary> |
81 | private UUID regionID; | 82 | private UUID regionID; |
82 | 83 | ||
83 | /// <summary> | 84 | /// <summary> |
84 | /// The "secure" session ID for the user | 85 | /// Region handle of the current region the user is in |
85 | /// </summary> | 86 | /// </summary> |
86 | /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks> | 87 | private ulong regionHandle; |
87 | private UUID secureSessionID; | ||
88 | 88 | ||
89 | /// <summary> | 89 | /// <summary> |
90 | /// The session ID for the user (also the agent ID) | 90 | /// The position of the user within the region |
91 | /// </summary> | 91 | /// </summary> |
92 | private UUID sessionID; | 92 | private Vector3 currentPos; |
93 | 93 | ||
94 | /// <summary> | 94 | /// <summary> |
95 | /// The UUID of the users avatar (not the agent!) | 95 | /// Current direction the user is looking at |
96 | /// </summary> | 96 | /// </summary> |
97 | private UUID UUID; | 97 | private Vector3 currentLookAt = Vector3.Zero; |
98 | |||
99 | /// <summary> | ||
100 | /// The region the user logged into initially | ||
101 | /// </summary> | ||
102 | private UUID originRegionID; | ||
98 | 103 | ||
99 | public virtual UUID ProfileID | 104 | public virtual UUID ProfileID |
100 | { | 105 | { |
@@ -102,6 +107,18 @@ namespace OpenSim.Framework | |||
102 | set { UUID = value; } | 107 | set { UUID = value; } |
103 | } | 108 | } |
104 | 109 | ||
110 | public virtual UUID SessionID | ||
111 | { | ||
112 | get { return sessionID; } | ||
113 | set { sessionID = value; } | ||
114 | } | ||
115 | |||
116 | public virtual UUID SecureSessionID | ||
117 | { | ||
118 | get { return secureSessionID; } | ||
119 | set { secureSessionID = value; } | ||
120 | } | ||
121 | |||
105 | public virtual string AgentIP | 122 | public virtual string AgentIP |
106 | { | 123 | { |
107 | get { return agentIP; } | 124 | get { return agentIP; } |
@@ -120,24 +137,6 @@ namespace OpenSim.Framework | |||
120 | set { agentOnline = value; } | 137 | set { agentOnline = value; } |
121 | } | 138 | } |
122 | 139 | ||
123 | public virtual UUID SessionID | ||
124 | { | ||
125 | get { return sessionID; } | ||
126 | set { sessionID = value; } | ||
127 | } | ||
128 | |||
129 | public virtual UUID SecureSessionID | ||
130 | { | ||
131 | get { return secureSessionID; } | ||
132 | set { secureSessionID = value; } | ||
133 | } | ||
134 | |||
135 | public virtual UUID InitialRegion | ||
136 | { | ||
137 | get { return regionID; } | ||
138 | set { regionID = value; } | ||
139 | } | ||
140 | |||
141 | public virtual int LoginTime | 140 | public virtual int LoginTime |
142 | { | 141 | { |
143 | get { return loginTime; } | 142 | get { return loginTime; } |
@@ -152,14 +151,14 @@ namespace OpenSim.Framework | |||
152 | 151 | ||
153 | public virtual UUID Region | 152 | public virtual UUID Region |
154 | { | 153 | { |
155 | get { return currentRegion; } | 154 | get { return regionID; } |
156 | set { currentRegion = value; } | 155 | set { regionID = value; } |
157 | } | 156 | } |
158 | 157 | ||
159 | public virtual ulong Handle | 158 | public virtual ulong Handle |
160 | { | 159 | { |
161 | get { return currentHandle; } | 160 | get { return regionHandle; } |
162 | set { currentHandle = value; } | 161 | set { regionHandle = value; } |
163 | } | 162 | } |
164 | 163 | ||
165 | public virtual Vector3 Position | 164 | public virtual Vector3 Position |
@@ -168,6 +167,7 @@ namespace OpenSim.Framework | |||
168 | set { currentPos = value; } | 167 | set { currentPos = value; } |
169 | } | 168 | } |
170 | 169 | ||
170 | /* 2008-08-28-tyre: Not really useful | ||
171 | public virtual float PositionX | 171 | public virtual float PositionX |
172 | { | 172 | { |
173 | get { return currentPos.X; } | 173 | get { return currentPos.X; } |
@@ -185,5 +185,19 @@ namespace OpenSim.Framework | |||
185 | get { return currentPos.Z; } | 185 | get { return currentPos.Z; } |
186 | set { currentPos.Z = value; } | 186 | set { currentPos.Z = value; } |
187 | } | 187 | } |
188 | */ | ||
189 | |||
190 | public virtual Vector3 LookAt | ||
191 | { | ||
192 | get { return currentLookAt; } | ||
193 | set { currentLookAt = value; } | ||
194 | } | ||
195 | |||
196 | public virtual UUID InitialRegion | ||
197 | { | ||
198 | get { return originRegionID; } | ||
199 | set { originRegionID = value; } | ||
200 | } | ||
201 | |||
188 | } | 202 | } |
189 | } | 203 | } |