Merge remote-tracking branch 'Liru/master'

2013-08-10 20:11:47 -03:00
parent 412459ec3d 650f9857bf
commit 62e0db83bd
3 changed files with 3 additions and 3 deletions
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10551,7 +10551,7 @@ This should be as low as possible, but too low may break functionality</string>
      <key>Type</key>
      <string>Boolean</string>
      <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
    </map>
    <key>PerAccountSettingsFile</key>
    <map>
--- a/indra/newview/app_settings/settings_ascent.xml
+++ b/indra/newview/app_settings/settings_ascent.xml
@@ -266,7 +266,7 @@
 			<key>Type</key>
 			<string>Boolean</string>
 			<key>Value</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</map>
 		<key>AscentShowOthersTag</key>
 		<map>
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -75,7 +75,7 @@ const S32 RLV_VERSION_BUILD = 0;
 // Implementation version
 const S32 RLVa_VERSION_MAJOR = 1;
 const S32 RLVa_VERSION_MINOR = 4;
-const S32 RLVa_VERSION_PATCH = 5;
+const S32 RLVa_VERSION_PATCH = 8;
 const S32 RLVa_VERSION_BUILD = 0;

 // Uncomment before a final release