diff options
| author | Christian Goetze <cg@lindenlab.com> | 2009-03-13 21:28:40 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2009-03-13 21:28:40 +0000 |
| commit | 1aa0416aef379bb3ad1012441588b6d7fab81b40 (patch) | |
| tree | 14a247470bd0d508aba923dc00e940b961d304da /indra/newview/llviewermessage.cpp | |
| parent | 7573288ab3ede23f97bff2f5caefcb622e7e9842 (diff) | |
svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 77b69d0ad4..dae3529319 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -82,7 +82,6 @@ #include "llfloaterland.h" #include "llfloaterregioninfo.h" #include "llfloaterlandholdings.h" -#include "llfloatermap.h" #include "llurldispatcher.h" #include "llfloatermute.h" #include "llfloaterpostcard.h" @@ -97,7 +96,6 @@ #include "llinventoryview.h" #include "llmenugl.h" #include "llmutelist.h" -#include "llnetmap.h" #include "llnotifications.h" #include "llnotify.h" #include "llpanelgrouplandmoney.h" |