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/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -16,9 +16,9 @@

 #include "llviewerprecompiledheaders.h"
 #include "llattachmentsmgr.h"
+#include "llfloaterinventory.h"
 #include "llfloaterwindlight.h"
 #include "llgesturemgr.h"
-#include "llinventoryview.h"
 #include "llinventorybridge.h"
 #include "llnotificationsutil.h"
 #include "llviewerobject.h"