diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-11-21 21:18:13 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-11-21 21:18:13 +0200 |
commit | fb0355fdbae173c4c5720dd25334f9f5e5304fb2 (patch) | |
tree | 2f0f4c6c7946cdf5baa3bc2f60d8954d6927d4a2 /indra/newview/llviewerinventory.cpp | |
parent | fc72e2d95f1b8dc36246823afe09cceee5f352c3 (diff) | |
parent | 420b1c9429d36d75ee3c5de85b37f47bc207a122 (diff) |
Merged in Ansariel/storm-2141
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r-- | indra/newview/llviewerinventory.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 87d8f753b8..caffeadb73 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -49,7 +49,6 @@ #include "llinventorybridge.h" #include "llinventorypanel.h" -#include "llfloaterinventory.h" #include "lllandmarkactions.h" #include "llviewerassettype.h" |