diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-03-26 14:04:03 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-03-26 14:04:03 -0700 |
| commit | 4888c9a103bd4e87d87ca601a321cbbc5f618516 (patch) | |
| tree | 2a15bc174ecd053b207dc8cc7def8ffa63e2a578 /indra/newview | |
| parent | c58125e804e47f3ca31b8f890c351c7e9a829fcd (diff) | |
| parent | 55f549db455f657f1d36fa72a45abfe71449f286 (diff) | |
Merge patches in q/viewer-hotfix to viewer-2-0
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 3 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
2 files changed, 6 insertions, 3 deletions
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); diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 3f379fcf75..18ac10fe38 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}" """ @@ -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() |