diff options
| author | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
| commit | 5ff1687542240fe9b00d4c217b764770fc369c06 (patch) | |
| tree | bc5a1dbc882c19120ca00efb9914d70059cd79cb /linden/indra/newview/llviewerobjectlist.h | |
| parent | Merge remote branch 'mccabe/1.2.0-next' into next (diff) | |
| parent | Removed grid stuff from World Map (for now). (diff) | |
| download | meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.zip meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.gz meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.bz2 meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.xz | |
Merge branch 'gridmanager' into next
Diffstat (limited to 'linden/indra/newview/llviewerobjectlist.h')
| -rw-r--r-- | linden/indra/newview/llviewerobjectlist.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewerobjectlist.h b/linden/indra/newview/llviewerobjectlist.h index 0d0fd85..8ed4a34 100644 --- a/linden/indra/newview/llviewerobjectlist.h +++ b/linden/indra/newview/llviewerobjectlist.h | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | // project includes | 43 | // project includes |
| 44 | #include "llviewerobject.h" | 44 | #include "llviewerobject.h" |
| 45 | 45 | ||
| 46 | class LLCamera; | ||
| 46 | class LLNetMap; | 47 | class LLNetMap; |
| 47 | class LLDebugBeacon; | 48 | class LLDebugBeacon; |
| 48 | 49 | ||