Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into CT3Merge

2012-12-08 01:03:29 -06:00
parent 7aac61859f d6b486524c
commit 4f7e869509
22 changed files with 1075 additions and 89 deletions
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -408,7 +408,7 @@ public:
 		}
 	}
 	
-	virtual bool followRedir()
+	/*virtual*/ bool followRedir() const
 	{
 		return mFollowRedir;
 	}