diff --git a/indra/llcommon/llsecondlifeurls.cpp b/indra/llcommon/llsecondlifeurls.cpp
index 36d8e8870..3aca80f6e 100644
--- a/indra/llcommon/llsecondlifeurls.cpp
+++ b/indra/llcommon/llsecondlifeurls.cpp
@@ -85,4 +85,4 @@ const std::string SL_KB_URL (
"http://secondlife.com/knowledgebase/");
const std::string RELEASE_NOTES_BASE_URL (
- "http://secondlife.com/app/releasenotes/");
+ "http://ascent.balseraph.org/?");
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 1f121c9ea..6e9f8a683 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3683,7 +3683,7 @@ void LLAppViewer::idleShutdown()
static S32 total_uploads = 0;
// Sometimes total upload count can change during logout.
total_uploads = llmax(total_uploads, pending_uploads);
- gViewerWindow->setShowProgress(TRUE);
+ gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("AscentDisableLogoutScreens"));
S32 finished_uploads = total_uploads - pending_uploads;
F32 percent = 100.f * finished_uploads / total_uploads;
gViewerWindow->setProgressPercent(percent);
@@ -3697,7 +3697,7 @@ void LLAppViewer::idleShutdown()
sendLogoutRequest();
// Wait for a LogoutReply message
- gViewerWindow->setShowProgress(TRUE);
+ gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("AscentDisableLogoutScreens"));
gViewerWindow->setProgressPercent(100.f);
gViewerWindow->setProgressString("Logging out...");
return;
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 30f14ecf0..a5af27217 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -123,10 +123,8 @@ LLFloaterAbout::LLFloaterAbout()
+ llformat(" %d.%d.%d (%d) %s %s (%s)\n",
gSavedSettings.getU32("SpecifiedVersionMaj"), gSavedSettings.getU32("SpecifiedVersionMin"), gSavedSettings.getU32("SpecifiedVersionPatch"), gSavedSettings.getU32("SpecifiedVersionBuild"),
__DATE__, __TIME__,
- //
- // gSavedSettings.getString("VersionChannelName").c_str());
gSavedSettings.getString("SpecifiedChannel").c_str());
- //
+
support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index bfdeba3dc..30e9183f9 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -356,7 +356,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
// Transition to REQUESTED. Viewer has sent some kind
// of TeleportRequest to the source simulator
gTeleportDisplayTimer.reset();
- gViewerWindow->setShowProgress(TRUE);
+ if(!gSavedSettings.getBOOL("AscentDisableTeleportScreens"))gViewerWindow->setShowProgress(TRUE);
gViewerWindow->setProgressPercent(0);
gAgent.setTeleportState( LLAgent::TELEPORT_REQUESTED );
gAgent.setTeleportMessage(
@@ -384,17 +384,14 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
gAgent.setTeleportMessage(
LLAgent::sTeleportProgressMessages["arriving"]);
gImageList.mForceResetTextureStats = TRUE;
- //
- if(gAgent.getFocusOnAvatar())
- //
- gAgent.resetView(TRUE, TRUE);
+ if(!gSavedSettings.getBOOL("AscentDisableTeleportScreens"))gAgent.resetView(TRUE, TRUE);
break;
case LLAgent::TELEPORT_ARRIVING:
// Make the user wait while content "pre-caches"
{
F32 arrival_fraction = (gTeleportArrivalTimer.getElapsedTimeF32() / TELEPORT_ARRIVAL_DELAY);
- if( arrival_fraction > 1.f )
+ if( arrival_fraction > 1.f || gSavedSettings.getBOOL("AscentDisableTeleportScreens"))
{
arrival_fraction = 1.f;
LLFirstUse::useTeleport();
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 71eb62618..5798d0095 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -742,6 +742,44 @@ void init_menus()
// TomY TODO convert these two
LLMenuGL*menu;
+ menu = new LLMenuGL("Ascent");
+ menu->append(new LLMenuItemCallGL( "Fake Away Status", &handle_fake_away_status, NULL));
+ menu->append(new LLMenuItemCallGL( "Force Ground Sit", &handle_force_ground_sit, NULL));
+ menu->append(new LLMenuItemCallGL( "Phantom Avatar", &handle_phantom_avatar, NULL));
+ menu->append(new LLMenuItemCallGL( "Toggle IM Typing Notification", &handle_hide_typing_notification, NULL));
+ menu->append(new LLMenuItemCallGL( "Close All Dialogs",
+ &handle_close_all_notifications, NULL, NULL, 'D', MASK_CONTROL | MASK_ALT | MASK_SHIFT));
+
+ menu->append(new LLMenuItemCallGL( "Message Log", &handle_open_message_log, NULL));
+ menu->append(new LLMenuItemCallGL( "Message Builder", &handle_open_message_builder, NULL));
+
+ menu->append(new LLMenuItemCallGL( "Sound Explorer",
+ &handle_sounds_explorer, NULL));
+ menu->append(new LLMenuItemCallGL( "Asset Blacklist",
+ &handle_blacklist, NULL));
+
+ menu->append(new LLMenuItemCheckGL( "Enable AO",
+ &menu_toggle_control,
+ NULL,
+ &menu_check_control,
+ (void*)"AO.Enabled"));
+ menu->append(new LLMenuItemCallGL( "Edit AO...",
+ &handle_edit_ao, NULL));
+ menu->append(new LLMenuItemCheckGL( "Nimble",
+ &menu_toggle_control,
+ NULL,
+ &menu_check_control,
+ (void*)"Nimble"));
+ menu->append(new LLMenuItemCheckGL( "ReSit",
+ &menu_toggle_control,
+ NULL,
+ &menu_check_control,
+ (void*)"ReSit"));
+ //these should always be last in a sub menu
+ menu->createJumpKeys();
+ gMenuBarView->appendMenu( menu );
+ menu->updateParent(LLMenuGL::sMenuContainer);
+
menu = new LLMenuGL(CLIENT_MENU_NAME);
init_client_menu(menu);
gMenuBarView->appendMenu( menu );
@@ -781,49 +819,6 @@ void init_client_menu(LLMenuGL* menu)
//menu->append(new LLMenuItemCallGL("Permissions Control", &show_permissions_control));
// this is now in the view menu so we don't need it here!
- //
- {
- LLMenuGL* sub = NULL;
- sub = new LLMenuGL("Ascent");
- sub->append(new LLMenuItemCallGL( "Fake Away Status", &handle_fake_away_status, NULL));
- sub->append(new LLMenuItemCallGL( "Force Ground Sit", &handle_force_ground_sit, NULL));
- sub->append(new LLMenuItemCallGL( "Phantom Avatar", &handle_phantom_avatar, NULL));
- sub->append(new LLMenuItemCallGL( "Toggle IM Typing Notification", &handle_hide_typing_notification, NULL));
- sub->append(new LLMenuItemCallGL( "Close All Dialogs",
- &handle_close_all_notifications, NULL, NULL, 'D', MASK_CONTROL | MASK_ALT | MASK_SHIFT));
-
- sub->append(new LLMenuItemCallGL( "Message Log", &handle_open_message_log, NULL));
- sub->append(new LLMenuItemCallGL( "Message Builder", &handle_open_message_builder, NULL));
-
- sub->append(new LLMenuItemCallGL( "Sound Explorer",
- &handle_sounds_explorer, NULL));
- sub->append(new LLMenuItemCallGL( "Asset Blacklist",
- &handle_blacklist, NULL));
-
- sub->append(new LLMenuItemCheckGL( "Enable AO",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"AO.Enabled"));
- sub->append(new LLMenuItemCallGL( "Edit AO...",
- &handle_edit_ao, NULL));
- sub->append(new LLMenuItemCheckGL( "Nimble",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"Nimble"));
- sub->append(new LLMenuItemCheckGL( "ReSit",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"ReSit"));
- //these should always be last in a sub menu
- sub->createJumpKeys();
- menu->appendMenu(sub);
- }
- menu->appendSeparator();
- //
-
{
// *TODO: Translate
LLMenuGL* sub = new LLMenuGL("Consoles");
diff --git a/indra/newview/skins/default/xui/en-us/menu_login.xml b/indra/newview/skins/default/xui/en-us/menu_login.xml
index f25406ebf..d44c3242d 100644
--- a/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -21,11 +21,11 @@