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/llpanelobjectinventory.cpp | |
| parent | 42c166e451d362609d83fb17261f9e8f344e974d (diff) | |
| parent | b7a349f231977d5917b29faacca143a85d925576 (diff) | |
Merge STORM-959
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 44364b5831..98ea680504 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -57,7 +57,6 @@ #include "llpreviewtexture.h" #include "llscrollcontainer.h" #include "llselectmgr.h" -#include "llsidetray.h" #include "llstatusbar.h" #include "lltooldraganddrop.h" #include "lltrans.h" |