diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2011-09-30 15:59:38 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2011-09-30 15:59:38 +0300 |
| commit | 4ac6eed116a888e113d6f4f031e57e09a141b55a (patch) | |
| tree | df6e87ff58a6008dbe1006874ba5a53af91d1871 /indra/newview/lllocationinputctrl.cpp | |
| parent | 66e21e0330b2f66b986a1ed76873af9752dcf2e1 (diff) | |
| parent | 9d3fc5d930bd1dae07771350080e5140c0113891 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index f519ad759e..025181ead5 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -49,7 +49,6 @@ #include "lllandmarkactions.h" #include "lllandmarklist.h" #include "llteleporthistory.h" -#include "llsidetray.h" #include "llslurl.h" #include "llstatusbar.h" // getHealth() #include "lltrans.h" |