merge up to latest viewer-development

1 files changed, 61 insertions, 33 deletions

diff --git a/indra/newview/tests/llagentaccess_test.cpp b/indra/newview/tests/llagentaccess_test.cpp
index c970d79975..3ba25f3c10 100644
--- a/indra/newview/tests/llagentaccess_test.cpp
+++ b/indra/newview/tests/llagentaccess_test.cpp
@@ -84,19 +84,25 @@ namespace tut
 		LLAgentAccess aa(cgr);
 		
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_PG);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 prefersPG",     aa.prefersPG());
 		ensure("1 prefersMature", !aa.prefersMature());
 		ensure("1 prefersAdult",  !aa.prefersAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_MATURE);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("2 prefersPG",     !aa.prefersPG());
 		ensure("2 prefersMature", aa.prefersMature());
 		ensure("2 prefersAdult",  !aa.prefersAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_ADULT);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("3 prefersPG",     !aa.prefersPG());
 		ensure("3 prefersMature", aa.prefersMature());
 		ensure("3 prefersAdult",  aa.prefersAdult());
+#endif // HACKED_GODLIKE_VIEWER
     }
     
 	template<> template<>
@@ -107,45 +113,43 @@ namespace tut
 		LLAgentAccess aa(cgr);
 		
 		// make sure default is PG
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 isTeen",     aa.isTeen());
 		ensure("1 isMature",   !aa.isMature());
 		ensure("1 isAdult",    !aa.isAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
-		// this is kinda bad -- setting this forces maturity to MATURE but !teen != Mature anymore
-		aa.setTeen(false);
-		ensure("2 isTeen",     !aa.isTeen());
-		ensure("2 isMature",   aa.isMature());
-		ensure("2 isAdult",    !aa.isAdult());
-
-		// have to flip it back and make sure it still works
-		aa.setTeen(true);
-		ensure("3 isTeen",     aa.isTeen());
-		ensure("3 isMature",   !aa.isMature());
-		ensure("3 isAdult",    !aa.isAdult());		
-
 		// check the conversion routine
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure_equals("1 conversion", SIM_ACCESS_PG, aa.convertTextToMaturity('P'));
 		ensure_equals("2 conversion", SIM_ACCESS_MATURE, aa.convertTextToMaturity('M'));
 		ensure_equals("3 conversion", SIM_ACCESS_ADULT, aa.convertTextToMaturity('A'));
 		ensure_equals("4 conversion", SIM_ACCESS_MIN, aa.convertTextToMaturity('Q'));
+#endif // HACKED_GODLIKE_VIEWER
 		
 		// now try the other method of setting it - PG
 		aa.setMaturity('P');
-		ensure("4 isTeen",     aa.isTeen());
-		ensure("4 isMature",   !aa.isMature());
-		ensure("4 isAdult",    !aa.isAdult());
+		ensure("2 isTeen",     aa.isTeen());
+#ifndef HACKED_GODLIKE_VIEWER
+		ensure("2 isMature",   !aa.isMature());
+		ensure("2 isAdult",    !aa.isAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		// Mature
 		aa.setMaturity('M');
-		ensure("5 isTeen",     !aa.isTeen());
-		ensure("5 isMature",   aa.isMature());
-		ensure("5 isAdult",    !aa.isAdult());
+#ifndef HACKED_GODLIKE_VIEWER
+		ensure("3 isTeen",     !aa.isTeen());
+		ensure("3 isMature",   aa.isMature());
+		ensure("3 isAdult",    !aa.isAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		// Adult
 		aa.setMaturity('A');
-		ensure("6 isTeen",     !aa.isTeen());
-		ensure("6 isMature",   aa.isMature());
-		ensure("6 isAdult",    aa.isAdult());
+#ifndef HACKED_GODLIKE_VIEWER
+		ensure("4 isTeen",     !aa.isTeen());
+		ensure("4 isMature",   aa.isMature());
+		ensure("4 isAdult",    aa.isAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 	}
 
@@ -156,21 +160,35 @@ namespace tut
 		cgr.declareU32("PreferredMaturity", SIM_ACCESS_PG, "declared_for_test", FALSE);
 		LLAgentAccess aa(cgr);
 		
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("starts normal", !aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
 		aa.setGodLevel(GOD_NOT);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("stays normal", !aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
 		aa.setGodLevel(GOD_FULL);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("sets full", aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
 		aa.setGodLevel(GOD_NOT);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("resets normal", !aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
 		aa.setAdminOverride(true);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("admin true", aa.getAdminOverride());
 		ensure("overrides 1", aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
 		aa.setGodLevel(GOD_FULL);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("overrides 2", aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
 		aa.setAdminOverride(false);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("admin false", !aa.getAdminOverride());
 		ensure("overrides 3", aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
     }
     
 	template<> template<>
@@ -180,55 +198,73 @@ namespace tut
 		cgr.declareU32("PreferredMaturity", SIM_ACCESS_PG, "declared_for_test", FALSE);
 		LLAgentAccess aa(cgr);
 		
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 pg to start", aa.wantsPGOnly());
 		ensure("2 pg to start", !aa.canAccessMature());
 		ensure("3 pg to start", !aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		aa.setGodLevel(GOD_FULL);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 full god", !aa.wantsPGOnly());
 		ensure("2 full god", aa.canAccessMature());
 		ensure("3 full god", aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 				
 		aa.setGodLevel(GOD_NOT);
 		aa.setAdminOverride(true);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 admin mode", !aa.wantsPGOnly());
 		ensure("2 admin mode", aa.canAccessMature());
 		ensure("3 admin mode", aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 
 		aa.setAdminOverride(false);
 		aa.setMaturity('M');
 		// preferred is still pg by default
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 mature pref pg", aa.wantsPGOnly());
 		ensure("2 mature pref pg", !aa.canAccessMature());
 		ensure("3 mature pref pg", !aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_MATURE);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 mature", !aa.wantsPGOnly());
 		ensure("2 mature", aa.canAccessMature());
 		ensure("3 mature", !aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_PG);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 mature pref pg", aa.wantsPGOnly());
 		ensure("2 mature pref pg", !aa.canAccessMature());
 		ensure("3 mature pref pg", !aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		aa.setMaturity('A');
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 adult pref pg", aa.wantsPGOnly());
 		ensure("2 adult pref pg", !aa.canAccessMature());
 		ensure("3 adult pref pg", !aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_ADULT);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 adult", !aa.wantsPGOnly());
 		ensure("2 adult", aa.canAccessMature());
 		ensure("3 adult", aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 
 		// make sure that even if pref is high, if access is low we block access
 		// this shouldn't occur in real life but we want to be safe
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_ADULT);
 		aa.setMaturity('P');
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 pref adult, actual pg", aa.wantsPGOnly());
 		ensure("2 pref adult, actual pg", !aa.canAccessMature());
 		ensure("3 pref adult, actual pg", !aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 	}
 
@@ -239,24 +275,16 @@ namespace tut
 		cgr.declareU32("PreferredMaturity", SIM_ACCESS_PG, "declared_for_test", FALSE);
 		LLAgentAccess aa(cgr);
 		
-		ensure("1 transition starts false", !aa.isInTransition());
-		aa.setTransition();
-		ensure("2 transition now true", aa.isInTransition());
-	}
-
-	template<> template<>
-	void agentaccess_object_t::test<6>()
-	{
-		LLControlGroup cgr("test");
-		cgr.declareU32("PreferredMaturity", SIM_ACCESS_PG, "declared_for_test", FALSE);
-		LLAgentAccess aa(cgr);
-		
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_ADULT);
 		aa.setMaturity('M');
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 preferred maturity pegged to M when maturity is M", cgr.getU32("PreferredMaturity") == SIM_ACCESS_MATURE);
+#endif // HACKED_GODLIKE_VIEWER
 		
 		aa.setMaturity('P');
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 preferred maturity pegged to P when maturity is P", cgr.getU32("PreferredMaturity") == SIM_ACCESS_PG);
+#endif // HACKED_GODLIKE_VIEWER
 	}
 }