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

Branding changes, Disable Login/Teleport screen support.

Browse Source
This commit is contained in:
CharleyLevenque
2010-08-29 23:17:04 -04:00
parent a1e925b305
commit bb89f6b9be
9 changed files with 14 additions and 19 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/"); "http://secondlife.com/knowledgebase/");
const std::string RELEASE_NOTES_BASE_URL ( 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; static S32 total_uploads = 0;
// Sometimes total upload count can change during logout. // Sometimes total upload count can change during logout.
total_uploads = llmax(total_uploads, pending_uploads); total_uploads = llmax(total_uploads, pending_uploads);
gViewerWindow->setShowProgress(TRUE); gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("AscentDisableLogoutScreens"));
S32 finished_uploads = total_uploads - pending_uploads; S32 finished_uploads = total_uploads - pending_uploads;
F32 percent = 100.f * finished_uploads / total_uploads; F32 percent = 100.f * finished_uploads / total_uploads;
gViewerWindow->setProgressPercent(percent); gViewerWindow->setProgressPercent(percent);
@@ -3697,7 +3697,7 @@ void LLAppViewer::idleShutdown()
sendLogoutRequest(); sendLogoutRequest();
// Wait for a LogoutReply message // Wait for a LogoutReply message
gViewerWindow->setShowProgress(TRUE); gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("AscentDisableLogoutScreens"));
gViewerWindow->setProgressPercent(100.f); gViewerWindow->setProgressPercent(100.f);
gViewerWindow->setProgressString("Logging out..."); gViewerWindow->setProgressString("Logging out...");
return; return;

4
indra/newview/llfloaterabout.cpp
View File

@@ -123,10 +123,8 @@ LLFloaterAbout::LLFloaterAbout()
+ llformat(" %d.%d.%d (%d) %s %s (%s)\n", + llformat(" %d.%d.%d (%d) %s %s (%s)\n",
gSavedSettings.getU32("SpecifiedVersionMaj"), gSavedSettings.getU32("SpecifiedVersionMin"), gSavedSettings.getU32("SpecifiedVersionPatch"), gSavedSettings.getU32("SpecifiedVersionBuild"), gSavedSettings.getU32("SpecifiedVersionMaj"), gSavedSettings.getU32("SpecifiedVersionMin"), gSavedSettings.getU32("SpecifiedVersionPatch"), gSavedSettings.getU32("SpecifiedVersionBuild"),
__DATE__, __TIME__, __DATE__, __TIME__,
// <edit>
// gSavedSettings.getString("VersionChannelName").c_str());
gSavedSettings.getString("SpecifiedChannel").c_str()); gSavedSettings.getString("SpecifiedChannel").c_str());
// </edit>
support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor")); support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style); 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 // Transition to REQUESTED. Viewer has sent some kind
// of TeleportRequest to the source simulator // of TeleportRequest to the source simulator
gTeleportDisplayTimer.reset(); gTeleportDisplayTimer.reset();
gViewerWindow->setShowProgress(TRUE); if(!gSavedSettings.getBOOL("AscentDisableTeleportScreens"))gViewerWindow->setShowProgress(TRUE);
gViewerWindow->setProgressPercent(0); gViewerWindow->setProgressPercent(0);
gAgent.setTeleportState( LLAgent::TELEPORT_REQUESTED ); gAgent.setTeleportState( LLAgent::TELEPORT_REQUESTED );
gAgent.setTeleportMessage( gAgent.setTeleportMessage(
@@ -384,17 +384,14 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
gAgent.setTeleportMessage( gAgent.setTeleportMessage(
LLAgent::sTeleportProgressMessages["arriving"]); LLAgent::sTeleportProgressMessages["arriving"]);
gImageList.mForceResetTextureStats = TRUE; gImageList.mForceResetTextureStats = TRUE;
// <edit> if(!gSavedSettings.getBOOL("AscentDisableTeleportScreens"))gAgent.resetView(TRUE, TRUE);
if(gAgent.getFocusOnAvatar())
// </edit>
gAgent.resetView(TRUE, TRUE);
break; break;
case LLAgent::TELEPORT_ARRIVING: case LLAgent::TELEPORT_ARRIVING:
// Make the user wait while content "pre-caches" // Make the user wait while content "pre-caches"
{ {
F32 arrival_fraction = (gTeleportArrivalTimer.getElapsedTimeF32() / TELEPORT_ARRIVAL_DELAY); 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; arrival_fraction = 1.f;
LLFirstUse::useTeleport(); LLFirstUse::useTeleport();

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" <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
height="317" label="Help" left="80" mouse_opaque="false" name="Help" height="317" label="Help" left="80" mouse_opaque="false" name="Help"
opaque="true" tear_off="false" width="166"> 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"> mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
<on_click function="ShowFloater" userdata="help f1" /> <on_click function="ShowFloater" userdata="help f1" />
</menu_item_call> </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"> mouse_opaque="true" name="About Second Life..." width="166">
<on_click function="ShowFloater" userdata="about" /> <on_click function="ShowFloater" userdata="about" />
</menu_item_call> </menu_item_call>

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

@@ -869,7 +869,7 @@
<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true" <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
height="317" label="Help" left="227" mouse_opaque="false" name="Help" height="317" label="Help" left="227" mouse_opaque="false" name="Help"
opaque="true" tear_off="true" width="166"> 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"> mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
<on_click function="ShowFloater" userdata="help f1" /> <on_click function="ShowFloater" userdata="help f1" />
</menu_item_call> </menu_item_call>
@@ -945,7 +945,7 @@
userdata="WebLaunchPublicIssue,http://jira.secondlife.com" /> userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
</menu_item_call> </menu_item_call>
</menu> </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"> mouse_opaque="true" name="About Second Life..." width="166">
<on_click function="ShowFloater" userdata="about" /> <on_click function="ShowFloater" userdata="about" />
</menu_item_call> </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" name="FirstDebugMenus"
type="notify"> type="notify">
You have enabled the Advanced menu. 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. To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D.
</notification> </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) Use external web browser (Firefox, Safari, Internet Explorer)
</radio_item> </radio_item>
<radio_item bottom="-40" height="20" left="0" name="internal" width="480" <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 Use built-in web browser
</radio_item> </radio_item>
</radio_group> </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" embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
hide_border="true" hide_scrollbar="true" left="0" max_length="65535" hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
name="voice_intro_text4" tab_stop="false" width="400" word_wrap="true"> 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> </text_editor>
</panel> </panel>