diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-11-03 11:09:09 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-11-03 11:09:09 -0400 |
| commit | 392cfa0d1bd658cbb17d80a1e3e862329aa311ea (patch) | |
| tree | 35f71dce12461704c71c7b8c24843e37d230d1a1 /indra | |
| parent | 231eac8a02ecd95aa633c320e9fa501cf27ceaa8 (diff) | |
| parent | 2f6062e59793c8a5326c1dfac41334bac428faa9 (diff) | |
Automated merge with https://bitbucket.org/mani_linden/viewer-development
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llmoveview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 6658e1d7e8..d38bb5aa4a 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -552,7 +552,7 @@ LLPanelStandStopFlying::LLPanelStandStopFlying() : } // static -inline LLPanelStandStopFlying* LLPanelStandStopFlying::getInstance() +LLPanelStandStopFlying* LLPanelStandStopFlying::getInstance() { static LLPanelStandStopFlying* panel = getStandStopFlyingPanel(); return panel; diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 6861f02bfb..4b98a11091 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -897,6 +897,9 @@ class LinuxManifest(ViewerManifest): 'dir': self.get_build_prefix(), 'inst_name': installer_name, 'inst_path':self.build_path_of(installer_name)}) + else: + print "Skipping %s.tar.bz2 for non-Release build (%s)" % \ + (installer_name, self.args['buildtype']) finally: self.run_command("mv %(inst)s %(dst)s" % { 'dst': self.get_dst_prefix(), |