diff options
author | Adam Moss <moss@lindenlab.com> | 2009-09-30 17:46:31 +0000 |
---|---|---|
committer | Adam Moss <moss@lindenlab.com> | 2009-09-30 17:46:31 +0000 |
commit | feabeb496518f28359f654fdc397354355743589 (patch) | |
tree | 99fa7dd202caac786d7032a2c8bd187a1f5a5ad0 /indra/newview/llviewerparcelmgr.cpp | |
parent | a3ba111e39be0bfa0278dfce66f4608fac7c0aa2 (diff) |
DEV-35039 Viewer 2.0 Help System - Viewer Development
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
-rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index c5b09403cb..7ca11d8364 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -50,7 +50,6 @@ #include "llfirstuse.h" #include "llfloaterbuyland.h" #include "llfloatergroups.h" -//#include "llfloaterhtml.h" #include "llfloatersellland.h" #include "llfloatertools.h" #include "llnotify.h" |