summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-11-16 16:28:04 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-11-16 16:28:04 +0200
commiteef22e0baf9e62f8c38058ad22e6e6bd5e5aca26 (patch)
tree2a498eb73a80802c7811193ce63253c9be905295 /indra/newview/lltexturectrl.cpp
parent59d575fe615bf14a10056c9b9fe0c109ec2c103e (diff)
parentbd42c1ae2cd6bb6e005478cc121c2b5d7a844eb4 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rw-r--r--indra/newview/lltexturectrl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index de00ca8420..5f7c2f5080 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -48,7 +48,7 @@
#include "llfoldervieweventlistener.h"
#include "llinventory.h"
#include "llinventoryfunctions.h"
-#include "llinventorymodel.h"
+#include "llinventoryobserver.h"
#include "llinventorypanel.h"
#include "llfloaterinventory.h"
#include "lllineeditor.h"