diff options
| author | Justin Clark-Casey | 2014-05-27 23:29:54 +0100 |
|---|---|---|
| committer | Justin Clark-Casey | 2014-05-27 23:29:54 +0100 |
| commit | 3f703ae1cb02cbcb0efaff061d495bacca941de0 (patch) | |
| tree | 3221068b4bc4119023b3dfa621c19e126c2eb3f3 /OpenSim/Framework/AgentCircuitData.cs | |
| parent | Merge branch 'master' into 0.8-post-fixes (diff) | |
| parent | minor: Comment out 2 error level debugging message in authentication code (diff) | |
| download | opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.zip opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.gz opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.bz2 opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.xz | |
Merge branch 'master' into 0.8-post-fixes
Diffstat (limited to 'OpenSim/Framework/AgentCircuitData.cs')
| -rw-r--r-- | OpenSim/Framework/AgentCircuitData.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index f2fe494..0d053e4 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs | |||
| @@ -321,6 +321,8 @@ namespace OpenSim.Framework | |||
| 321 | Mac = args["mac"].AsString(); | 321 | Mac = args["mac"].AsString(); |
| 322 | if (args["id0"] != null) | 322 | if (args["id0"] != null) |
| 323 | Id0 = args["id0"].AsString(); | 323 | Id0 = args["id0"].AsString(); |
| 324 | if (args["teleport_flags"] != null) | ||
| 325 | teleportFlags = args["teleport_flags"].AsUInteger(); | ||
| 324 | 326 | ||
| 325 | if (args["start_pos"] != null) | 327 | if (args["start_pos"] != null) |
| 326 | Vector3.TryParse(args["start_pos"].AsString(), out startpos); | 328 | Vector3.TryParse(args["start_pos"].AsString(), out startpos); |