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/llpreview.h
+++ b/indra/newview/llpreview.h
@@ -40,6 +40,7 @@
 #include "llviewerinventory.h"
 #include "lltabcontainer.h"
 #include "llinventorymodel.h"
+#include "llinventoryobserver.h"
 #include <map>

 class LLLineEditor;