diff options
| author | Anthony Foster <anthony@lindenlab.com> | 2008-02-12 21:37:06 +0000 |
|---|---|---|
| committer | Anthony Foster <anthony@lindenlab.com> | 2008-02-12 21:37:06 +0000 |
| commit | eb55ba3c7f51fa47336bead33077c298cec33b65 (patch) | |
| tree | 42e3c437492992cee4fa7cf46cbb91eb9789fe96 /indra/newview | |
| parent | be90edeb64e4394327c0212600ff0a2d74005153 (diff) | |
Committing changes to add -loginuri for dev grids.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 13a8c087b0..a84942d747 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -106,12 +106,12 @@ class ViewerManifest(LLManifest): if self.default_channel(): # beta grid viewer channel_flags = '-settings settings_beta.xml' - grid_flags = "--%(grid)s -helperuri http://preview-%(grid)s.secondlife.com/helpers/" % {'grid':self.args['grid']} + grid_flags = "-helperuri http://preview-%(grid)s.secondlife.com/helpers/ -loginuri https://login.%(grid)s.lindenlab.com/cgi-bin/login.cgi" % {'grid':self.args['grid']} if not self.default_channel(): # some channel on some grid channel_flags = '-settings settings_%s.xml -channel "%s"' % (self.channel_lowerword(), self.args['channel']) - return " ".join((grid_flags, channel_flags)).strip() + return " ".join((channel_flags, grid_flags)).strip() def login_url(self): """ Convenience function that returns the appropriate login url for the grid""" |