diff options
author | James Cook <james@lindenlab.com> | 2009-12-31 14:31:58 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-31 14:31:58 -0800 |
commit | eb5a76996a1b1ce2ef30b6106287caae998dcc85 (patch) | |
tree | c796af5a77c8ebfa7d9d09709c0b179e721490c8 /indra/newview/llviewerfloaterreg.cpp | |
parent | 4e23ae312f0ab59c0c8c5b55c6c8450adf7d7f82 (diff) | |
parent | 6f66ec64b9e360a002a6d658327b72aaaab9325a (diff) |
Merge (viewer-2-0 into gooey)
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
-rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 5e624eeec7..23bdbc7381 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -53,7 +53,6 @@ #include "llfloaterbuyland.h" #include "llfloaterbulkpermission.h" #include "llfloaterbump.h" -#include "llfloatercall.h" #include "llfloatercamera.h" #include "llfloaterchat.h" #include "llfloaterchatterbox.h" |