diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-18 19:25:54 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-18 19:25:54 +0100 |
| commit | c0413250b7e6820b03288bf3bcb035b892870532 (patch) | |
| tree | 2caad0268e3182e198e7c1fc1564c897ba8c130c /indra/newview/llagent.cpp | |
| parent | 56541379559c61406a4ab322b83be582ecae7806 (diff) | |
| parent | 64b3473f4920b0340e731e44342e2599ad46d698 (diff) | |
Merge 5.1.5
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index f67bb22f5b..2243cbdf5a 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3943,8 +3943,7 @@ void LLAgent::teleportRequest( bool look_at_from_camera) { LLViewerRegion* regionp = getRegion(); - bool is_local = (region_handle == regionp->getHandle()); - if(regionp && teleportCore(is_local)) + if (regionp && teleportCore(region_handle == regionp->getHandle())) { LL_INFOS("") << "TeleportLocationRequest: '" << region_handle << "':" << pos_local << LL_ENDL; |