diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 18:13:53 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 18:13:53 -0700 |
| commit | b4275c5d48c8cdf4bbe206822878fcf615897ac9 (patch) | |
| tree | 4ef9b931f0a9c8f2b3073c5c33e06672fa56d345 /indra/newview/llagent.cpp | |
| parent | 3e10fa4d51a23bf6f1ced23e8d90c636d84fa5db (diff) | |
| parent | cb1b361b49c9ae6a76eaeeb4476a341a024a71f1 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index a4b33162d6..d27bce99a6 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -5976,7 +5976,7 @@ bool LLAgent::teleportCore(bool is_local) LLFloaterReg::hideInstance("about_land"); LLViewerParcelMgr::getInstance()->deselectLand(); - LLViewerMediaFocus::getInstance()->setFocusFace(false, NULL, 0, NULL); + LLViewerMediaFocus::getInstance()->clearFocus(); // Close all pie menus, deselect land, etc. // Don't change the camera until we know teleport succeeded. JC |