From adc67912d097aa032b7e7e76f6e87e8e6c54525e Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Wed, 13 Jul 2016 09:37:53 -0700 Subject: include manager directory in viewer manifest, not CMake --- indra/newview/viewer_manifest.py | 1 + indra/viewer_components/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f476adda4f..9194a2161a 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -714,6 +714,7 @@ class Darwin_i386_Manifest(ViewerManifest): self.path2basename("../viewer_components/updater/scripts/darwin", "*.py") #this copies over the python wrapper script, see SL-322 self.path2basename("../viewer_components/manager","SL_Launcher") + self.path2basename("../viewer_components/manager","*.py") self.end_prefix() # most everything goes in the Resources directory diff --git a/indra/viewer_components/CMakeLists.txt b/indra/viewer_components/CMakeLists.txt index 2030afacec..74c9b4568d 100644 --- a/indra/viewer_components/CMakeLists.txt +++ b/indra/viewer_components/CMakeLists.txt @@ -2,4 +2,3 @@ add_subdirectory(login) add_subdirectory(updater) -add_subdirectory(manager) -- cgit v1.2.3