aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/GridUser
diff options
context:
space:
mode:
authorunknown2010-05-20 12:28:13 -0700
committerunknown2010-05-20 12:28:13 -0700
commitbeed74096cbe7df35b2a8036a89af398f908544d (patch)
tree78cec5ca1f73b35f0b5c30a88d8cd97538bb27e8 /OpenSim/Server/Handlers/GridUser
parentRevert one of the previous patches' hunks. The new code looked better, but (diff)
parent* Don't send texture data for prims in ImprovedTerseObjectUpdate packets unle... (diff)
downloadopensim-SC_OLD-beed74096cbe7df35b2a8036a89af398f908544d.zip
opensim-SC_OLD-beed74096cbe7df35b2a8036a89af398f908544d.tar.gz
opensim-SC_OLD-beed74096cbe7df35b2a8036a89af398f908544d.tar.bz2
opensim-SC_OLD-beed74096cbe7df35b2a8036a89af398f908544d.tar.xz
Merging slimupdates2
Diffstat (limited to 'OpenSim/Server/Handlers/GridUser')
-rw-r--r--OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
index f8fa429..b1e7eac 100644
--- a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
@@ -156,6 +156,7 @@ namespace OpenSim.Server.Handlers.GridUser
156 byte[] SetPosition(Dictionary<string, object> request) 156 byte[] SetPosition(Dictionary<string, object> request)
157 { 157 {
158 string user = string.Empty; 158 string user = string.Empty;
159 UUID sessionID = UUID.Zero;
159 UUID region = UUID.Zero; 160 UUID region = UUID.Zero;
160 Vector3 position = new Vector3(128, 128, 70); 161 Vector3 position = new Vector3(128, 128, 70);
161 Vector3 look = Vector3.Zero; 162 Vector3 look = Vector3.Zero;
@@ -166,7 +167,7 @@ namespace OpenSim.Server.Handlers.GridUser
166 if (!UnpackArgs(request, out user, out region, out position, out look)) 167 if (!UnpackArgs(request, out user, out region, out position, out look))
167 return FailureResult(); 168 return FailureResult();
168 169
169 if (m_GridUserService.SetLastPosition(user, region, position, look)) 170 if (m_GridUserService.SetLastPosition(user, sessionID, region, position, look))
170 return SuccessResult(); 171 return SuccessResult();
171 172
172 return FailureResult(); 173 return FailureResult();