diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-08 04:39:11 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-08 04:39:11 +0000 |
| commit | cf7eb79fa7eadd6d76890d2a3f9da905de8f4691 (patch) | |
| tree | 81dd407136683d52f30db5ccca2c9cc8c72342d1 /indra/newview/llinventorybridge.cpp | |
| parent | 5f8b94094877730082340dc21ff0162b6177a427 (diff) | |
Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rwxr-xr-x | indra/newview/llinventorybridge.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index dc6147898a..4834d8dd70 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -50,6 +50,7 @@ #include "llclipboard.h" #include "llinventorydefines.h" #include "llinventoryfunctions.h" +#include "llinventoryicon.h" #include "llinventorymodel.h" #include "llinventorymodelbackgroundfetch.h" #include "llinventorypanel.h" @@ -1510,7 +1511,7 @@ LLUIImagePtr LLItemBridge::getIcon() const mIsLink); } - return LLInventoryIcon::getIcon(LLInventoryIcon::ICONNAME_OBJECT); + return LLInventoryIcon::getIcon(LLInventoryType::ICONNAME_OBJECT); } PermissionMask LLItemBridge::getPermissionMask() const |