Merge remote-tracking branch 'shyotl/sunshine'

2013-01-21 11:25:10 +01:00
parent 4cd2de0fff dc106c5442
commit 18816ae146
415 changed files with 20229 additions and 16924 deletions
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -2696,7 +2696,7 @@ bool LLVolume::unpackVolumeFaces(std::istream& is, S32 size)
 	return true;
 }

-		
+
 BOOL LLVolume::isMeshAssetLoaded()
 {
 	return mIsMeshAssetLoaded;