Merge in select parts of https://bitbucket.org/Kitty_Barnett/rlva-development @ 1adfc2cd210c4cf3a8800b31915d363bfe47d045

2015-06-26 20:59:31 -05:00
parent 4d61305095
commit a380161283
27 changed files with 714 additions and 334 deletions
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -68,7 +68,7 @@ const S32 RLVa_VERSION_PATCH = 10;
 const S32 RLVa_VERSION_BUILD = 0;

 // Uncomment before a final release
-#define RLV_RELEASE
+//#define RLV_RELEASE

 // Defining these makes it easier if we ever need to change our tag
 #define RLV_WARNS		LL_WARNS("RLV")