diff options
| author | Diva Canto | 2014-05-22 10:16:19 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-05-22 10:16:19 -0700 |
| commit | b7c7293c7aa7bb37085eaf6740e10a268aecf608 (patch) | |
| tree | 55022934c63bea8fd9fbd31be2df016cf5593d9a /OpenSim/Framework/AgentCircuitData.cs | |
| parent | Fixed a problem with detaching attachments in situations where the user's ass... (diff) | |
| parent | Fix mantis 6973. Prevent BOM being prefixed to message XML which was causing ... (diff) | |
| download | opensim-SC-b7c7293c7aa7bb37085eaf6740e10a268aecf608.zip opensim-SC-b7c7293c7aa7bb37085eaf6740e10a268aecf608.tar.gz opensim-SC-b7c7293c7aa7bb37085eaf6740e10a268aecf608.tar.bz2 opensim-SC-b7c7293c7aa7bb37085eaf6740e10a268aecf608.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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); |