diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-13 11:57:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-13 11:57:14 -0500 |
| commit | be210914f4e9081f021cc1ad3b671765aba79b61 (patch) | |
| tree | 006e4ec827b8c1b3cf6042c08e12aadf48f43943 /indra/newview/llagent.cpp | |
| parent | 7e779a29c142feaa34a30dff39b72d0ae7c0fdc3 (diff) | |
| parent | d8f081cf1b18ddb5f0412b21f4d36bfce6abae19 (diff) | |
merge changes for DRTVWR-238
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 447836910d..11fa50b51a 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4045,6 +4045,12 @@ void LLAgent::teleportViaLocation(const LLVector3d& pos_global) void LLAgent::doTeleportViaLocation(const LLVector3d& pos_global) { LLViewerRegion* regionp = getRegion(); + + if (!regionp) + { + return; + } + U64 handle = to_region_handle(pos_global); LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromHandle(handle); if(regionp && info) |