diff options
| author | McCabe Maxsted | 2010-05-05 02:15:10 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-05-05 16:30:50 -0500 |
| commit | 76e5f3f048c7ab8cbfbbabfb560f45428d4bf046 (patch) | |
| tree | d47a58694ec7cc02059fd574828a0b7a699cad06 /linden | |
| parent | Fixed TPV policy texture export notification (diff) | |
| download | meta-impy-76e5f3f048c7ab8cbfbbabfb560f45428d4bf046.zip meta-impy-76e5f3f048c7ab8cbfbbabfb560f45428d4bf046.tar.gz meta-impy-76e5f3f048c7ab8cbfbbabfb560f45428d4bf046.tar.bz2 meta-impy-76e5f3f048c7ab8cbfbbabfb560f45428d4bf046.tar.xz | |
Fixed crash on quit in LLAgent dtor
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llagent.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp index c44fe3a..532b777 100644 --- a/linden/indra/newview/llagent.cpp +++ b/linden/indra/newview/llagent.cpp | |||
| @@ -471,9 +471,11 @@ void LLAgent::cleanup() | |||
| 471 | 471 | ||
| 472 | setSitCamera(LLUUID::null); | 472 | setSitCamera(LLUUID::null); |
| 473 | 473 | ||
| 474 | mAvatarObject->markDead(); | 474 | if (mAvatarObject) |
| 475 | 475 | { | |
| 476 | mAvatarObject = NULL; | 476 | mAvatarObject->markDead(); |
| 477 | mAvatarObject = NULL; | ||
| 478 | } | ||
| 477 | if(mLookAt) | 479 | if(mLookAt) |
| 478 | { | 480 | { |
| 479 | mLookAt->markDead() ; | 481 | mLookAt->markDead() ; |