diff options
author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-22 21:28:07 +0100 |
---|---|---|
committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-22 21:28:07 +0100 |
commit | 689beff6698fcb8582c44f58bb9896606850b149 (patch) | |
tree | 7f567399e152057c1fe80a863ef660b5850bb324 /indra/newview/llagent.cpp | |
parent | 313dbc7fea54cc58ceb8bd3437b91674360a3384 (diff) | |
parent | 3888de9439c20eb1698e16fb878a47d78cfdf85e (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 cdf0aa5993..80e5647ace 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3942,8 +3942,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; |