merge changes for social-859

6e84133c · Oz Linden · 56caf8b6 · 1a2cc89c · 6e84133c · 6e84133c
Commit 6e84133c authored 13 years ago by Oz Linden
--- a/BuildParams
+++ b/BuildParams
@@ -66,7 +66,7 @@ viewer-pre-release.viewer_channel = "Second Life Release"
 viewer-pre-release.login_channel = "Second Life Release"
 viewer-pre-release.build_debug_release_separately = true
 viewer-pre-release.build_viewer_update_version_manager = true
-viewer-pre-release.release-viewer.jira = DRTVWR-39
+viewer-pre-release.release-viewer.jira = DRTVWR-42
 # =======================================
 # brad
 # ========================================

--- a/indra/newview/app_settings/CA.pem
+++ b/indra/newview/app_settings/CA.pem