diff options
| author | niel@nirvana-win7hp.planescape.home <niel@nirvana-win7hp.planescape.home> | 2011-10-26 01:42:26 +0100 |
|---|---|---|
| committer | niel@nirvana-win7hp.planescape.home <niel@nirvana-win7hp.planescape.home> | 2011-10-26 01:42:26 +0100 |
| commit | 4fd9a53115bf85ffe17974323d5fa609e0df960c (patch) | |
| tree | 7968008d0fa7c0347d637e1fb19add9d436b926d /indra/newview/llimpanel.cpp | |
| parent | 42c166e451d362609d83fb17261f9e8f344e974d (diff) | |
| parent | b7a349f231977d5917b29faacca143a85d925576 (diff) | |
Merge STORM-959
Diffstat (limited to 'indra/newview/llimpanel.cpp')
| -rw-r--r-- | indra/newview/llimpanel.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index b3b0c93b99..0250af6a0e 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -41,7 +41,6 @@ #include "llagent.h" #include "llbutton.h" -#include "llbottomtray.h" #include "llcallingcard.h" #include "llchannelmanager.h" #include "llchat.h" |