Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Beeks/Ascent

Browse Source
This commit is contained in:
Beeks
2010-08-29 23:48:25 -04:00
parent dfa2e001ff bb89f6b9be
commit a3f3dad4c4
10 changed files with 52 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llsecondlifeurls.cpp
View File

@@ -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/?");

4
indra/newview/llappviewer.cpp
View File

@@ -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;

4
indra/newview/llfloaterabout.cpp
View File

@@ -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__,
// <edit>
// gSavedSettings.getString("VersionChannelName").c_str());
gSavedSettings.getString("SpecifiedChannel").c_str());
// </edit>
support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);

9
indra/newview/llviewerdisplay.cpp
View File

@@ -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;
// <edit>
if(gAgent.getFocusOnAvatar())
// </edit>
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();

81
indra/newview/llviewermenu.cpp
View File

@@ -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!
// <edit>
{
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();
// </edit>
{
// *TODO: Translate
LLMenuGL* sub = new LLMenuGL("Consoles");

4
indra/newview/skins/default/xui/en-us/menu_login.xml
View File

@@ -21,11 +21,11 @@
<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
height="317" label="Help" left="80" mouse_opaque="false" name="Help"
opaque="true" tear_off="false" width="166">
<menu_item_call bottom="-29" enabled="true" height="19" label="Snowglobe/Second Life Help" left="0"
<menu_item_call bottom="-29" enabled="true" height="19" label="Ascent Help" left="0"
mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
<on_click function="ShowFloater" userdata="help f1" />
</menu_item_call>
<menu_item_call bottom="-48" enabled="true" height="19" label="About Snowglobe..." left="0"
<menu_item_call bottom="-48" enabled="true" height="19" label="About Ascent..." left="0"
mouse_opaque="true" name="About Second Life..." width="166">
<on_click function="ShowFloater" userdata="about" />
</menu_item_call>

4
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -874,7 +874,7 @@
<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
height="317" label="Help" left="227" mouse_opaque="false" name="Help"
opaque="true" tear_off="true" width="166">
<menu_item_call bottom="-29" enabled="true" height="19" label="Snowglobe/Second Life Help" left="0"
<menu_item_call bottom="-29" enabled="true" height="19" label="Ascent/Second Life Help" left="0"
mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
<on_click function="ShowFloater" userdata="help f1" />
</menu_item_call>
@@ -950,7 +950,7 @@
userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
</menu_item_call>
</menu>
<menu_item_call bottom="-313" enabled="true" height="19" label="About Snowglobe..." left="0"
<menu_item_call bottom="-313" enabled="true" height="19" label="About Ascent..." left="0"
mouse_opaque="true" name="About Second Life..." width="166">
<on_click function="ShowFloater" userdata="about" />
</menu_item_call>

2
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -6240,7 +6240,7 @@ Flexible objects may not be physical and must be phantom until the flexible chec
name="FirstDebugMenus"
type="notify">
You have enabled the Advanced menu.
This menu contains features useful for developers debugging Snowglobe.
This menu contains features useful for developers debugging Ascent.
To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D.
</notification>

2
indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
View File

@@ -9,7 +9,7 @@
Use external web browser (Firefox, Safari, Internet Explorer)
</radio_item>
<radio_item bottom="-40" height="20" left="0" name="internal" width="480"
tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Snowglobe.">
tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Ascent.">
Use built-in web browser
</radio_item>
</radio_group>

2
indra/newview/skins/default/xui/en-us/panel_voice_enable.xml
View File

@@ -32,6 +32,6 @@
embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
name="voice_intro_text4" tab_stop="false" width="400" word_wrap="true">
Click the Next button to configure Voice Chat preferences or click Finish to continue using Snowglobe.
Click the Next button to configure Voice Chat preferences or click Finish to continue using Ascent.
</text_editor>
</panel>