Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2012-01-12 23:39:16 -05:00
parent b0967463ca 1cc33caaa3
commit 9d3b276f61
37 changed files with 1915 additions and 1554 deletions
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -128,7 +128,7 @@
 #include "llhttpclient.h"
 #include "llimagebmp.h"
 #include "llimview.h" // for gIMMgr
-#include "llinventorymodel.h"
+#include "llinventoryfunctions.h"
 #include "llinventoryview.h"
 #include "llkeyboard.h"
 #include "llloginhandler.h"			// gLoginHandler, SLURL support