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

2013-06-27 06:00:21 -04:00
parent 198091c2a0 258d39e432
commit e07581f14d
29 changed files with 41 additions and 1172 deletions
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -70,7 +70,6 @@
 #include "lltrans.h"
 // <edit>
 #include "llmenugl.h"
-#include "lllocalinventory.h"
 // </edit>

 // tag: vaa emerald local_asset_browser [begin]