diff options
| author | Armin Weatherwax | 2010-10-01 21:32:08 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2010-10-01 21:32:08 +0200 |
| commit | 6a8f304b10f5a2fc96a675a8ada694e6bfbda34e (patch) | |
| tree | 07b251d08d332b50079e209e0da14604291a84cc /linden/indra/newview | |
| parent | fix friendlist not cleared on logout (diff) | |
| download | meta-impy-6a8f304b10f5a2fc96a675a8ada694e6bfbda34e.zip meta-impy-6a8f304b10f5a2fc96a675a8ada694e6bfbda34e.tar.gz meta-impy-6a8f304b10f5a2fc96a675a8ada694e6bfbda34e.tar.bz2 meta-impy-6a8f304b10f5a2fc96a675a8ada694e6bfbda34e.tar.xz | |
replacent for f99376788 Fixed #381: using voice causes viewer crash on disconnect/quit
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/llappviewer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index accc523..3f9adde 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
| @@ -1185,8 +1185,11 @@ bool LLAppViewer::cleanup() | |||
| 1185 | 1185 | ||
| 1186 | llinfos << "Viewer disconnected" << llendflush; | 1186 | llinfos << "Viewer disconnected" << llendflush; |
| 1187 | 1187 | ||
| 1188 | //this deletes all your buddies | 1188 | if (!mQuitRequested) //not doing it on quit, because the quitting voiceclient |
| 1189 | LLAvatarTracker::instance().reset(); | 1189 | { //*might* crash imprudence TODO: fix the voiceclient instead |
| 1190 | //this deletes all your buddies | ||
| 1191 | LLAvatarTracker::instance().reset(); | ||
| 1192 | } | ||
| 1190 | 1193 | ||
| 1191 | if (mQuitRequested) | 1194 | if (mQuitRequested) |
| 1192 | { | 1195 | { |