Pull and merge viewer-release as version 3.7.8

1 files changed, 7 insertions, 23 deletions

diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
index 7e013de11a..e79b753514 100755
--- a/indra/llinventory/llpermissions.cpp
+++ b/indra/llinventory/llpermissions.cpp
@@ -31,7 +31,6 @@
 
 // library includes
 #include "message.h"
-#include "metapropertyt.h"
 #include "llsd.h"
 
 ///----------------------------------------------------------------------------
@@ -117,7 +116,7 @@ LLUUID LLPermissions::getSafeOwner() const
 	}
 	else
 	{
-		llwarns << "LLPermissions::getSafeOwner() called with no valid owner!" << llendl;
+		LL_WARNS() << "LLPermissions::getSafeOwner() called with no valid owner!" << LL_ENDL;
 		LLUUID unused_uuid;
 		unused_uuid.generate();
 
@@ -666,7 +665,7 @@ BOOL LLPermissions::importFile(LLFILE* fp)
 		}
 		else
 		{
-			llinfos << "unknown keyword " << keyword << " in permissions import" << llendl;
+			LL_INFOS() << "unknown keyword " << keyword << " in permissions import" << LL_ENDL;
 		}
 	}
 	fix();
@@ -800,7 +799,7 @@ BOOL LLPermissions::importLegacyStream(std::istream& input_stream)
 		}
 		else
 		{
-			llinfos << "unknown keyword " << keyword << " in permissions import" << llendl;
+			LL_INFOS() << "unknown keyword " << keyword << " in permissions import" << LL_ENDL;
 		}
 	}
 	fix();
@@ -895,21 +894,6 @@ std::ostream& operator<<(std::ostream &s, const LLPermissions &perm)
 	return s;
 }
 
-template <>
-void LLMetaClassT<LLPermissions>::reflectProperties(LLMetaClass& meta_class)
-{
-	reflectProperty(meta_class, "mCreator", &LLPermissions::mCreator);
-	reflectProperty(meta_class, "mOwner", &LLPermissions::mOwner);
-	reflectProperty(meta_class, "mGroup", &LLPermissions::mGroup);
-	reflectProperty(meta_class, "mIsGroupOwned", &LLPermissions::mIsGroupOwned);
-}
-
-// virtual
-const LLMetaClass& LLPermissions::getMetaClass() const
-{
-	return LLMetaClassT<LLPermissions>::instance();
-}
-
 ///----------------------------------------------------------------------------
 /// Class LLAggregatePermissions
 ///----------------------------------------------------------------------------
@@ -997,8 +981,8 @@ void LLAggregatePermissions::aggregateBit(EPermIndex idx, BOOL allowed)
 		mBits[idx] = allowed ? AP_ALL : AP_SOME;
 		break;
 	default:
-		llwarns << "Bad aggregateBit " << (S32)idx << " "
-				<< (allowed ? "true" : "false") << llendl;
+		LL_WARNS() << "Bad aggregateBit " << (S32)idx << " "
+				<< (allowed ? "true" : "false") << LL_ENDL;
 		break;
 	}
 }
@@ -1042,8 +1026,8 @@ void LLAggregatePermissions::aggregateIndex(EPermIndex idx, U8 bits)
 		}
 		break;
 	default:
-		llwarns << "Bad aggregate index " << (S32)idx << " "
-				<<  (S32)bits << llendl;
+		LL_WARNS() << "Bad aggregate index " << (S32)idx << " "
+				<<  (S32)bits << LL_ENDL;
 		break;
 	}
 }