Merge remote-tracking branch 'lirusato/master'

2013-01-22 20:06:03 +01:00
parent b758014ebc dd1e9a68d4
commit d8c846288e
32 changed files with 311 additions and 553 deletions
--- a/indra/newview/llfloatercustomize.cpp
+++ b/indra/newview/llfloatercustomize.cpp
@@ -50,7 +50,6 @@
 #include "llscrollcontainer.h"
 #include "llscrollingpanelparam.h"
 #include "llsliderctrl.h"
-#include "lltabcontainervertical.h"
 #include "llviewerwindow.h"
 #include "llinventoryfunctions.h"
 #include "llinventoryobserver.h"