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

2012-02-05 15:14:53 +01:00
parent b03b4db7c7 2617df44db
commit 3d40cd86ac
131 changed files with 4154 additions and 2824 deletions
--- a/indra/newview/llpreviewsound.cpp
+++ b/indra/newview/llpreviewsound.cpp
@@ -35,8 +35,8 @@
 #include "llaudioengine.h"
 #include "llagent.h"          // gAgent
 #include "llbutton.h"
+#include "llfloaterinventory.h"
 #include "llinventory.h"
-#include "llinventoryview.h"
 #include "lllineeditor.h"
 #include "llpreviewsound.h"
 #include "llresmgr.h"