From c2686fad3717e4cf206e91c98bf24f2c7903dec1 Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Tue, 23 Mar 2010 18:23:57 -0700 Subject: EXT-6522 Change release installation location to Second Life Viewer 2 (Windows Only) reviewed by palmer --- indra/newview/viewer_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 3f379fcf75..987efc60b2 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -479,8 +479,8 @@ class WindowsManifest(ViewerManifest): grid_vars_template = """ OutFile "%(installer_file)s" !define INSTFLAGS "%(flags)s" - !define INSTNAME "SecondLife" - !define SHORTCUT "Second Life" + !define INSTNAME "SecondLifeViewer2" + !define SHORTCUT "Second Life Viewer 2" !define URLNAME "secondlife" Caption "Second Life ${VERSION}" """ -- cgit v1.2.3 From 3ad56f22158dd2665204745af2171689f208cd7e Mon Sep 17 00:00:00 2001 From: palange Date: Tue, 23 Mar 2010 19:38:31 -0700 Subject: EXT-6522 Changed app bundle to Second Life Viewer 2.app (Mac) --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 987efc60b2..18ac10fe38 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -686,7 +686,7 @@ class DarwinManifest(ViewerManifest): def package_finish(self): - channel_standin = 'Second Life' # hah, our default channel is not usable on its own + channel_standin = 'Second Life Viewer 2' # hah, our default channel is not usable on its own if not self.default_channel(): channel_standin = self.channel() -- cgit v1.2.3 From 55f549db455f657f1d36fa72a45abfe71449f286 Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Fri, 26 Mar 2010 12:52:02 -0700 Subject: EXT-6517 Now updating the location value in refreshLocation. Reviewed by Richard --- indra/newview/llpanellogin.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 7bd03167fd..ee4dcc44fe 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -679,6 +679,9 @@ void LLPanelLogin::refreshLocation( bool force_visible ) show_start = gSavedSettings.getBOOL("ShowStartLocation"); } + // Update the value of the location combo. + updateLocationUI(); + sInstance->childSetVisible("start_location_combo", show_start); sInstance->childSetVisible("start_location_text", show_start); -- cgit v1.2.3