diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 18:51:19 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 18:51:19 -0400 |
commit | 620817c1c3368d73f1b47b1593a0bcbcf567e297 (patch) | |
tree | e37b76dc8d154ab661ab23e6be2b6b098f97e4b2 /indra/newview/llviewerparcelmgr.h | |
parent | 329608d24668b044e16b54ff7a7d0ac592b2b88d (diff) | |
parent | 8897e7ca24533e0093825346391f5fa9a37f2427 (diff) |
Merge. Refresh from viewer-drano-http-4 after release of 3.7.16.
Diffstat (limited to 'indra/newview/llviewerparcelmgr.h')
-rwxr-xr-x | indra/newview/llviewerparcelmgr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h index 58d398e141..b5b269abdf 100755 --- a/indra/newview/llviewerparcelmgr.h +++ b/indra/newview/llviewerparcelmgr.h @@ -335,6 +335,7 @@ private: std::vector<LLParcelObserver*> mObservers; BOOL mTeleportInProgress; + LLVector3d mTeleportInProgressPosition; teleport_finished_signal_t mTeleportFinishedSignal; teleport_failed_signal_t mTeleportFailedSignal; |