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/llviewermessage.cpp | |
| 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/llviewermessage.cpp')
| -rw-r--r-- | linden/indra/newview/llviewermessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp index d5d9324..d900cd9 100644 --- a/linden/indra/newview/llviewermessage.cpp +++ b/linden/indra/newview/llviewermessage.cpp | |||
| @@ -109,7 +109,7 @@ | |||
| 109 | #include "llui.h" // for make_ui_sound | 109 | #include "llui.h" // for make_ui_sound |
| 110 | #include "lluploaddialog.h" | 110 | #include "lluploaddialog.h" |
| 111 | #include "llviewercamera.h" | 111 | #include "llviewercamera.h" |
| 112 | #include "llviewercontrol.h" | 112 | //#include "llviewercontrol.h" |
| 113 | #include "llviewergenericmessage.h" | 113 | #include "llviewergenericmessage.h" |
| 114 | #include "llviewerinventory.h" | 114 | #include "llviewerinventory.h" |
| 115 | #include "llviewermenu.h" | 115 | #include "llviewermenu.h" |