diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/macview_Prefix.h | |
parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/macview_Prefix.h')
-rw-r--r-- | indra/newview/macview_Prefix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/macview_Prefix.h b/indra/newview/macview_Prefix.h index 08c59bcedd..eb394dc557 100644 --- a/indra/newview/macview_Prefix.h +++ b/indra/newview/macview_Prefix.h @@ -117,7 +117,7 @@ #include "llresmgr.h" #include "llui.h" #include "llviewborder.h" -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" /////////////////// From lldrawpool.cpp @@ -172,7 +172,7 @@ #include "llviewerwindow.h" #include "llcontrol.h" #include "lluictrl.h" -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" #include "llviewborder.h" #include "llviewerimagelist.h" #include "llbutton.h" |