diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2016-07-21 10:18:58 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2016-07-21 10:18:58 -0700 |
| commit | 4428ee77c29fb2e0af50bf6d650abfeb33329b3f (patch) | |
| tree | 2a33bb6e817f684cfbb381a1623b8ab054a8d9fa /indra/newview | |
| parent | 68832f56ba09541f01a246574b141e3ab5fb62b8 (diff) | |
SL-323: make changes to include llbase as an autobuild pkg, undelete files that will be deleted with MAINT-6585 and no need to copy local files in viewer-manifest.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 132b57eb44..31e3711569 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -17,6 +17,7 @@ include(GooglePerfTools) include(Hunspell) include(JsonCpp) include(LLAppearance) +include(LLBase) include(LLAudio) include(LLCharacter) include(LLCommon) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index ac9b8d8ebe..d3ab05b9bd 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -715,8 +715,6 @@ class Darwin_i386_Manifest(ViewerManifest): #this copies over the python wrapper script and associated utilities, see SL-321, SL-322 and SL-323 self.path2basename("../viewer_components/manager","SL_Launcher") self.path2basename("../viewer_components/manager","*.py") - self.path2basename("../viewer_components/manager/base","*py") - self.path2basename("../viewer_components/manager/util","*py") self.end_prefix() # most everything goes in the Resources directory |