diff options
| author | Jacek Antonelli | 2009-09-09 12:27:11 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-10 02:26:28 -0500 |
| commit | e944c5086e47e92e7952e5a43c68f01108899656 (patch) | |
| tree | c47ff63c4dcae473cd07a0dbcbc9d52636e6061e /linden/indra/newview/llviewerobject.h | |
| parent | Commented out Linux tarball building. (diff) | |
| parent | looks like working now (diff) | |
| download | meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.zip meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.tar.gz meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.tar.bz2 meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.tar.xz | |
Merged 'armin/grid-manager5' into login-manager
Conflicts:
linden/indra/newview/CMakeLists.txt
linden/indra/newview/llpanellogin.cpp
Diffstat (limited to 'linden/indra/newview/llviewerobject.h')
| -rw-r--r-- | linden/indra/newview/llviewerobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h index 340f279..dc529cd 100644 --- a/linden/indra/newview/llviewerobject.h +++ b/linden/indra/newview/llviewerobject.h | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include "v3dmath.h" | 49 | #include "v3dmath.h" |
| 50 | #include "v3math.h" | 50 | #include "v3math.h" |
| 51 | #include "llvertexbuffer.h" | 51 | #include "llvertexbuffer.h" |
| 52 | #include "llpartdata.h" | ||
| 52 | 53 | ||
| 53 | class LLAgent; // TODO: Get rid of this. | 54 | class LLAgent; // TODO: Get rid of this. |
| 54 | class LLAudioSource; | 55 | class LLAudioSource; |