diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-02-27 01:03:39 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-02-27 01:03:39 +0000 |
| commit | 647d29b1a2d4712ea738b408be43e56895a715b1 (patch) | |
| tree | 8db33983be6e10c05895f9774bfbad81a3f6ae81 /indra/newview/llagent.cpp | |
| parent | c4b5b3977ffa6669a00f9bc334db02f51cc10fcb (diff) | |
merge -r 58285:58437 maintenance.
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 9d2f4fac32..caeee9f210 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -467,8 +467,12 @@ void LLAgent::resetView(BOOL reset_camera) // By popular request, keep land selection while walking around. JC // gParcelMgr->deselectLand(); - //FIXME: force deselect when walking? - RN - // gSelectMgr->deselectAll(); + // force deselect when walking and attachment is selected + // this is so people don't wig out when their avatar moves without animating + if (gSelectMgr->getSelection()->isAttachment()) + { + gSelectMgr->deselectAll(); + } // Hide all popup menus gMenuHolder->hideMenus(); |