diff options
| author | Jonathan Yap <none@none> | 2011-11-23 08:42:42 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-11-23 08:42:42 -0500 |
| commit | a4cb08ae5d20416e21bbc70540527097495af887 (patch) | |
| tree | 32c9fc22d2598d1eb94dcd0f2b9cd381bd1b42d4 /indra | |
| parent | 2b43a6b8c9b22d02373ac70193fa85f2bfb77b19 (diff) | |
STORM-591 Trivial code cleanup
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvieweraudio.h | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvieweraudio.h b/indra/newview/llvieweraudio.h index 1663f77f4a..26062a2818 100644 --- a/indra/newview/llvieweraudio.h +++ b/indra/newview/llvieweraudio.h @@ -28,7 +28,6 @@ #define LL_VIEWERAUDIO_H #include "llframetimer.h" -#include "llthread.h" #include "llsingleton.h" // comment out to turn off wind diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index ada89cc7aa..c18665a3c3 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1727,7 +1727,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use else { // Check for video - LLViewerParcelMedia::update( parcel ); + LLViewerParcelMedia::update(parcel); // Then check for music. Do this last, as there may be a delay waiting for // the stream fading thread to finish. |