diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 19:10:43 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 19:10:43 -0800 |
| commit | c2ca71322bf48653d466cba40bbe01c3401318c7 (patch) | |
| tree | ecb9834f475c55dcf78c06aed115db69276068ef /indra/newview/llviewerparcelmgr.cpp | |
| parent | a0de48f0ccf7ab8181651646036a13f712641b54 (diff) | |
| parent | 433eb89473e9aaa3864299b7ba50a320f14bba38 (diff) | |
automated merge
Don't wanna fix all windows EOL issue here
warn-on-failure:unix-eol
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 5a5c4e7480..4b2707e6d7 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -50,7 +50,7 @@ #include "llagent.h" #include "llviewerwindow.h" #include "llviewercontrol.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "llfloaterbuyland.h" #include "llfloatergroups.h" #include "llfloaternearbymedia.h" |